diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
index e85df039b0..0ebae68471 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
@@ -73,7 +73,7 @@ public class AncientArcanCity extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CHANGE_STATE"))
 		{
@@ -107,7 +107,7 @@ public class AncientArcanCity extends AbstractNpcAI
 				cat.broadcastSocialAction(2);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
index d76c158f9e..d38ceb917e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
@@ -42,7 +42,7 @@ public class Lykus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
index 4fd3e87bb7..92979a713e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
@@ -39,7 +39,7 @@ public class Mumu extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
index c87c4e9224..a2a2891b57 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
@@ -56,7 +56,7 @@ public class BabyPets extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("HEAL") && (player != null))
 		{
@@ -78,7 +78,7 @@ public class BabyPets extends AbstractNpcAI
 				cancelQuestTimer("HEAL", null, player);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGOUT)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
index b0153ef5da..f0f610c8b9 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
@@ -56,7 +56,7 @@ public class ImprovedBabyPets extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player != null)
 		{
@@ -108,7 +108,7 @@ public class ImprovedBabyPets extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
index 6b4a147550..301899a76f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
@@ -42,7 +42,7 @@ public class Tunatun extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java
index f6485e07b4..2693ef7a00 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java
@@ -48,7 +48,7 @@ public class Alarm extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Player player0 = npc.getVariables().getObject("player0", Player.class);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
index a2b4810dfa..ad01bdba4a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
@@ -46,14 +46,14 @@ public class CrumaTower extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("MESSAGE") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_GO_TO_UNDERGROUND_LV_3_USING_THE_ELEVATOR_IN_THE_BACK);
 			startQuestTimer(event, 15000, npc, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
index 7cab0d9caf..9ac87f3024 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
@@ -77,7 +77,7 @@ public class FrightenedRagnaOrc extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
index ee5d44d59e..db9d7838fc 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
@@ -53,7 +53,7 @@ public class DragonVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("Spawn".equals(event))
 		{
@@ -104,7 +104,7 @@ public class DragonVortex extends AbstractNpcAI
 		{
 			npc.setScriptValue(0);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
index de54d68cf6..ce248d3f8f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
@@ -53,7 +53,7 @@ public class LairOfAntharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CHECK_HOME") && (npc != null) && !npc.isDead())
 		{
@@ -67,7 +67,7 @@ public class LairOfAntharas extends AbstractNpcAI
 				npc.broadcastPacket(new ValidateLocation(npc));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
index bf46d16542..c4e625c565 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
@@ -55,7 +55,7 @@ public class LeopardDragonHachling extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && event.equals("MOVE_TO_TRANSFORM"))
 		{
@@ -77,7 +77,7 @@ public class LeopardDragonHachling extends AbstractNpcAI
 				npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, nearestLocation(npc));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
index 02cbc8234d..b51816c1d6 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
@@ -40,13 +40,13 @@ public class MercenaryCaptain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THE_SOUTHERN_PART_OF_DRAGON_VALLEY_IS_MUCH_MORE_DANGEROUS_THAN_THE_NORTH_BE_CAREFUL));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
index 13dfbd313b..324120327b 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
@@ -61,10 +61,10 @@ public class MercenaryTeleport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		player.teleToLocation(LOCATIONS.get(event), true);
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/Namo.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
index 99057c816c..f21c497157 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
@@ -40,13 +40,13 @@ public class Namo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THIS_PLACE_SWARMS_WITH_DRAGONS_BY_DAY_AND_UNDEAD_BY_NIGHT));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
index 32c7beb400..c02404f76a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
@@ -40,13 +40,13 @@ public class Rakun extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THIS_PLACE_SWARMS_WITH_DRAGONS_BY_DAY_AND_UNDEAD_BY_NIGHT));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
index 349976c56b..cc5487971c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
@@ -72,7 +72,7 @@ public class SeparatedSoul extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LOCATIONS.containsKey(event))
 		{
@@ -98,7 +98,7 @@ public class SeparatedSoul extends AbstractNpcAI
 				return "no-items.htm";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
index 8ca5f0c7d4..a3b3d2da62 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
@@ -49,7 +49,7 @@ public class AltarOfSouls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -96,7 +96,7 @@ public class AltarOfSouls extends AbstractNpcAI
 				return "33920-9.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
index 47beace94a..c82e8969f1 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
@@ -41,7 +41,7 @@ public class RemembranceTower extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("action") && npc.isScriptValue(0))
 		{
@@ -54,7 +54,7 @@ public class RemembranceTower extends AbstractNpcAI
 			npc.setScriptValue(0);
 			npc.broadcastPacket(new OnEventTrigger(EMMITER_ID, false));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
index 39625630cd..0d3824cd68 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
@@ -60,7 +60,7 @@ public class LargeCocoon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -138,7 +138,7 @@ public class LargeCocoon extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
index d4a9137f8d..20aad104b0 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
@@ -41,7 +41,7 @@ public class KrateisCube extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
index 54f813c829..c1de7e5630 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
@@ -365,7 +365,7 @@ public class TalentShow extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((event == null) || event.isEmpty())
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
index 099500e9bb..8dea4780a1 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
@@ -41,7 +41,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -54,7 +54,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 				npc.deleteMe();
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_DAY_NIGHT_CHANGE)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
index 8029a17703..20dfae5ccf 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
@@ -88,7 +88,7 @@ public class ForgeOfTheGods extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
index ba045bd19c..39fcc5a8d7 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
@@ -84,7 +84,7 @@ public class Rooney extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport") && !npc.isDecayed())
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
index c99c7cdf42..0ff79c4f5d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
@@ -76,7 +76,7 @@ public class Apherus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("buff"))
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
index 06a75493ac..d7944dd6f3 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
@@ -40,7 +40,7 @@ public class ApherusLookout extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		if (event.equals("open_bag"))
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
index e984558e2c..0d30623e93 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
@@ -48,7 +48,7 @@ public class GardenWatchman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -78,7 +78,7 @@ public class GardenWatchman extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
index 02b6a47091..42752aea0c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
@@ -42,7 +42,7 @@ public class GenesisVines extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CAST_SKILL") && npc.isScriptValue(1))
 		{
@@ -58,7 +58,7 @@ public class GenesisVines extends AbstractNpcAI
 			npc.setScriptValue(0);
 			npc.deleteMe();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
index 3216884d13..ab0d91e3cd 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
@@ -53,7 +53,7 @@ public class Statues extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("fight"))
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
index 2e3f7d5967..611d053b97 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
@@ -44,7 +44,7 @@ public class GiantsCave extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("ATTACK") && (player != null) && (npc != null) && !npc.isDead())
 		{
@@ -69,7 +69,7 @@ public class GiantsCave extends AbstractNpcAI
 		{
 			npc.setScriptValue(0);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
index d4c54fcddd..9e41be2b4a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
@@ -82,7 +82,7 @@ public class Spirit extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -102,7 +102,7 @@ public class Spirit extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/Heine/WrapGate.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
index eb934ee4dc..bd1d86a743 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
@@ -43,7 +43,7 @@ public class WrapGate extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("enter_hellbound".equals(event))
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java
index 515fc7df94..9ee6847840 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java
@@ -82,7 +82,7 @@ public class EnchantedMegaliths extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
index e49050b695..c4486b2670 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
@@ -39,7 +39,7 @@ public class LeonaBlackbird extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/HellboundIsland/QuarryRebel/QuarryRebel.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/HellboundIsland/QuarryRebel/QuarryRebel.java
index 248f2be6e0..7d2ec669ef 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/HellboundIsland/QuarryRebel/QuarryRebel.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/HellboundIsland/QuarryRebel/QuarryRebel.java
@@ -59,7 +59,7 @@ public class QuarryRebel extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAWN"))
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
index 888a2980ef..5923d188eb 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
@@ -60,7 +60,7 @@ public class Theorn extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/ImperialTomb/BloodySuccubus.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/ImperialTomb/BloodySuccubus.java
index 1f56178ded..2ab48d235a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/ImperialTomb/BloodySuccubus.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/ImperialTomb/BloodySuccubus.java
@@ -118,7 +118,7 @@ public class BloodySuccubus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
index 1879ece1c7..a69a2810f4 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
@@ -218,7 +218,7 @@ public class FourSepulchers extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
index 6ea0a0760f..14c4560f16 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
@@ -43,7 +43,7 @@ public class Zenya extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
index 2b048463f8..99e8fa6078 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
@@ -63,7 +63,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -135,7 +135,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 				npc.reduceCurrentHp(500, npc, null); // poison kills Fafurion if he is not healed
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
index 2a0a8014f8..d4dc25aab8 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
@@ -47,7 +47,7 @@ public class Rignos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -90,7 +90,7 @@ public class Rignos extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
index 43e2c64226..af4b116516 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
@@ -57,7 +57,7 @@ public class HillsOfGold extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -75,7 +75,7 @@ public class HillsOfGold extends AbstractNpcAI
 			});
 			startQuestTimer("SPICULA_AGGRO", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
index edf9416113..efaf6d6bf8 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
@@ -61,7 +61,7 @@ public class AvantGarde extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
index 37f35f00f8..ac8772d975 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
@@ -108,7 +108,7 @@ public class KetraOrcSupport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
index 6c1085f7d0..f253eadcb6 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
@@ -38,13 +38,13 @@ public class El extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_USE_THE_JUMP_BOARD_TO_GET_STRAIGHT_TO_THE_2ND_FLOOR, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
index 282d7a6326..debef79252 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
@@ -58,7 +58,7 @@ public class GeneralDilios extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("command_"))
 		{
@@ -87,7 +87,7 @@ public class GeneralDilios extends AbstractNpcAI
 				startQuestTimer("guard_animation_" + (value + 1), 1500, null, null);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
index 0a84cf47a0..b4dbbc74ae 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
@@ -47,7 +47,7 @@ public class Lekon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
index 89bccaaa2e..d1ee34cd79 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
@@ -54,7 +54,7 @@ public class LindviorScene extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -107,7 +107,7 @@ public class LindviorScene extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public void scheduleNextLindviorVisit()
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
index 79aaecd2f1..9d38ce28a4 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
@@ -59,7 +59,7 @@ public class Nottingale extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
index 975e4a2614..b0ded82d61 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
@@ -38,13 +38,13 @@ public class Plenos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_BE_TELEPORTED_TO_EACH_SEED_IF_YOU_VOLUNTEER_WHY_NOT_TRY, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
index 6b54823416..f19b854050 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
@@ -46,7 +46,7 @@ public class SeedTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -75,7 +75,7 @@ public class SeedTeleportDevice extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
index 23b5c50033..c8498cbee5 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
@@ -49,7 +49,7 @@ public class MithrilMinesTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int index = Integer.parseInt(event) - 1;
 		if (LOCS.length > index)
@@ -57,7 +57,7 @@ public class MithrilMinesTeleporter extends AbstractNpcAI
 			final Location loc = LOCS[index];
 			player.teleToLocation(loc, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
index d398cfc3b8..2901995fbe 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
@@ -82,7 +82,7 @@ public class MonasteryOfSilence extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -130,7 +130,7 @@ public class MonasteryOfSilence extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
index 9a2ee10f60..434807bd9e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
@@ -62,7 +62,7 @@ public class PaganTeleporters extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
index 7eed58ebec..1c6e6ba756 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
@@ -60,7 +60,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -90,7 +90,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI
 				instanceScript.notifyEvent(event, npc, player);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
index 9d4b3bde33..781bfa3af3 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
@@ -39,13 +39,13 @@ public class Fioren extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("startMovie"))
 		{
 			playMovie(player, Movie.SI_BARLOG_STORY);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java
index 9c52a15e19..2d6d808bad 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java
@@ -93,7 +93,7 @@ public class PlainsOfLizardman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("fantasy_mushroom") && (npc != null) && (player != null))
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
index 21ff72d2e7..c8747c6857 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
@@ -179,7 +179,7 @@ public class PrimevalIsle extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -239,7 +239,7 @@ public class PrimevalIsle extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
index 5ffc401682..6a166ec683 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
@@ -74,7 +74,7 @@ public class Kaysen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
index 619d9e57f4..ceb8d8a7b9 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
@@ -63,7 +63,7 @@ public class NervasTemporaryPrison extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
index b8b803e57f..43691cef06 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
@@ -38,14 +38,14 @@ public class RoAGuard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THIS_IS_RUINS_OF_AGONY_WHERE_KANILOV_IS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
index f3af67aba7..dd2a52bdc5 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
@@ -38,14 +38,14 @@ public class RoDGuard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THIS_IS_THE_RUINS_OF_AGONY_WHERE_POSLOF_IS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
index 5e57a9fb94..a19c1d4085 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
@@ -48,7 +48,7 @@ public class AltarOfSacrifice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("msg_text"))
 		{
@@ -68,7 +68,7 @@ public class AltarOfSacrifice extends AbstractNpcAI
 			startQuestTimer("msg_text", 135000, npc, null);
 			_jenas_guard.setScriptValue(0);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
index a025e62542..b50f530164 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
@@ -147,7 +147,7 @@ public class Venom extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
index ed4ce2d782..cd89ebcb9e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
@@ -43,7 +43,7 @@ public class Klemis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("portInside"))
 		{
@@ -56,7 +56,7 @@ public class Klemis extends AbstractNpcAI
 				return "32734-01.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
index d66782538a..c1db3c8180 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
@@ -80,7 +80,7 @@ public class Maguen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || (player == null))
 		{
@@ -163,7 +163,7 @@ public class Maguen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
index 344d65a44f..d5ab73ff74 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
@@ -48,7 +48,7 @@ public class Nemo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
index 251458ea98..ae26a6c701 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
@@ -297,7 +297,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("ChangeSeedsStatus"))
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
index d6f644fa86..765deb4a7d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
@@ -51,7 +51,7 @@ public class Seyo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (npc == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
index f213bbec6c..f62aa835e8 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
@@ -132,7 +132,7 @@ public class SelMahumDrill extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -188,7 +188,7 @@ public class SelMahumDrill extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
index 4d3891946f..4e0a01cea2 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
@@ -83,7 +83,7 @@ public class SelMahumSquad extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -189,7 +189,7 @@ public class SelMahumSquad extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java
index 1c47135e60..a38df65796 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java
@@ -70,7 +70,7 @@ public class SilentValley extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
index ebf70cc5ae..6ba58ffc8e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
@@ -197,7 +197,7 @@ public class StakatoNest extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || (player == null) || npc.isDead())
 		{
@@ -225,7 +225,7 @@ public class StakatoNest extends AbstractNpcAI
 			addAttackPlayerDesire(spawned, player);
 			npc.deleteMe();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private static Monster checkMinion(Npc npc)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
index 611b134c70..2469300cb4 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
@@ -49,7 +49,7 @@ public class StakatoNestTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int index = Integer.parseInt(event) - 1;
 		if (LOCS.length > index)
@@ -67,7 +67,7 @@ public class StakatoNestTeleporter extends AbstractNpcAI
 			}
 			player.teleToLocation(loc, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
index 9acd290f95..535b8c912e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
@@ -48,7 +48,7 @@ public class Apprentice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("rideKukuru"))
 		{
@@ -74,7 +74,7 @@ public class Apprentice extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TRY_RIDING_A_KUKURI, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
index e09ab8270d..8c1824fe61 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
@@ -97,7 +97,7 @@ public class AwakeningMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
index cd6185a888..8ed7701c68 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
@@ -38,7 +38,7 @@ public class Banette extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
@@ -62,7 +62,7 @@ public class Banette extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
index 87e0629227..858331ae3e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
@@ -38,13 +38,13 @@ public class Bink extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TALKING_ISLAND_VILLAGE_IS_REALLY_BEAUTIFUL, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
index e439d986ad..5d231aa00d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
@@ -45,7 +45,7 @@ public class BoyAndGirl extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_CHANGEWEAP"))
 		{
@@ -66,7 +66,7 @@ public class BoyAndGirl extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, npc.getId() == BOY ? NpcStringId.WEEE : NpcStringId.BOYS_ARE_SO_ANNOYING);
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
index ff53080809..22d19b3496 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
@@ -41,7 +41,7 @@ public class Devno extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -74,7 +74,7 @@ public class Devno extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
index a4f08b8c99..18c04b2e7e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
@@ -42,7 +42,7 @@ public class DrillSergeant extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SOCIAL_SHOW"))
 		{
@@ -66,7 +66,7 @@ public class DrillSergeant extends AbstractNpcAI
 				npc.broadcastSocialAction(socialActionId);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
index 8e3f9e5943..83363ef157 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
@@ -41,7 +41,7 @@ public class Eleve extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Eleve extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
index b8863b9963..114728632b 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
@@ -44,13 +44,13 @@ public class Gagabu extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, GAGABU_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
index 44dab7df42..d490504792 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
@@ -38,14 +38,14 @@ public class Galad extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSocialAction(3);
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.OCCASIONALLY_RARE_JEWELS_OF_GIANTS_ARE_DISCOVERED_IN_THE_BEACH, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
index a0c7f71816..3a56943e20 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
@@ -52,7 +52,7 @@ public class GiantSoldiers extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
index a703c40323..b94d2f9624 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
@@ -38,7 +38,7 @@ public class GuardSoldier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -49,7 +49,7 @@ public class GuardSoldier extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(2);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
index b26d9fd748..1b0dd65c82 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
@@ -43,7 +43,7 @@ public class Hadel extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
index bdb70d1f2d..d7ff70d9a0 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
@@ -38,7 +38,7 @@ public class Handermonkey extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE") && (npc != null))
 		{
@@ -54,7 +54,7 @@ public class Handermonkey extends AbstractNpcAI
 				npc.broadcastSocialAction(9);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
index b8370bffe7..5ea0569424 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
@@ -60,7 +60,7 @@ public class Hardin extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = getHtmlMessage(player);
 		if (htmltext != null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
index a8bded51f1..536ee7f5cd 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
@@ -58,7 +58,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("HARNAK_SPAWN"))
 		{
@@ -70,7 +70,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
 				_templates.forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName), null));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private static class zoneInfo
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
index 3c2080e85a..03dca71bb5 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
@@ -55,13 +55,13 @@ public class HurnakMobMsg extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("ATTACK"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomEntry(ON_ATTACK_MSG));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
index 81f6617329..7055381eab 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
@@ -38,14 +38,14 @@ public class Hera extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomBoolean() ? NpcStringId.DOES_THE_GODDESS_SEE_WHAT_SHE_HAS_DONE : NpcStringId.WHY_HAVE_THE_HEROES_ABANDONED_US);
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
index 7003ad014d..2b6a1a1e51 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
@@ -38,7 +38,7 @@ public class Heymond extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
@@ -62,7 +62,7 @@ public class Heymond extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
index 52ce99be7f..8033f3c1ec 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
@@ -38,7 +38,7 @@ public class Holly extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -48,7 +48,7 @@ public class Holly extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(6);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
index 3f9141b931..e11490debc 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
@@ -41,7 +41,7 @@ public class Karonf extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Karonf extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
index 597cfd80f2..c102b0cc4c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
@@ -44,7 +44,7 @@ public class Luderic extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -54,7 +54,7 @@ public class Luderic extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(1);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
index 0c07720a0a..08de6143f0 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
@@ -45,13 +45,13 @@ public class Lumi extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, LUMI_SHOUT[getRandom(3)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
index 68b2789416..3bdb8de60b 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
@@ -38,13 +38,13 @@ public class Mahram extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.ALCHEMY_IS_A_SCIENCE_AND_AN_ART, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
index e00fd6c98c..85117713a0 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
@@ -38,13 +38,13 @@ public class Mai extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EVERY_RACE_BUILT_A_PIECE_OF_THIS_VILLAGE, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
index dcd47a9822..2d44f1568a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
@@ -38,13 +38,13 @@ public class MarinSmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.HMM_IS_THIS_STILL_A_DECENT_WEAPON, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
index d5e5496e16..0d4e8f79e3 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
@@ -41,7 +41,7 @@ public class Marsha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Marsha extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
index aa9eb0eb87..81bc246742 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
@@ -43,7 +43,7 @@ public class Milia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("gludioAirship"))
 		{
@@ -53,7 +53,7 @@ public class Milia extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SPEAK_WITH_ME_ABOUT_TRAVELING_AROUND_ADEN, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
index b1e037eb5a..933c139b8c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
@@ -64,7 +64,7 @@ public class MonkOfChaos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
index f6cd83883a..0bedb09eb6 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
@@ -41,7 +41,7 @@ public class Morgan extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Morgan extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
index e7ce45a4e5..fd5e025cd2 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
@@ -40,7 +40,7 @@ public class Oris extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SOCIAL_ACTION_1"))
 		{
@@ -55,7 +55,7 @@ public class Oris extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_HAVEN_T_FELT_THIS_GOOD_IN_AGES, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
index 328de6a4df..34ae4f55b6 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
@@ -49,7 +49,7 @@ public class Pantheon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
index 869ebf3119..e44fe2e373 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
@@ -152,7 +152,7 @@ public class Raina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
index 4c8862c733..8d66a71766 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
@@ -41,7 +41,7 @@ public class Rubentis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Rubentis extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
index d5c86cee97..87e1df4a6b 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
@@ -38,14 +38,14 @@ public class Ruks extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomBoolean() ? NpcStringId.THE_SEVEN_SIGNS_ENDED : NpcStringId.WE_NEED_TO_FIND_HER_WEAKNESS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
index cc9a63c666..880532e52c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
@@ -38,13 +38,13 @@ public class Sebion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TIS_A_SCRATCH, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
index fa3cc06633..4b05120bde 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
@@ -38,13 +38,13 @@ public class Shannon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.LOOK_AT_ALL_THE_NEWBIES_HA_HA_HA, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
index 219ac48515..7fd067c374 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
@@ -44,13 +44,13 @@ public class Sodian extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, SODIAN_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
index e11dfb9aaf..8413c93bc8 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
@@ -44,13 +44,13 @@ public class Stiller extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, STILLER_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
index b10f044196..d196091a8e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
@@ -38,13 +38,13 @@ public class Theodore extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.AND_NOW_YOUR_JOURNEY_BEGINS, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
index 4290aa8fc6..8e4f8ed738 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
@@ -38,7 +38,7 @@ public class TomaJunior extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -49,7 +49,7 @@ public class TomaJunior extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(6);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java
index 85da23b9b2..bf230b7f50 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java
@@ -48,7 +48,7 @@ public class Toyron extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true);
 		if (event.equals("museum_teleport"))
@@ -59,7 +59,7 @@ public class Toyron extends AbstractNpcAI
 			}
 			player.teleToLocation(MUSEUM_OUT);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
index c3aa031317..78ce6f2c8c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
@@ -38,7 +38,7 @@ public class TrainningSoldier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -55,7 +55,7 @@ public class TrainningSoldier extends AbstractNpcAI
 			}
 			startQuestTimer("START_ATTACK", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
index 219dbdca43..2e18e168e1 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
@@ -63,7 +63,7 @@ public class Trandon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String[] substrings = event.split(" ");
 		if (substrings.length < 1)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Kandra.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Kandra.java
index c3a4fd85eb..853695b091 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Kandra.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Kandra.java
@@ -38,14 +38,14 @@ public class Kandra extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.IMPRESSIVE_LOOKING_STATUES);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Veron.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Veron.java
index be90343ba9..f037db8598 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Veron.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Veron.java
@@ -38,14 +38,14 @@ public class Veron extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SHILEN);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
index 8cd3cd965d..b65bd9a7ad 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
@@ -42,7 +42,7 @@ public class YeSagiraGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -56,7 +56,7 @@ public class YeSagiraGuards extends AbstractNpcAI
 			}
 			startQuestTimer("GUARD_AGGRO", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
index 2d8154f844..f7eec1d081 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
@@ -88,7 +88,7 @@ public class YeSegiraTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LOCATIONS.containsKey(event))
 		{
@@ -111,7 +111,7 @@ public class YeSegiraTeleportDevice extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_PLAYER_CREATE)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java
index e546cbc086..be903e83d2 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java
@@ -87,7 +87,7 @@ public class ToIVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int npcId = npc.getId();
 		
@@ -133,7 +133,7 @@ public class ToIVortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TownOfGiran/Alexandria/Alexandria.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TownOfGiran/Alexandria/Alexandria.java
index 1a0064cbcd..8091ac70e6 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TownOfGiran/Alexandria/Alexandria.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TownOfGiran/Alexandria/Alexandria.java
@@ -82,7 +82,7 @@ public class Alexandria extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("30098-02.html"))
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
index 2c8e967539..4bb6be2086 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
@@ -40,7 +40,7 @@ public class Acateo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("give_circlet"))
 		{
@@ -51,7 +51,7 @@ public class Acateo extends AbstractNpcAI
 			giveItems(player, ACADEMY_CIRCLET, 1);
 			return "33905-2.html";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TownOfGoddard/Cerenas/Cerenas.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TownOfGoddard/Cerenas/Cerenas.java
index 4b87f5ec09..f2df150f21 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TownOfGoddard/Cerenas/Cerenas.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TownOfGoddard/Cerenas/Cerenas.java
@@ -41,7 +41,7 @@ public class Cerenas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(Q10369_NoblesseSoulTesting.class.getSimpleName());
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
index 949fb8f279..48ca778074 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
@@ -108,7 +108,7 @@ public class VarkaSilenosSupport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
index b7fb571500..3a94d3d378 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
@@ -43,7 +43,7 @@ public class ElmoredenServantsGhost extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("teleport1") || event.equals("teleport2"))
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
index 427084ea7a..150fee7dfb 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
@@ -83,7 +83,7 @@ public class Wastelands extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || !npc.isSpawned())
 		{
@@ -184,7 +184,7 @@ public class Wastelands extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
index 61678a5cb2..5e24c8040c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
@@ -47,7 +47,7 @@ public class ZealotOfShilen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -75,7 +75,7 @@ public class ZealotOfShilen extends AbstractNpcAI
 			}
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
index 2da266ca0e..ab6a6ebc3e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
@@ -38,14 +38,14 @@ public class Commando extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.WE_RE_COLLECTING_SEEKER_OF_ADEN);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Anais/Anais.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Anais/Anais.java
index 74fe879672..823d08142f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Anais/Anais.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Anais/Anais.java
@@ -75,7 +75,7 @@ public class Anais extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -134,7 +134,7 @@ public class Anais extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
index 00ebb5f34f..6f04200e6f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
@@ -361,7 +361,7 @@ public class Anakim extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -475,7 +475,7 @@ public class Anakim extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index d236e19d43..a5157acfc7 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -193,7 +193,7 @@ public class Antharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -605,7 +605,7 @@ public class Antharas extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 3051d87c77..3d8308a45c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -164,7 +164,7 @@ public class Baium extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -478,7 +478,7 @@ public class Baium extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
index 992eae3c7c..7bea095520 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
@@ -105,7 +105,7 @@ public class BalokWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -115,7 +115,7 @@ public class BalokWarzone extends AbstractInstance
 				takeItems(player, PRISON_KEY, -1);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
index 6684b9b04c..ce39ed9b22 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
@@ -72,7 +72,7 @@ public class BaylorWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -124,7 +124,7 @@ public class BaylorWarzone extends AbstractInstance
 				player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index b5a24845bb..3748875859 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -126,7 +126,7 @@ public class Beleth extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -536,7 +536,7 @@ public class Beleth extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
index e2770b5bec..b768e563e9 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
@@ -49,7 +49,7 @@ public class Wormhole extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Core/Core.java
index 344ad52a0a..34584c31c3 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -143,7 +143,7 @@ public class Core extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
@@ -162,7 +162,7 @@ public class Core extends AbstractNpcAI
 			_minions.forEach(Attackable::decayMe);
 			_minions.clear();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
index 859e6fc695..ed664b4197 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
@@ -65,7 +65,7 @@ public class IceQueensCastle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class IceQueensCastle extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
index a07501ed22..9f3772a47d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
@@ -160,7 +160,7 @@ public class IceQueensCastleBattle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterEasy"))
 		{
@@ -700,7 +700,7 @@ public class IceQueensCastleBattle extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
index 7fa44d08d6..21e250c482 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
@@ -45,7 +45,7 @@ public class Jinia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
index 62de6736d0..3a3ddc74e7 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
@@ -165,7 +165,7 @@ public class LastImperialTomb extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
index 282b9f8fbc..254c891bc5 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
@@ -62,7 +62,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
index e4260628ce..d61884c91b 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
@@ -92,7 +92,7 @@ public class IstinaCavern extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance instance = npc.getInstanceWorld();
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
index 27728f34c1..f1945e2def 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
@@ -40,7 +40,7 @@ public class Rumiese extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
index 9f677053b2..c3e066a466 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
@@ -137,7 +137,7 @@ public class KimerianCommon extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance instance = npc.getInstanceWorld();
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
index 8d618ecd4f..f0d8652322 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
@@ -387,7 +387,7 @@ public class Lilith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -501,7 +501,7 @@ public class Lilith extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
index 5b16c333e2..ced833a889 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
@@ -49,7 +49,7 @@ public class KatoSicanus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
index 2bd8aeb2c6..7dacdd2c16 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
@@ -674,7 +674,7 @@ public class Lindvior extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
index 73d5d88407..f676f620a3 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
@@ -49,7 +49,7 @@ public class Vortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -110,7 +110,7 @@ public class Vortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java
index 190f1ce9ea..02f57b1bd5 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java
@@ -59,7 +59,7 @@ public class Lydia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
index 49a224c8bc..8c7d0eb77d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
@@ -122,7 +122,7 @@ public class OctavisWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -146,7 +146,7 @@ public class OctavisWarzone extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index e74bc817e6..11c8477773 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -180,7 +180,7 @@ public class Orfen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -263,7 +263,7 @@ public class Orfen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 93735c996b..72e174bb65 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -155,7 +155,7 @@ public class QueenAnt extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -239,7 +239,7 @@ public class QueenAnt extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
index 7a3322b68a..297948d172 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
@@ -53,7 +53,7 @@ public class QueenShyeed extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
index ad87d93fe0..20e1572d8a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
@@ -80,7 +80,7 @@ public class Sailren extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -249,7 +249,7 @@ public class Sailren extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
index 02f0987432..ee16f1920f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
@@ -74,7 +74,7 @@ public class Cannon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
index f754206b22..45b4c89ee7 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
@@ -62,7 +62,7 @@ public class TautiWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -170,7 +170,7 @@ public class TautiWarzone extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
index 50da94c8b2..f973bf0e12 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
@@ -182,7 +182,7 @@ public class TeredorWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
index 7b07413999..63b2c0589a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
@@ -507,7 +507,7 @@ public class Stage1 extends AbstractInstance implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
index 70d36f9c61..d2abf63365 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
@@ -50,7 +50,7 @@ public class Daichir extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterEarthWyrnCave"))
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
index e69a688d77..2c365d7f61 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
@@ -570,7 +570,7 @@ public class Trasken extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -694,7 +694,7 @@ public class Trasken extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index 74f7b64063..4eaf667f0a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -191,7 +191,7 @@ public class Valakas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -380,7 +380,7 @@ public class Valakas extends AbstractNpcAI
 		{
 			BOSS_ZONE.oustAllPlayers();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
index a211f7bfc0..bae4d63898 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
@@ -172,7 +172,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter60"))
 		{
@@ -254,7 +254,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/AdenReconstructorManager.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
index efa4bfa6ca..65a08050b6 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
@@ -42,7 +42,7 @@ public class AdenReconstructorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -67,7 +67,7 @@ public class AdenReconstructorManager extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
index 2d7eddef8b..e0cc4ee48e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
@@ -62,7 +62,7 @@ public class AdventureGuildsman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
index 454c5b400f..dea128399c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
@@ -65,7 +65,7 @@ public class AdventurersGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
index 8bb8061495..3428520002 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
@@ -53,7 +53,7 @@ public class AlchemistManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index b939ece983..849ed827d3 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -63,7 +63,7 @@ public class ArenaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -128,7 +128,7 @@ public class ArenaManager extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
index 1c51b94358..352c31c8fc 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
@@ -38,7 +38,7 @@ public class BlackJudge extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("weakenBreath"))
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
index d35adf8706..e203aecd5e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
@@ -42,7 +42,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equals("31092-01.html"))
@@ -79,7 +79,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 			giveAdena(player, count, false);
 			return "31092-04.html";
 		}
-		return super.onAdvEvent(htmltext, npc, player);
+		return super.onEvent(htmltext, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
index 6a44d63e0b..81e90f2d67 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
@@ -56,7 +56,7 @@ public class CastleAmbassador extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
index b07792cd2d..11b8786523 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
@@ -57,7 +57,7 @@ public class CastleBlacksmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return (event.equalsIgnoreCase(npc.getId() + "-02.html") && hasRights(player, npc)) ? event : null;
 	}
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
index 355012ffea..5385531356 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
@@ -393,7 +393,7 @@ public class CastleChamberlain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Castle castle = npc.getCastle();
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
index 3e2cd16930..4a8fac8c0e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
@@ -140,7 +140,7 @@ public class CastleCourtMagician extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player.getClan() == null) && (player.getClanId() != npc.getCastle().getOwnerId()))
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
index b9c1f3faf5..70bae86615 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
@@ -72,7 +72,7 @@ public class CastleDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
index bb32dde319..a319e3977f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
@@ -56,7 +56,7 @@ public class CastleMercenaryManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index ac71c1afad..0e8137bb1d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -78,7 +78,7 @@ public class CastleTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
@@ -168,7 +168,7 @@ public class CastleTeleporter extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
index bffed40bcc..ea1b40c41c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
@@ -52,7 +52,7 @@ public class CastleWarehouse extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final boolean isMyLord = player.isClanLeader() && (player.getClan().getCastleId() == (npc.getCastle() != null ? npc.getCastle().getResidenceId() : -1));
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index 52ba16f303..d75e6f1468 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -64,7 +64,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
index a86581206e..afd7250ca4 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
@@ -57,7 +57,7 @@ public class ClanHallDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 51ff62c312..4da19f2400 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -107,7 +107,7 @@ public class ClanHallManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
index 1d8e114daa..77845525b2 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
@@ -68,7 +68,7 @@ public class ClanTrader extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 901fc2d848..e2d6838228 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -235,7 +235,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		if (!_isEnabled)
 		{
@@ -936,7 +936,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	{
 		if (event.getCommand().startsWith("Quest ClassMaster "))
 		{
-			final String html = onAdvEvent(event.getCommand().substring(18), null, event.getPlayer());
+			final String html = onEvent(event.getCommand().substring(18), null, event.getPlayer());
 			event.getPlayer().sendPacket(TutorialCloseHtml.STATIC_PACKET);
 			showResult(event.getPlayer(), html);
 		}
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
index 21aafa7e87..7b61214c91 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
@@ -43,7 +43,7 @@ public class CrimsonHatuOtis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -69,7 +69,7 @@ public class CrimsonHatuOtis extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java
index e1f6de3c80..c66ba04bfe 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java
@@ -73,7 +73,7 @@ public class DimensionalMerchant extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/DivineBeast.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/DivineBeast.java
index 1f247a7b35..3f3a076992 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/DivineBeast.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/DivineBeast.java
@@ -44,7 +44,7 @@ public class DivineBeast extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player == null) || !player.hasServitors())
 		{
@@ -55,7 +55,7 @@ public class DivineBeast extends AbstractNpcAI
 			cancelQuestTimer(event, npc, player);
 			player.getServitors().values().forEach(summon -> summon.unSummon(player));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/EnergySeeds.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/EnergySeeds.java
index 509c12bbeb..befbad7bff 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/EnergySeeds.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/EnergySeeds.java
@@ -196,7 +196,7 @@ public class EnergySeeds extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("StartSoDAi"))
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/FameManager/FameManager.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/FameManager/FameManager.java
index d4f16a9b96..b0a7bc0a20 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/FameManager/FameManager.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/FameManager/FameManager.java
@@ -49,7 +49,7 @@ public class FameManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
index 79742f7171..c5a075fbcf 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
@@ -69,7 +69,7 @@ public class FortressSiegeManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
index 344d4c5547..db32dd6f2b 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
@@ -67,7 +67,7 @@ public class HealerTrainer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
index 94b2f5f16d..2b2e0d3c40 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
@@ -89,7 +89,7 @@ public class HermuncusMinion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(eventValue, " ");
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
index 2928fbd023..abe98a50e5 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
@@ -47,7 +47,7 @@ public class LaVieEnRose extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/Mammons/Mammons.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/Mammons/Mammons.java
index 3ff005b72b..f58c7b8b86 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/Mammons/Mammons.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/Mammons/Mammons.java
@@ -79,12 +79,12 @@ public class Mammons extends AbstractNpcAI
 		addTalkId(MAMMONS);
 		addFirstTalkId(MAMMONS);
 		
-		onAdvEvent("RESPAWN_MAMMONS", null, null);
+		onEvent("RESPAWN_MAMMONS", null, null);
 		startQuestTimer("RESPAWN_MAMMONS", TELEPORT_DELAY, null, null, true);
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
index 8d38a27541..6763b0367c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
@@ -71,7 +71,7 @@ public class ManorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
index 0ef47a4ae0..efd307540c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
@@ -145,7 +145,7 @@ public class MentorGuide extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("exchange"))
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/Minigame/Minigame.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/Minigame/Minigame.java
index 14e3f84dbd..3971049085 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/Minigame/Minigame.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/Minigame/Minigame.java
@@ -68,7 +68,7 @@ public class Minigame extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final MinigameRoom room = getRoomByManager(npc);
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
index d66499b4b5..2e3252aa68 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
@@ -79,7 +79,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/MysteriousWizard/MysteriousWizard.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/MysteriousWizard/MysteriousWizard.java
index 2c423c6490..667463de4d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/MysteriousWizard/MysteriousWizard.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/MysteriousWizard/MysteriousWizard.java
@@ -41,7 +41,7 @@ public class MysteriousWizard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return event.equals("33980-01.html") ? event : null;
 	}
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
index 4ad7e0a2fc..d3576b9fff 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
@@ -48,14 +48,14 @@ public class NornilTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("teleport_"))
 		{
 			final int locId = Integer.parseInt(event.replace("teleport_", ""));
 			player.teleToLocation(LOCATIONS[locId - 1]);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
index d3feff3b2f..42cfbf60d0 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
@@ -69,7 +69,7 @@ public class OlyBuffer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index 05c9efdbec..1870de7693 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -88,7 +88,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/PrisonGuards.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/PrisonGuards.java
index 4084beddca..c79356a1f0 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/PrisonGuards.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/PrisonGuards.java
@@ -53,7 +53,7 @@ public class PrisonGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CLEAR_STATUS"))
 		{
@@ -67,7 +67,7 @@ public class PrisonGuards extends AbstractNpcAI
 			}
 			startQuestTimer("CHECK_HOME", 30000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
index 21d281c6c9..435f293345 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
@@ -84,7 +84,7 @@ public class Proclaimer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("giveBuff"))
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
index 8b3515e12b..83098c1eaf 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
@@ -79,7 +79,7 @@ public class ProvisionalHalls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/Servitors/SinEater.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/Servitors/SinEater.java
index 1ed8d645a5..d7536614e8 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/Servitors/SinEater.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/Servitors/SinEater.java
@@ -48,7 +48,7 @@ public class SinEater extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TALK") && (player != null) && (player.getPet() != null))
 		{
@@ -79,7 +79,7 @@ public class SinEater extends AbstractNpcAI
 			}
 			startQuestTimer("TALK", 60000, null, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_CREATURE_DEATH)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
index ec177e537e..373c64200b 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
@@ -128,7 +128,7 @@ public class SupportUnitCaptain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int fortOwner = npc.getFort().getOwnerClan() == null ? 0 : npc.getFort().getOwnerClan().getId();
 		if ((player.getClan() == null) || (player.getClanId() != fortOwner))
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
index f6d1e74529..a733b87dad 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
@@ -53,7 +53,7 @@ public class SymbolMaker extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
index f9cd32a0dd..82ec9274c2 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
@@ -94,7 +94,7 @@ public class TeleportToUndergroundColiseum extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.endsWith(".htm"))
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
index dbe26ae6a3..7052b10367 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
@@ -75,7 +75,7 @@ public class TersisHerald extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("giveBuff"))
 		{
@@ -87,7 +87,7 @@ public class TersisHerald extends AbstractNpcAI
 			npc.setTarget(player);
 			npc.doCast(DRAGON_BUFF.getSkill());
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java
index 3c46f755ca..c2f0970ccc 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java
@@ -58,7 +58,7 @@ public class TrainingCamp extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (!Config.TRAINING_CAMP_ENABLE || !checkConditions(player))
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
index 8e94950d76..520a057481 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
@@ -62,7 +62,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = "";
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
index 9924fb4ace..0a6b873028 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
@@ -85,7 +85,7 @@ public class ClassTransferTalk extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/WarriorFishingBlock.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
index 56b29fee5b..78e3d1c99e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
@@ -75,7 +75,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -104,7 +104,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
index b9439eb0ec..a1878b037b 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
@@ -156,7 +156,7 @@ public class WeaverOlf extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.contains("_grade_"))
 		{
@@ -185,7 +185,7 @@ public class WeaverOlf extends AbstractNpcAI
 			}
 			else
 			{
-				return super.onAdvEvent(event, npc, player);
+				return super.onEvent(event, npc, player);
 			}
 			
 			if (hasQuestItems(player, itemIds[0]))
@@ -225,7 +225,7 @@ public class WeaverOlf extends AbstractNpcAI
 			{
 				return npc.getId() + "-no.htm";
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		return event;
 	}
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index 777998cde4..48bf41ab6d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -210,7 +210,7 @@ public class WyvernManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
index 0c2e7586c9..c49be5297b 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
@@ -36,7 +36,7 @@ public class DelevelManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.DELEVEL_MANAGER_ENABLED)
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
index ff6d40ec0e..4713803f1d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
@@ -54,7 +54,7 @@ public class FactionSystem extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class FactionSystem extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
index 8b9c676ad5..771c8a9058 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
@@ -34,7 +34,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -77,7 +77,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 				npc.broadcastInfo(); // update flag status
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
index e6fdc75e16..7423521604 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
@@ -70,7 +70,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("AUTOBUFF") && (npc != null) && !npc.isDead())
 		{
@@ -98,7 +98,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
 			}
 			startQuestTimer("AUTOBUFF", 30000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
index 669fcfc85c..ddf7e923eb 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
@@ -39,7 +39,7 @@ public class NoblessMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.NOBLESS_MASTER_ENABLED)
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
index 370e9a1ced..3488295c5a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
@@ -163,7 +163,7 @@ public class Deathmatch extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
index 1eb84eca93..b92bbe7f77 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
@@ -213,7 +213,7 @@ public class Rabbits extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/events/Race/Race.java
index ff9fc462f6..6ac325ca6f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/events/Race/Race.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/events/Race/Race.java
@@ -320,7 +320,7 @@ public class Race extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 68f87b19cb..e38ed4d256 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -182,7 +182,7 @@ public class TvT extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
index 77c055cc79..84a2d7763d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
@@ -45,7 +45,7 @@ public class BirthOfDraco extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
index 9bc0ff9c55..87ac868dc7 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
@@ -64,7 +64,7 @@ public class CharacterBirthday extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("despawn_npc"))
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index a966bdff3e..4648d78f95 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -56,7 +56,7 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
index a8f534ca97..76c5aa611f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
@@ -73,7 +73,7 @@ public class FreyaCelebration extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("give_potion"))
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
index b45e872a60..2570ef061a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
@@ -86,7 +86,7 @@ public class GiftOfVitality extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
index aa5419e179..76aaa4ab09 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
@@ -59,7 +59,7 @@ public class HeavyMedal extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		int level = checkLevel(player);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/HungryHorse/HungryHorse.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
index 5232662a42..44000b61a0 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
@@ -60,7 +60,7 @@ public class HungryHorse extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
index 6107af7f71..502fce9a30 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
@@ -55,7 +55,7 @@ public class HuntForSanta extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/LetterCollector/LetterCollector.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
index 744b1f2ae4..d87bd82b02 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
@@ -123,7 +123,7 @@ public class LetterCollector extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
index b71176a555..a42e986ee4 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
@@ -49,7 +49,7 @@ public class LoveYourGatekeeper extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
index c868fad2b3..6460eb4ab0 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
@@ -61,7 +61,7 @@ public class LoversJubilee extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmtext = event;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
index dd6b8696a7..b73bce80f1 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
@@ -68,7 +68,7 @@ public class MasterOfEnchanting extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("buy_staff"))
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
index f6c714eddc..7d3462224b 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
@@ -58,7 +58,7 @@ public class RudolphsBlessing extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("rudolph_eat") && (player != null) && player.isOnline())
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
index 3f076fc92b..17ff961002 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
@@ -297,7 +297,7 @@ public class SavingSanta extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!isEventPeriod())
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
index 5c00677d25..862a8df578 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
@@ -51,7 +51,7 @@ public class ThePowerOfLove extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
index 53e011000c..e87126ed19 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
@@ -129,7 +129,7 @@ public class AltarOfShilen extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (event.equals("enterInstance"))
@@ -265,7 +265,7 @@ public class AltarOfShilen extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
index 9b117ec13f..e8e7c4d742 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
@@ -467,7 +467,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
index 1100b43aee..80911f4423 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
@@ -72,7 +72,7 @@ public class ChamberOfProphecies extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
index 4f0f2f7a19..b815b5bae7 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
@@ -177,7 +177,7 @@ public class ChamberOfDelusion extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
index ff860c70bb..c8bed455cc 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
@@ -114,13 +114,13 @@ public class CrystalCavernsCoralGarden extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
index 6db8525e11..46f3d2fdf6 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
@@ -79,13 +79,13 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
index c51b5d7887..121e3a89f4 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
@@ -135,13 +135,13 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
index 72d2fe0f6f..58eec2329b 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
@@ -122,7 +122,7 @@ public class DarkCloudMansion extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
index 605b8ebdf8..981a91d4a7 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
@@ -53,13 +53,13 @@ public class DimensionalArchon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), getRandomEntry(ARCHON_MSG)));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
index 176ee5b803..9243451cde 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
@@ -53,7 +53,7 @@ public class DimensionalTrap extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || npc.isAlikeDead())
 		{
@@ -102,7 +102,7 @@ public class DimensionalTrap extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
index 4da8316b88..5b922b7ecd 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
@@ -115,7 +115,7 @@ public class DimensionalWrap extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
index 8211e90098..4d937103a7 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
@@ -45,7 +45,7 @@ public class EvasHiddenSpace extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = player.getQuestState(Q10369_NoblesseSoulTesting.class.getSimpleName());
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
index 98e2ac0c8b..a40e7e3c88 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
@@ -195,12 +195,12 @@ public class EvilIncubator extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player);
 		if ((st == null) || !st.isStarted())
 		{
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java
index d0098998c9..429e0ddd64 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java
@@ -69,7 +69,7 @@ public class FaeronTrainingGrounds1 extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(Q10735_ASpecialPower.class.getSimpleName());
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java
index 299468b58f..485d2168fc 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java
@@ -68,7 +68,7 @@ public class FaeronTrainingGrounds2 extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(Q10736_ASpecialPower.class.getSimpleName());
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
index 6d58bd6eb4..1477e297c5 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
@@ -59,7 +59,7 @@ public class FortressOfTheDead extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/Fortuna/Fortuna.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/Fortuna/Fortuna.java
index 339328eea4..ef7b65659f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/Fortuna/Fortuna.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/Fortuna/Fortuna.java
@@ -51,7 +51,7 @@ public class Fortuna extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -472,7 +472,7 @@ public class Fortuna extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
index ef73cf3920..a205145189 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
@@ -119,7 +119,7 @@ public class HarnakUndergroundRuins extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
index 598a7460c7..c7180064eb 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
@@ -642,7 +642,7 @@ public class Kamaloka extends AbstractInstance
 	 * Handles only player's enter, single parameter - integer kamaloka index
 	 */
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java
index 7a8f1aa4b3..ef3b1ae1ba 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java
@@ -48,7 +48,7 @@ public class KaraphonHabitat extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(Q10745_TheSecretIngredients.class.getSimpleName());
 		if (qs != null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
index cccdf5d51f..4db13d5b98 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
@@ -195,7 +195,7 @@ public class KartiasLabyrinth extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -268,7 +268,7 @@ public class KartiasLabyrinth extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java
index db91907f42..59668140ab 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java
@@ -95,7 +95,7 @@ public class LabyrinthOfBelis extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter_instance"))
 		{
@@ -209,7 +209,7 @@ public class LabyrinthOfBelis extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java
index 0284ac988f..7f88562bc4 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java
@@ -61,7 +61,7 @@ public class MithrilMine extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -108,7 +108,7 @@ public class MithrilMine extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java
index 7e442c2e87..c9cbdda483 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java
@@ -105,7 +105,7 @@ public class MuseumDungeon extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter_instance"))
 		{
@@ -166,7 +166,7 @@ public class MuseumDungeon extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
index 150d8f3496..acd2b4b1f7 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
@@ -67,7 +67,7 @@ public class NightmareKamaloka extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -132,7 +132,7 @@ public class NightmareKamaloka extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
index 68ff2fba1b..d91167b4bb 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
@@ -93,7 +93,7 @@ public class NornilsGarden extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (isInInstance(world))
@@ -157,7 +157,7 @@ public class NornilsGarden extends AbstractInstance
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/Nursery/Nursery.java
index 2e394a7446..9042632611 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/Nursery/Nursery.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/Nursery/Nursery.java
@@ -192,7 +192,7 @@ public class Nursery extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance instance = npc.getInstanceWorld();
 		if (isInInstance(instance))
@@ -269,7 +269,7 @@ public class Nursery extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
index 8ddaa9cd0f..f78f43a9dc 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
@@ -101,7 +101,7 @@ public class PailakaDevilsLegacy extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter"))
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java
index b9b2064a77..07fcb7c67b 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java
@@ -139,7 +139,7 @@ public class PailakaInjuredDragon extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = player.getQuestState(Q00144_PailakaInjuredDragon.class.getSimpleName());
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
index 5f1d771719..64f2155310 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
@@ -105,7 +105,7 @@ public class PailakaRuneCastle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
index 00fb1c9096..7b25c61e9d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
@@ -63,7 +63,7 @@ public class PailakaSongOfIceAndFire extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -102,7 +102,7 @@ public class PailakaSongOfIceAndFire extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
index 422cbc96a0..48039ff29e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
@@ -173,7 +173,7 @@ public class PrisonOfDarkness extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -313,7 +313,7 @@ public class PrisonOfDarkness extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java
index c72d9b8646..da8c6e785c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java
@@ -162,7 +162,7 @@ public class SSQDisciplesNecropolisPast extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = player.getInstanceWorld();
 		if (world != null)
@@ -264,7 +264,7 @@ public class SSQDisciplesNecropolisPast extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java
index be0450dd2e..b4d398e7d9 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java
@@ -63,7 +63,7 @@ public class SSQLibraryOfSages extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = player.getInstanceWorld();
 		if (world != null)
@@ -103,7 +103,7 @@ public class SSQLibraryOfSages extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java
index e378631253..4b2f28016a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java
@@ -126,7 +126,7 @@ public class SSQMonasteryOfSilence extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = player.getInstanceWorld();
 		if (world != null)
@@ -218,7 +218,7 @@ public class SSQMonasteryOfSilence extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/SSQSanctumOftheLordsOfDawn/SSQSanctumOftheLordsOfDawn.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/SSQSanctumOftheLordsOfDawn/SSQSanctumOftheLordsOfDawn.java
index 9a84142109..863594e558 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/SSQSanctumOftheLordsOfDawn/SSQSanctumOftheLordsOfDawn.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/SSQSanctumOftheLordsOfDawn/SSQSanctumOftheLordsOfDawn.java
@@ -89,7 +89,7 @@ public class SSQSanctumOftheLordsOfDawn extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -126,7 +126,7 @@ public class SSQSanctumOftheLordsOfDawn extends AbstractInstance
 				player.teleToLocation(SAVE_POINT[npc.getScriptValue()]);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java
index dfb00caae2..d5bece244e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java
@@ -196,13 +196,13 @@ public class TaintedDimension extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java
index b0f641adfe..1c74f89fdf 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java
@@ -60,7 +60,7 @@ public class TalkingIslandPast extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -74,7 +74,7 @@ public class TalkingIslandPast extends AbstractInstance
 				teleportPlayerOut(player, world);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
index e4f0fea409..0aa8f7b0be 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
@@ -46,7 +46,7 @@ public class Q00013_ParcelDelivery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
index a9332344fe..5772a2064d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
@@ -44,7 +44,7 @@ public class Q00015_SweetWhispers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
index d825925804..37d92fabd2 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
@@ -53,7 +53,7 @@ public class Q00016_TheComingDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
index 4a1a62c19a..0e0ef5512d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
@@ -52,7 +52,7 @@ public class Q00017_LightAndDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
index c8de373b1f..cb246e0b70 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
@@ -47,7 +47,7 @@ public class Q00019_GoToThePastureland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
index 8467c0a18f..b161006570 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
@@ -44,7 +44,7 @@ public class Q00020_BringUpWithLove extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java
index 40d607557b..c52ab50412 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java
@@ -52,7 +52,7 @@ public class Q00026_TiredOfWaiting extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
index c1ede03985..b885fa960d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
@@ -56,7 +56,7 @@ public class Q00031_SecretBuriedInTheSwamp extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
index ab85113705..02fd7814dd 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
@@ -64,7 +64,7 @@ public class Q00032_AnObviousLie extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
index cff62495f3..7916e5fd79 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
@@ -53,7 +53,7 @@ public class Q00033_MakeAPairOfDressShoes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
index 629f0d440a..4ba35fa397 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
@@ -61,7 +61,7 @@ public class Q00034_InSearchOfCloth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
index 99bc974ff4..4f3318567f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
@@ -57,7 +57,7 @@ public class Q00035_FindGlitteringJewelry extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
index 9757c1e50d..77215c5860 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
@@ -53,7 +53,7 @@ public class Q00036_MakeASewingKit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
index 97d846f2a9..92b800016c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
@@ -54,7 +54,7 @@ public class Q00037_MakeFormalWear extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java
index bf248d2979..3f960fd905 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java
@@ -62,7 +62,7 @@ public class Q00038_DragonFangs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00039_RedEyedInvaders/Q00039_RedEyedInvaders.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00039_RedEyedInvaders/Q00039_RedEyedInvaders.java
index 4fad38ca19..98d9ae9315 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00039_RedEyedInvaders/Q00039_RedEyedInvaders.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00039_RedEyedInvaders/Q00039_RedEyedInvaders.java
@@ -59,7 +59,7 @@ public class Q00039_RedEyedInvaders extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
index 163aa23813..66e186b0f6 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
@@ -50,7 +50,7 @@ public class Q00040_ASpecialOrder extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
index 100213b849..fe31a6ab4e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
@@ -54,7 +54,7 @@ public class Q00042_HelpTheUncle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
index 9d5f9265df..a5d1225fca 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
@@ -60,7 +60,7 @@ public class Q00043_HelpTheSister extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
index 7cc6c0f337..a13197fc21 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
@@ -55,7 +55,7 @@ public class Q00044_HelpTheSon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java
index 40f94bc778..f5e2c90ed0 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java
@@ -43,7 +43,7 @@ public class Q00061_LawEnforcement extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
index 497ede1a1b..2f336b06fd 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
@@ -44,7 +44,7 @@ public class Q00109_InSearchOfTheNest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
index 15340bee9a..14c25c7237 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
@@ -43,7 +43,7 @@ public class Q00110_ToThePrimevalIsle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java
index 107f5789b6..f03064394b 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java
@@ -85,7 +85,7 @@ public class Q00111_ElrokianHuntersProof extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java
index b80c49a7fd..01a4539f57 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java
@@ -44,7 +44,7 @@ public class Q00113_StatusOfTheBeaconTower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java
index dd0bca4999..a85cbbfc9c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java
@@ -64,7 +64,7 @@ public class Q00114_ResurrectionOfAnOldManager extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
index 61b544f2f0..6d23e5039b 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
@@ -54,7 +54,7 @@ public class Q00115_TheOtherSideOfTruth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00117_TheOceanOfDistantStars/Q00117_TheOceanOfDistantStars.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00117_TheOceanOfDistantStars/Q00117_TheOceanOfDistantStars.java
index 32b638a0ea..d73c7abc26 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00117_TheOceanOfDistantStars/Q00117_TheOceanOfDistantStars.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00117_TheOceanOfDistantStars/Q00117_TheOceanOfDistantStars.java
@@ -62,7 +62,7 @@ public class Q00117_TheOceanOfDistantStars extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
index 720f90157c..7701c4bef7 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
@@ -44,7 +44,7 @@ public class Q00119_LastImperialPrince extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00120_PavelsLastResearch/Q00120_PavelsLastResearch.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00120_PavelsLastResearch/Q00120_PavelsLastResearch.java
index bfe1ca1acc..a3291bdafd 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00120_PavelsLastResearch/Q00120_PavelsLastResearch.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00120_PavelsLastResearch/Q00120_PavelsLastResearch.java
@@ -64,12 +64,12 @@ public class Q00120_PavelsLastResearch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
 		{
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		String html = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java
index af7e42a40e..bedeae5ab3 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java
@@ -40,7 +40,7 @@ public class Q00121_PavelTheGiant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java
index 29f3ef94b5..be0c05d5b7 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java
@@ -43,7 +43,7 @@ public class Q00122_OminousNews extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
index 84e03ee2a4..cdaa5c33f0 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
@@ -46,7 +46,7 @@ public class Q00124_MeetingTheElroki extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
index 0f59ea74d7..34b0e7404d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
@@ -77,7 +77,7 @@ public class Q00125_TheNameOfEvil1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
index c880bfcd78..2cdaa0aa91 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
@@ -55,7 +55,7 @@ public class Q00126_TheNameOfEvil2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
index d24519b130..60e67abdd0 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
@@ -82,7 +82,7 @@ public class Q00128_PailakaSongOfIceAndFire extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java
index 8afec644ae..f60ce01f79 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java
@@ -68,7 +68,7 @@ public class Q00129_PailakaDevilsLegacy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
index 3b340ac633..7d7eeb1bf5 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
@@ -72,7 +72,7 @@ public class Q00134_TempleMissionary extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
index b16e0481cc..c9771f6f78 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
@@ -70,7 +70,7 @@ public class Q00135_TempleExecutor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
index 62a45e847c..7e8051404a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
@@ -82,7 +82,7 @@ public class Q00136_MoreThanMeetsTheEye extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
index ffd1206433..f9ecfc2056 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
@@ -56,7 +56,7 @@ public class Q00137_TempleChampionPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
index 25dc2dc925..6a75d8880b 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
@@ -58,7 +58,7 @@ public class Q00138_TempleChampionPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
index df1521d00e..ff220cfb81 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
@@ -59,7 +59,7 @@ public class Q00139_ShadowFoxPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
index 2a37d17413..a168e639b0 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
@@ -68,7 +68,7 @@ public class Q00140_ShadowFoxPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
index c9b1f579f9..0df4d73fda 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
@@ -63,7 +63,7 @@ public class Q00141_ShadowFoxPart3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player, false);
 		if (st == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
index 0c1af718d5..78fb0e0b32 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
@@ -73,7 +73,7 @@ public class Q00142_FallenAngelRequestOfDawn extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
index 78a954764d..9d44b1bc42 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
@@ -52,7 +52,7 @@ public class Q00143_FallenAngelRequestOfDusk extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java
index 8f024cd03b..686696b998 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java
@@ -99,7 +99,7 @@ public class Q00144_PailakaInjuredDragon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java
index e22a0075dd..856ecd88b0 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java
@@ -53,7 +53,7 @@ public class Q00146_TheZeroHour extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java
index f197dee99a..44145d4eed 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java
@@ -50,7 +50,7 @@ public class Q00149_PrimalMotherIstina extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java
index 04ab71a2eb..2d50cdf25e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java
@@ -49,7 +49,7 @@ public class Q00150_ExtremeChallengePrimalMotherResurrected extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
index 422fe286e6..c0deea86c9 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
@@ -76,7 +76,7 @@ public class Q00177_SplitDestiny extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00180_InfernalFlamesBurningInCrystalPrison/Q00180_InfernalFlamesBurningInCrystalPrison.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00180_InfernalFlamesBurningInCrystalPrison/Q00180_InfernalFlamesBurningInCrystalPrison.java
index 3aadc906fe..7a005c6b00 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00180_InfernalFlamesBurningInCrystalPrison/Q00180_InfernalFlamesBurningInCrystalPrison.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00180_InfernalFlamesBurningInCrystalPrison/Q00180_InfernalFlamesBurningInCrystalPrison.java
@@ -53,7 +53,7 @@ public class Q00180_InfernalFlamesBurningInCrystalPrison extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java
index a325fcb987..d44207205c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java
@@ -54,7 +54,7 @@ public class Q00181_DevilsStrikeBackAdventOfBalok extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java
index 2c9337e950..cf6321781b 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java
@@ -47,7 +47,7 @@ public class Q00183_RelicExploration extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java
index 56fa89ac7f..416ef1fbd8 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java
@@ -54,7 +54,7 @@ public class Q00184_ArtOfPersuasion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java
index f98dd20667..5a3e22a29c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java
@@ -54,7 +54,7 @@ public class Q00185_NikolasCooperation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java
index e02899fc82..bc04a591e4 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java
@@ -68,7 +68,7 @@ public class Q00186_ContractExecution extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java
index 9c540f6338..a2460cb6c8 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java
@@ -49,7 +49,7 @@ public class Q00187_NikolasHeart extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java
index 5af9afe0fd..68da52d09c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java
@@ -49,7 +49,7 @@ public class Q00189_ContractCompletion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java
index 898d20eee3..45237f5fde 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java
@@ -46,7 +46,7 @@ public class Q00190_LostDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java
index 07c28bdb93..88b7048a5f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java
@@ -52,7 +52,7 @@ public class Q00192_SevenSignsSeriesOfDoubt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
index f81be2e67f..78a292d3d9 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
@@ -66,7 +66,7 @@ public class Q00193_SevenSignsDyingMessage extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == SHILENS_EVIL_THOUGHTS) && "despawn".equals(event))
 		{
@@ -76,7 +76,7 @@ public class Q00193_SevenSignsDyingMessage extends Quest
 				npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.NEXT_TIME_YOU_WILL_NOT_ESCAPE);
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
index 63ec681f3e..1420f8b7af 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
@@ -63,7 +63,7 @@ public class Q00194_SevenSignsMammonsContract extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java
index 4c400a55b1..122ede966b 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java
@@ -62,7 +62,7 @@ public class Q00195_SevenSignsSecretRitualOfThePriests extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java
index 5320deacab..129c02898e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java
@@ -60,14 +60,14 @@ public class Q00196_SevenSignsSealOfTheEmperor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == MERCHANT_OF_MAMMON) && "DESPAWN".equals(event))
 		{
 			isBusy = false;
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THE_ANCIENT_PROMISE_TO_THE_EMPEROR_HAS_BEEN_FULFILLED);
 			npc.deleteMe();
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
index 5dab25e1e5..092819fee0 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
@@ -62,7 +62,7 @@ public class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == SHILENS_EVIL_THOUGHTS) && "despawn".equals(event))
 		{
@@ -72,7 +72,7 @@ public class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
 				npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.NEXT_TIME_YOU_WILL_NOT_ESCAPE);
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
index c026781542..c1400b2fe9 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
@@ -65,7 +65,7 @@ public class Q00198_SevenSignsEmbryo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == SHILENS_EVIL_THOUGHTS) && "despawn".equals(event))
 		{
@@ -75,7 +75,7 @@ public class Q00198_SevenSignsEmbryo extends Quest
 				npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.NEXT_TIME_YOU_WILL_NOT_ESCAPE);
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java
index aaf98cd2ae..3495505fb2 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java
@@ -47,7 +47,7 @@ public class Q00210_ObtainAWolfPet extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java
index d0ea67a785..87a060a1c1 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java
@@ -56,7 +56,7 @@ public class Q00237_WindsOfChange extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java
index 31a6cd6c0f..006525cd6f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java
@@ -58,7 +58,7 @@ public class Q00238_SuccessFailureOfBusiness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java
index 1318b53727..e31a6f3e4f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java
@@ -58,7 +58,7 @@ public class Q00239_WontYouJoinUs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
index b8e21a687e..631714d268 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
@@ -65,7 +65,7 @@ public class Q00240_ImTheOnlyOneYouCanTrust extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java
index cef8901dd4..aec784b926 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java
@@ -77,7 +77,7 @@ public class Q00245_ComeToMe extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player.isMentor() && event.equals("30847-13.html"))
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java
index d563a46c8c..282ad1a84b 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java
@@ -135,7 +135,7 @@ public class Q00254_LegendaryTales extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java
index 5ff293f59c..69d9549a06 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java
@@ -61,7 +61,7 @@ public class Q00270_TheOneWhoEndsSilence extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java
index 74b891182a..812619fff6 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java
@@ -50,7 +50,7 @@ public class Q00278_HomeSecurity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00298_LizardmensConspiracy/Q00298_LizardmensConspiracy.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00298_LizardmensConspiracy/Q00298_LizardmensConspiracy.java
index e120a0e6c5..22b91e083a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00298_LizardmensConspiracy/Q00298_LizardmensConspiracy.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00298_LizardmensConspiracy/Q00298_LizardmensConspiracy.java
@@ -64,7 +64,7 @@ public class Q00298_LizardmensConspiracy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java
index 7041a462b2..7194fb9afd 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java
@@ -56,7 +56,7 @@ public class Q00307_ControlDeviceOfTheGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
index 0680c8e1ac..8002b57df8 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
@@ -73,7 +73,7 @@ public class Q00310_OnlyWhatRemains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java
index 4a131a976e..8abaacd4ac 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java
@@ -264,7 +264,7 @@ public class Q00336_CoinsOfMagic extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
index 0d07218c43..75053b1f0a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
@@ -113,7 +113,7 @@ public class Q00337_AudienceWithTheLandDragon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
index ec759daecc..42992e4797 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
@@ -86,7 +86,7 @@ public class Q00344_1000YearsTheEndOfLamentation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java
index 7d33a17da6..4f969e409e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java
@@ -149,7 +149,7 @@ public class Q00350_EnhanceYourWeapon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00357_WarehouseKeepersAmbition/Q00357_WarehouseKeepersAmbition.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00357_WarehouseKeepersAmbition/Q00357_WarehouseKeepersAmbition.java
index 26cdd98b6e..550ba52e5f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00357_WarehouseKeepersAmbition/Q00357_WarehouseKeepersAmbition.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00357_WarehouseKeepersAmbition/Q00357_WarehouseKeepersAmbition.java
@@ -56,7 +56,7 @@ public class Q00357_WarehouseKeepersAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/Q00359_ForASleeplessDeadman.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/Q00359_ForASleeplessDeadman.java
index 288b4479db..08014f2e38 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/Q00359_ForASleeplessDeadman.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/Q00359_ForASleeplessDeadman.java
@@ -71,7 +71,7 @@ public class Q00359_ForASleeplessDeadman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java
index 83367dcfbc..b25cd98ed0 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java
@@ -85,7 +85,7 @@ public class Q00371_ShrieksOfGhosts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00372_LegacyOfInsolence/Q00372_LegacyOfInsolence.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00372_LegacyOfInsolence/Q00372_LegacyOfInsolence.java
index bc5793418f..eaaa70bbd2 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00372_LegacyOfInsolence/Q00372_LegacyOfInsolence.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00372_LegacyOfInsolence/Q00372_LegacyOfInsolence.java
@@ -124,13 +124,13 @@ public class Q00372_LegacyOfInsolence extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		final int chance = getRandom(100);
 		if (qs == null)
 		{
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java
index 898da5400e..34b3f425ca 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java
@@ -153,7 +153,7 @@ public class Q00373_SupplierOfReagents extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java
index 749eba8a07..86885d704c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java
@@ -63,7 +63,7 @@ public class Q00376_ExplorationOfTheGiantsCavePart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java
index 3a52057d9a..5e4237d3d1 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java
@@ -66,7 +66,7 @@ public class Q00377_ExplorationOfTheGiantsCavePart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java
index c3e1ccf97e..a1a64e3167 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java
@@ -55,7 +55,7 @@ public class Q00381_LetsBecomeARoyalMember extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00382_KailsMagicCoin/Q00382_KailsMagicCoin.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00382_KailsMagicCoin/Q00382_KailsMagicCoin.java
index a0bcce3bb7..61ce390c1a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00382_KailsMagicCoin/Q00382_KailsMagicCoin.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00382_KailsMagicCoin/Q00382_KailsMagicCoin.java
@@ -66,7 +66,7 @@ public class Q00382_KailsMagicCoin extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
index a25f98dcb7..d0c8bd1115 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
@@ -124,7 +124,7 @@ public class Q00386_StolenDignity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (npc.getId() == WAREHOUSE_KEEPER_ROMP))
@@ -259,7 +259,7 @@ public class Q00386_StolenDignity extends Quest
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private String takeHtml(Player player, QuestState qs, int num)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
index 3d239e390f..c2014fda89 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
@@ -130,7 +130,7 @@ public class Q00420_LittleWing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
index 6390601ce2..14cbad6537 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
@@ -86,7 +86,7 @@ public class Q00421_LittleWingsBigAdventure extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java
index f405e8e276..b7d17445ed 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java
@@ -54,7 +54,7 @@ public class Q00431_WeddingMarch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java
index 7bef93d4f1..6e57baac6c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java
@@ -50,7 +50,7 @@ public class Q00432_BirthdayPartySong extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
index 47fc9d7da4..ee9504f119 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
@@ -54,7 +54,7 @@ public class Q00450_GraveRobberRescue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
index 47e03b544f..e38e415a0a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
@@ -61,7 +61,7 @@ public class Q00451_LuciensAltar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
index 946e2fb51d..be55660c3e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
@@ -50,7 +50,7 @@ public class Q00452_FindingtheLostSoldiers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
index 76ba1205f5..18e37daee3 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
@@ -174,7 +174,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java
index 507820dc6a..0fd000078b 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java
@@ -63,7 +63,7 @@ public class Q00454_CompletelyLost extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
index 6daf2a37e3..f67b20750b 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
@@ -91,7 +91,7 @@ public class Q00455_WingsOfSand extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
index 10f2f47f73..cabd56f883 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
@@ -230,7 +230,7 @@ public class Q00456_DontKnowDontCare extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java
index 524655a0ae..3aa766a77b 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java
@@ -65,7 +65,7 @@ public class Q00457_LostAndFound extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java
index 05ac4029e1..baf20da08a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java
@@ -83,7 +83,7 @@ public class Q00458_PerfectForm extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String noQuest = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00459_TheVillainOfTheUndergroundMineTeredor/Q00459_TheVillainOfTheUndergroundMineTeredor.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00459_TheVillainOfTheUndergroundMineTeredor/Q00459_TheVillainOfTheUndergroundMineTeredor.java
index bcec6a35af..0cf6ea0dcb 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00459_TheVillainOfTheUndergroundMineTeredor/Q00459_TheVillainOfTheUndergroundMineTeredor.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00459_TheVillainOfTheUndergroundMineTeredor/Q00459_TheVillainOfTheUndergroundMineTeredor.java
@@ -51,7 +51,7 @@ public class Q00459_TheVillainOfTheUndergroundMineTeredor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00460_PreciousResearchMaterial/Q00460_PreciousResearchMaterial.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00460_PreciousResearchMaterial/Q00460_PreciousResearchMaterial.java
index fb020c3040..981ff3c14e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00460_PreciousResearchMaterial/Q00460_PreciousResearchMaterial.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00460_PreciousResearchMaterial/Q00460_PreciousResearchMaterial.java
@@ -52,7 +52,7 @@ public class Q00460_PreciousResearchMaterial extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java
index bdda5c0ff1..2092e40879 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java
@@ -71,7 +71,7 @@ public class Q00462_StuffedAncientHeroes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java
index b7018cf82c..5b24a44f30 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java
@@ -110,7 +110,7 @@ public class Q00463_IMustBeaGenius extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java
index f7dbd2b655..4b978752e6 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java
@@ -87,7 +87,7 @@ public class Q00464_Oath extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00465_WeAreFriends/Q00465_WeAreFriends.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00465_WeAreFriends/Q00465_WeAreFriends.java
index 52d86f67f3..af30a59f5d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00465_WeAreFriends/Q00465_WeAreFriends.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00465_WeAreFriends/Q00465_WeAreFriends.java
@@ -51,7 +51,7 @@ public class Q00465_WeAreFriends extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java
index c350641b85..3eb4b71954 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java
@@ -83,7 +83,7 @@ public class Q00466_PlacingMySmallPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00468_BeLostInTheMysteriousScent/Q00468_BeLostInTheMysteriousScent.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00468_BeLostInTheMysteriousScent/Q00468_BeLostInTheMysteriousScent.java
index d880c919e2..5b347e1276 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00468_BeLostInTheMysteriousScent/Q00468_BeLostInTheMysteriousScent.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00468_BeLostInTheMysteriousScent/Q00468_BeLostInTheMysteriousScent.java
@@ -53,7 +53,7 @@ public class Q00468_BeLostInTheMysteriousScent extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00469_SuspiciousGardener/Q00469_SuspiciousGardener.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00469_SuspiciousGardener/Q00469_SuspiciousGardener.java
index 77e00cc205..c739186b4d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00469_SuspiciousGardener/Q00469_SuspiciousGardener.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00469_SuspiciousGardener/Q00469_SuspiciousGardener.java
@@ -52,7 +52,7 @@ public class Q00469_SuspiciousGardener extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00470_DivinityProtector/Q00470_DivinityProtector.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00470_DivinityProtector/Q00470_DivinityProtector.java
index 73c7cefac0..4948dcf1ee 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00470_DivinityProtector/Q00470_DivinityProtector.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00470_DivinityProtector/Q00470_DivinityProtector.java
@@ -72,7 +72,7 @@ public class Q00470_DivinityProtector extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00471_BreakingThroughTheEmeraldSquare/Q00471_BreakingThroughTheEmeraldSquare.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00471_BreakingThroughTheEmeraldSquare/Q00471_BreakingThroughTheEmeraldSquare.java
index 78f677a640..c563bbad31 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00471_BreakingThroughTheEmeraldSquare/Q00471_BreakingThroughTheEmeraldSquare.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00471_BreakingThroughTheEmeraldSquare/Q00471_BreakingThroughTheEmeraldSquare.java
@@ -50,7 +50,7 @@ public class Q00471_BreakingThroughTheEmeraldSquare extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00472_ChallengeSteamCorridor/Q00472_ChallengeSteamCorridor.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00472_ChallengeSteamCorridor/Q00472_ChallengeSteamCorridor.java
index 69f96d292c..0d36fed463 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00472_ChallengeSteamCorridor/Q00472_ChallengeSteamCorridor.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00472_ChallengeSteamCorridor/Q00472_ChallengeSteamCorridor.java
@@ -50,7 +50,7 @@ public class Q00472_ChallengeSteamCorridor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00473_InTheCoralGarden/Q00473_InTheCoralGarden.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00473_InTheCoralGarden/Q00473_InTheCoralGarden.java
index 3331b4528f..7489bd9a3f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00473_InTheCoralGarden/Q00473_InTheCoralGarden.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00473_InTheCoralGarden/Q00473_InTheCoralGarden.java
@@ -50,7 +50,7 @@ public class Q00473_InTheCoralGarden extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00474_WaitingForTheSummer/Q00474_WaitingForTheSummer.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00474_WaitingForTheSummer/Q00474_WaitingForTheSummer.java
index 51691cc5ff..7d5a64da50 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00474_WaitingForTheSummer/Q00474_WaitingForTheSummer.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00474_WaitingForTheSummer/Q00474_WaitingForTheSummer.java
@@ -59,7 +59,7 @@ public class Q00474_WaitingForTheSummer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java
index 3890d7cd62..d98e0f6ace 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java
@@ -79,7 +79,7 @@ public class Q00476_PlainMission extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00481_ShadowHelper/Q00481_ShadowHelper.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00481_ShadowHelper/Q00481_ShadowHelper.java
index adedcb6f7f..5aa50bf5bd 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00481_ShadowHelper/Q00481_ShadowHelper.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00481_ShadowHelper/Q00481_ShadowHelper.java
@@ -75,7 +75,7 @@ public class Q00481_ShadowHelper extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00482_RecertificationOfValue/Q00482_RecertificationOfValue.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00482_RecertificationOfValue/Q00482_RecertificationOfValue.java
index 62d524dfd3..35d3fa4406 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00482_RecertificationOfValue/Q00482_RecertificationOfValue.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00482_RecertificationOfValue/Q00482_RecertificationOfValue.java
@@ -131,7 +131,7 @@ public class Q00482_RecertificationOfValue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java
index e15e32b144..c10c564ffb 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java
@@ -68,7 +68,7 @@ public class Q00483_IntendedTactic extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00485_HotSpringWater/Q00485_HotSpringWater.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00485_HotSpringWater/Q00485_HotSpringWater.java
index a35badf96b..6b75b6753e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00485_HotSpringWater/Q00485_HotSpringWater.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00485_HotSpringWater/Q00485_HotSpringWater.java
@@ -62,7 +62,7 @@ public class Q00485_HotSpringWater extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00488_WondersOfCaring/Q00488_WondersOfCaring.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00488_WondersOfCaring/Q00488_WondersOfCaring.java
index a310d9ea60..7f6097ddf1 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00488_WondersOfCaring/Q00488_WondersOfCaring.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00488_WondersOfCaring/Q00488_WondersOfCaring.java
@@ -61,7 +61,7 @@ public class Q00488_WondersOfCaring extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00489_InThisQuietPlace/Q00489_InThisQuietPlace.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00489_InThisQuietPlace/Q00489_InThisQuietPlace.java
index 6da9fd75c7..12cf169210 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00489_InThisQuietPlace/Q00489_InThisQuietPlace.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00489_InThisQuietPlace/Q00489_InThisQuietPlace.java
@@ -58,7 +58,7 @@ public class Q00489_InThisQuietPlace extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java
index 4c6f1e68d7..19f3e9b8c6 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java
@@ -74,7 +74,7 @@ public class Q00490_DutyOfTheSurvivor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00491_InNominePatris/Q00491_InNominePatris.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00491_InNominePatris/Q00491_InNominePatris.java
index 3090a9cabe..915b628983 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00491_InNominePatris/Q00491_InNominePatris.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00491_InNominePatris/Q00491_InNominePatris.java
@@ -63,7 +63,7 @@ public class Q00491_InNominePatris extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00492_TombRaiders/Q00492_TombRaiders.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00492_TombRaiders/Q00492_TombRaiders.java
index e45ffa88ae..78553efafa 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00492_TombRaiders/Q00492_TombRaiders.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00492_TombRaiders/Q00492_TombRaiders.java
@@ -59,7 +59,7 @@ public class Q00492_TombRaiders extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java
index 0ccf941b24..9519660a54 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java
@@ -53,7 +53,7 @@ public class Q00493_KickingOutUnwelcomeGuests extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java
index 0f9eb53194..4084aa0142 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java
@@ -49,7 +49,7 @@ public class Q00494_IncarnationOfGreedZellakaGroup extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java
index ccf3cd1614..e3fe44aa0f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java
@@ -49,7 +49,7 @@ public class Q00495_IncarnationOfJealousyPellineGroup extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java
index 366e0d572d..94df5d6174 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java
@@ -49,7 +49,7 @@ public class Q00496_IncarnationOfGluttonyKaliosGroup extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java
index 008f69dd2f..d1580e694f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java
@@ -49,7 +49,7 @@ public class Q00497_IncarnationOfGreedZellakaSolo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java
index fe6d1060e8..9585452d7d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java
@@ -49,7 +49,7 @@ public class Q00498_IncarnationOfJealousyPellineSolo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java
index 3023aa50c3..3c2e128522 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java
@@ -49,7 +49,7 @@ public class Q00499_IncarnationOfGluttonyKaliosSolo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
index fe55c5fcac..b93014bb39 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
@@ -69,7 +69,7 @@ public class Q00500_BrothersBoundInChains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java
index ffc938563f..9004f3f63d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java
@@ -106,7 +106,7 @@ public class Q00501_ProofOfClanAlliance extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java
index 1496baa0e7..fa050bef5e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java
@@ -85,7 +85,7 @@ public class Q00503_PursuitOfClanAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
index 1badd9d119..840fe1eb90 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
@@ -74,7 +74,7 @@ public class Q00508_AClansReputation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
index 41dec6a58c..dbc9ddda44 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
@@ -68,7 +68,7 @@ public class Q00509_AClansFame extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
index 4a03ad47de..5a3658c28d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
@@ -56,7 +56,7 @@ public class Q00510_AClansPrestige extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
index 8facc4a8cd..6476fcc9c3 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
@@ -71,7 +71,7 @@ public class Q00511_AwlUnderFoot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
index eab4647ba2..31444f8866 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
@@ -58,7 +58,7 @@ public class Q00512_BladeUnderFoot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
index 355d1f784d..7cb28be867 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
@@ -50,7 +50,7 @@ public class Q00551_OlympiadStarter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
index f9ceaad342..1bff1a3287 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
@@ -50,7 +50,7 @@ public class Q00553_OlympiadUndefeated extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
index 295b613316..d362ed8b48 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
@@ -84,7 +84,7 @@ public class Q00617_GatherTheFlames extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
index 22d8a3f362..481380c065 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
@@ -65,7 +65,7 @@ public class Q00618_IntoTheFlame extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
index 24dc552a09..554a65b448 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
@@ -108,7 +108,7 @@ public class Q00620_FourGoblets extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = player.getQuestState(getName());
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
index effc3c81e3..e473202bfa 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
@@ -62,7 +62,7 @@ public class Q00621_EggDelivery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
index 8a857ca301..0aa311db9e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
@@ -62,7 +62,7 @@ public class Q00622_SpecialtyLiquorDelivery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
index a464df7f99..a0ed4ec2a8 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
@@ -66,7 +66,7 @@ public class Q00623_TheFinestFood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java
index 14186fe7cd..04f2973120 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java
@@ -62,7 +62,7 @@ public class Q00624_TheFinestIngredientsPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java
index 95f6b485ff..60ebcab67e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java
@@ -68,7 +68,7 @@ public class Q00625_TheFinestIngredientsPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java
index 326d893b5a..50657405cf 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java
@@ -75,7 +75,7 @@ public class Q00626_ADarkTwilight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
index 335ef36527..882e4a1ad1 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
@@ -78,7 +78,7 @@ public class Q00627_HeartInSearchOfPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
index 79d69e4221..d4e6a5b7a8 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
@@ -88,7 +88,7 @@ public class Q00631_DeliciousTopChoiceMeat extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
index 6ab1e34b5a..f7548f5322 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
@@ -57,7 +57,7 @@ public class Q00641_AttackSailren extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
index 3ad4eb9269..f4030b7e1d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
@@ -66,7 +66,7 @@ public class Q00642_APowerfulPrimevalCreature extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
index 41c5a83b2a..48d241ef82 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
@@ -103,7 +103,7 @@ public class Q00643_RiseAndFallOfTheElrokiTribe extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
index 48300286de..0a8cdae471 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
@@ -59,7 +59,7 @@ public class Q00645_GhostsOfBatur extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java
index 40ef32a651..20e5dd840e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java
@@ -80,7 +80,7 @@ public class Q00647_InfluxOfMachines extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
index 6f6013cac1..ff2f3a5bfe 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
@@ -99,7 +99,7 @@ public class Q00648_AnIceMerchantsDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		final QuestState q115 = player.getQuestState(Q00115_TheOtherSideOfTruth.class.getSimpleName());
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java
index b776b73a69..f34fd0f9fe 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java
@@ -61,7 +61,7 @@ public class Q00650_ABrokenDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java
index 8846fa0e4f..0fab46f486 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java
@@ -43,7 +43,7 @@ public class Q00652_AnAgedExAdventurer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
index e012de30f8..b36fd12f72 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
@@ -90,7 +90,7 @@ public class Q00662_AGameOfCards extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
index 3b05df07a2..51e520cc09 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
@@ -153,7 +153,7 @@ public class Q00663_SeductiveWhispers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
index 1dfdc81b32..e1e41ba51e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
@@ -49,7 +49,7 @@ public class Q00688_DefeatTheElrokianRaiders extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java
index 97ecb144e4..236bff07e5 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java
@@ -64,7 +64,7 @@ public class Q00699_GuardianOfTheSkies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java
index bf91aac310..9ca69608a5 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java
@@ -72,7 +72,7 @@ public class Q00700_CursedLife extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java
index 5408b7064b..99384aeb93 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java
@@ -65,7 +65,7 @@ public class Q00701_ProofOfExistence extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player, false);
 		if (st == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java
index 23ecdaf28c..4764cf132d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java
@@ -62,7 +62,7 @@ public class Q00702_ATrapForRevenge extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
index 0278e46ec2..17895d5c45 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
@@ -69,7 +69,7 @@ public class Q00726_LightWithinTheDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
index da19640964..bd744f7aaa 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
@@ -57,7 +57,7 @@ public class Q00727_HopeWithinTheDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java
index 9161bfd4b9..31eace47ba 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java
@@ -72,7 +72,7 @@ public class Q00751_LiberatingTheSpirits extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java
index 3c5f3d9861..e22b624bc5 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java
@@ -70,7 +70,7 @@ public class Q00752_UncoverTheSecret extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java
index 6f5853054b..935c3a7c37 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java
@@ -78,7 +78,7 @@ public class Q00753_ReactingToACrisis extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00754_AssistingTheRebelForces/Q00754_AssistingTheRebelForces.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00754_AssistingTheRebelForces/Q00754_AssistingTheRebelForces.java
index efd21fd055..fbbb9eb5c6 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00754_AssistingTheRebelForces/Q00754_AssistingTheRebelForces.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00754_AssistingTheRebelForces/Q00754_AssistingTheRebelForces.java
@@ -54,7 +54,7 @@ public class Q00754_AssistingTheRebelForces extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00755_InNeedOfPetras/Q00755_InNeedOfPetras.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00755_InNeedOfPetras/Q00755_InNeedOfPetras.java
index 20aa2199c8..09d9216654 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00755_InNeedOfPetras/Q00755_InNeedOfPetras.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00755_InNeedOfPetras/Q00755_InNeedOfPetras.java
@@ -67,7 +67,7 @@ public class Q00755_InNeedOfPetras extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java
index 40e84f4dd0..9038173a19 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java
@@ -48,7 +48,7 @@ public class Q00756_TopQualityPetra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java
index 1927ac253f..0b6815a166 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java
@@ -71,7 +71,7 @@ public class Q00757_TriolsMovement extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java
index 0578c5952a..c777c72641 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java
@@ -70,7 +70,7 @@ public class Q00758_TheFallenKingsMen extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00759_TheDwarvenNightmareContinues/Q00759_TheDwarvenNightmareContinues.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00759_TheDwarvenNightmareContinues/Q00759_TheDwarvenNightmareContinues.java
index e0db615674..4715b055c5 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00759_TheDwarvenNightmareContinues/Q00759_TheDwarvenNightmareContinues.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00759_TheDwarvenNightmareContinues/Q00759_TheDwarvenNightmareContinues.java
@@ -68,7 +68,7 @@ public class Q00759_TheDwarvenNightmareContinues extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java
index bbe8918eef..42b3fd1c01 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java
@@ -87,7 +87,7 @@ public class Q00761_AssistingTheGoldenRamArmy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java
index 709817b6a5..ac13b91b3e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java
@@ -116,7 +116,7 @@ public class Q00762_AnOminousRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java
index ddad40b600..dd5413d73a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java
@@ -93,7 +93,7 @@ public class Q00763_ADauntingTask extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00764_WeakeningTheVarkaSilenosForces/Q00764_WeakeningTheVarkaSilenosForces.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00764_WeakeningTheVarkaSilenosForces/Q00764_WeakeningTheVarkaSilenosForces.java
index 5e10448397..fe404d0596 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00764_WeakeningTheVarkaSilenosForces/Q00764_WeakeningTheVarkaSilenosForces.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00764_WeakeningTheVarkaSilenosForces/Q00764_WeakeningTheVarkaSilenosForces.java
@@ -73,7 +73,7 @@ public class Q00764_WeakeningTheVarkaSilenosForces extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00765_WeakeningTheKetraOrcForces/Q00765_WeakeningTheKetraOrcForces.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00765_WeakeningTheKetraOrcForces/Q00765_WeakeningTheKetraOrcForces.java
index c700da56d0..84017857a4 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00765_WeakeningTheKetraOrcForces/Q00765_WeakeningTheKetraOrcForces.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00765_WeakeningTheKetraOrcForces/Q00765_WeakeningTheKetraOrcForces.java
@@ -73,7 +73,7 @@ public class Q00765_WeakeningTheKetraOrcForces extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00772_PurifyingSouls/Q00772_PurifyingSouls.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00772_PurifyingSouls/Q00772_PurifyingSouls.java
index e0ef1a907d..7da7d40be7 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00772_PurifyingSouls/Q00772_PurifyingSouls.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00772_PurifyingSouls/Q00772_PurifyingSouls.java
@@ -69,7 +69,7 @@ public class Q00772_PurifyingSouls extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java
index 1421423772..1c9feb9a4a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java
@@ -81,7 +81,7 @@ public class Q00775_RetrievingTheChaosFragment extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java
index ac2f54fa8d..18b9f67179 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java
@@ -49,7 +49,7 @@ public class Q00776_SlayDarkLordEkimus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java
index dad6a31213..ff385c026f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java
@@ -50,7 +50,7 @@ public class Q00777_SlayDarkLordTiat extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java
index c2266256c4..9cf140a913 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java
@@ -76,7 +76,7 @@ public class Q00778_OperationRoaringFlame extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00779_UtilizeTheDarknessSeedOfDestruction/Q00779_UtilizeTheDarknessSeedOfDestruction.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00779_UtilizeTheDarknessSeedOfDestruction/Q00779_UtilizeTheDarknessSeedOfDestruction.java
index 15fa0b1e53..c6fac96851 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00779_UtilizeTheDarknessSeedOfDestruction/Q00779_UtilizeTheDarknessSeedOfDestruction.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00779_UtilizeTheDarknessSeedOfDestruction/Q00779_UtilizeTheDarknessSeedOfDestruction.java
@@ -72,7 +72,7 @@ public class Q00779_UtilizeTheDarknessSeedOfDestruction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00780_UtilizeTheDarknessSeedOfInfinity/Q00780_UtilizeTheDarknessSeedOfInfinity.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00780_UtilizeTheDarknessSeedOfInfinity/Q00780_UtilizeTheDarknessSeedOfInfinity.java
index a71bdf61dc..3820918c63 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00780_UtilizeTheDarknessSeedOfInfinity/Q00780_UtilizeTheDarknessSeedOfInfinity.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00780_UtilizeTheDarknessSeedOfInfinity/Q00780_UtilizeTheDarknessSeedOfInfinity.java
@@ -61,7 +61,7 @@ public class Q00780_UtilizeTheDarknessSeedOfInfinity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00781_UtilizeTheDarknessSeedOfAnnihilation/Q00781_UtilizeTheDarknessSeedOfAnnihilation.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00781_UtilizeTheDarknessSeedOfAnnihilation/Q00781_UtilizeTheDarknessSeedOfAnnihilation.java
index 190b971f36..d662d9fc6d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00781_UtilizeTheDarknessSeedOfAnnihilation/Q00781_UtilizeTheDarknessSeedOfAnnihilation.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00781_UtilizeTheDarknessSeedOfAnnihilation/Q00781_UtilizeTheDarknessSeedOfAnnihilation.java
@@ -78,7 +78,7 @@ public class Q00781_UtilizeTheDarknessSeedOfAnnihilation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00782_UtilizeTheDarknessSeedOfHellfire/Q00782_UtilizeTheDarknessSeedOfHellfire.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00782_UtilizeTheDarknessSeedOfHellfire/Q00782_UtilizeTheDarknessSeedOfHellfire.java
index 7feaaf443e..3b181f5417 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00782_UtilizeTheDarknessSeedOfHellfire/Q00782_UtilizeTheDarknessSeedOfHellfire.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00782_UtilizeTheDarknessSeedOfHellfire/Q00782_UtilizeTheDarknessSeedOfHellfire.java
@@ -79,7 +79,7 @@ public class Q00782_UtilizeTheDarknessSeedOfHellfire extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00784_TheQuietKiller/Q00784_TheQuietKiller.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00784_TheQuietKiller/Q00784_TheQuietKiller.java
index aedc8da4cb..ab46f32466 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00784_TheQuietKiller/Q00784_TheQuietKiller.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00784_TheQuietKiller/Q00784_TheQuietKiller.java
@@ -70,7 +70,7 @@ public class Q00784_TheQuietKiller extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00785_ASuspiciousIngredient/Q00785_ASuspiciousIngredient.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00785_ASuspiciousIngredient/Q00785_ASuspiciousIngredient.java
index 036949a7aa..aad77c1617 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00785_ASuspiciousIngredient/Q00785_ASuspiciousIngredient.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00785_ASuspiciousIngredient/Q00785_ASuspiciousIngredient.java
@@ -82,7 +82,7 @@ public class Q00785_ASuspiciousIngredient extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00786_AwaitingTheVoiceOfTheGods/Q00786_AwaitingTheVoiceOfTheGods.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00786_AwaitingTheVoiceOfTheGods/Q00786_AwaitingTheVoiceOfTheGods.java
index 108b6b5efe..1ac648c4b4 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00786_AwaitingTheVoiceOfTheGods/Q00786_AwaitingTheVoiceOfTheGods.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00786_AwaitingTheVoiceOfTheGods/Q00786_AwaitingTheVoiceOfTheGods.java
@@ -74,7 +74,7 @@ public class Q00786_AwaitingTheVoiceOfTheGods extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java
index cbc8f95c2a..8c0a519de9 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java
@@ -78,7 +78,7 @@ public class Q00787_TheRoleOfAWatcher extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00789_WaitingForPaagrio/Q00789_WaitingForPaagrio.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00789_WaitingForPaagrio/Q00789_WaitingForPaagrio.java
index ab35b9c767..ea6997ed3a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00789_WaitingForPaagrio/Q00789_WaitingForPaagrio.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00789_WaitingForPaagrio/Q00789_WaitingForPaagrio.java
@@ -75,7 +75,7 @@ public final class Q00789_WaitingForPaagrio extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
index 1140fc7490..2a6c62bb48 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
@@ -58,7 +58,7 @@ public class Q00901_HowLavasaurusesAreMade extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java
index b16bc679ac..d9d162c9f1 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java
@@ -77,7 +77,7 @@ public class Q00902_ReclaimOurEra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
index 36444e64ea..d5a5ab6b4c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
@@ -55,7 +55,7 @@ public class Q00903_TheCallOfAntharas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00904_DragonTrophyAntharas/Q00904_DragonTrophyAntharas.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00904_DragonTrophyAntharas/Q00904_DragonTrophyAntharas.java
index c635256fe0..3df27480bb 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00904_DragonTrophyAntharas/Q00904_DragonTrophyAntharas.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00904_DragonTrophyAntharas/Q00904_DragonTrophyAntharas.java
@@ -60,7 +60,7 @@ public class Q00904_DragonTrophyAntharas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
index 40d7efb2cc..51fff3997d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
@@ -103,7 +103,7 @@ public class Q00905_RefinedDragonBlood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
index f2ad5396ea..5e11d70ca8 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
@@ -65,7 +65,7 @@ public class Q00906_TheCallOfValakas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java
index 50e65f2d21..d4737c9a91 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java
@@ -60,7 +60,7 @@ public class Q00907_DragonTrophyValakas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00943_FillingTheEnergyOfDestruction/Q00943_FillingTheEnergyOfDestruction.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00943_FillingTheEnergyOfDestruction/Q00943_FillingTheEnergyOfDestruction.java
index b8fba38e65..5889b73eae 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00943_FillingTheEnergyOfDestruction/Q00943_FillingTheEnergyOfDestruction.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00943_FillingTheEnergyOfDestruction/Q00943_FillingTheEnergyOfDestruction.java
@@ -73,7 +73,7 @@ public class Q00943_FillingTheEnergyOfDestruction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
index 2fbbe388b7..f5e61c063c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
@@ -54,7 +54,7 @@ public class Q10273_GoodDayToFly extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
index 92298a9598..c5cf9c1ed5 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
@@ -64,7 +64,7 @@ public class Q10274_CollectingInTheAir extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
index 80b9cdef66..f0eae3e565 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
@@ -60,7 +60,7 @@ public class Q10275_ContainingTheAttributePower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
index aea1e23329..adb2982ac1 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
@@ -48,7 +48,7 @@ public class Q10282_ToTheSeedOfAnnihilation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
index e5310632bd..dc9e9a1de4 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
@@ -51,7 +51,7 @@ public class Q10283_RequestOfIceMerchant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java
index c8822c8a8a..fb0cefa677 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java
@@ -54,7 +54,7 @@ public class Q10284_AcquisitionOfDivineSword extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
index a5a7eaace6..d0294d0369 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
@@ -55,7 +55,7 @@ public class Q10285_MeetingSirra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
index b9a00e8388..94f82457bd 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
@@ -56,7 +56,7 @@ public class Q10286_ReunionWithSirra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
index c072297d38..d98cd117bd 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
@@ -50,7 +50,7 @@ public class Q10287_StoryOfThoseLeft extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
index 6603c62c8f..88a4a9ebb4 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
@@ -48,7 +48,7 @@ public class Q10288_SecretMission extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java
index ebc3b15a3a..19e9c7f984 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java
@@ -48,7 +48,7 @@ public class Q10289_FadeToBlack extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
index 58aafa7832..8763b47647 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
@@ -54,7 +54,7 @@ public class Q10290_LandDragonConqueror extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
index ba1ee9eae4..7f62dc6645 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
@@ -52,7 +52,7 @@ public class Q10291_FireDragonDestroyer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
index 4a68875612..63cbf86f69 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
@@ -69,7 +69,7 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java
index 9578509dc1..f80fbdc02b 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java
@@ -57,7 +57,7 @@ public class Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java
index 72d0ca7ed5..0ddc585beb 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java
@@ -95,7 +95,7 @@ public class Q10294_SevenSignsToTheMonasteryOfSilence extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java
index 747a9b8e55..fff91fc378 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java
@@ -105,7 +105,7 @@ public class Q10295_SevenSignsSolinasTomb extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java
index e4cf9dbdf6..f350112a68 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java
@@ -60,7 +60,7 @@ public class Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java
index 5f07c99e9a..11d738f50b 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java
@@ -71,7 +71,7 @@ public class Q10301_ShadowOfTerrorBlackishRedFog extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10302_UnsettlingShadowAndRumors/Q10302_UnsettlingShadowAndRumors.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10302_UnsettlingShadowAndRumors/Q10302_UnsettlingShadowAndRumors.java
index 35634b2208..0ef255822a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10302_UnsettlingShadowAndRumors/Q10302_UnsettlingShadowAndRumors.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10302_UnsettlingShadowAndRumors/Q10302_UnsettlingShadowAndRumors.java
@@ -51,7 +51,7 @@ public class Q10302_UnsettlingShadowAndRumors extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java
index 075ada8600..77e10de1fd 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java
@@ -75,7 +75,7 @@ public class Q10303_CrossroadsBetweenLightAndDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java
index 2b1418f07c..81ad6d4996 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java
@@ -75,7 +75,7 @@ public class Q10304_ForForgottenHeroes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java
index 679a617f05..f1df52055e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java
@@ -53,7 +53,7 @@ public class Q10305_UnstoppableFutileEfforts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10306_TheCorruptedLeader/Q10306_TheCorruptedLeader.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10306_TheCorruptedLeader/Q10306_TheCorruptedLeader.java
index 6c34bbf0ec..e400458693 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10306_TheCorruptedLeader/Q10306_TheCorruptedLeader.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10306_TheCorruptedLeader/Q10306_TheCorruptedLeader.java
@@ -59,7 +59,7 @@ public class Q10306_TheCorruptedLeader extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java
index 836ba2610b..b557c0b277 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java
@@ -56,7 +56,7 @@ public class Q10307_TheCorruptedLeaderHisTruth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10310_TwistedCreationTree/Q10310_TwistedCreationTree.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10310_TwistedCreationTree/Q10310_TwistedCreationTree.java
index 9a5f3e93df..6eb9953cdc 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10310_TwistedCreationTree/Q10310_TwistedCreationTree.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10310_TwistedCreationTree/Q10310_TwistedCreationTree.java
@@ -56,7 +56,7 @@ public class Q10310_TwistedCreationTree extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java
index 9e2c35dd09..8971512507 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java
@@ -46,7 +46,7 @@ public class Q10311_PeacefulDaysAreOver extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java
index c7dc807cdf..40c76b9e2f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java
@@ -55,7 +55,7 @@ public class Q10312_AbandonedGodsCreature extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java
index 8f25603bcc..a17c3ebaf6 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java
@@ -49,7 +49,7 @@ public class Q10315_ToThePrisonOfDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java
index 9c05b1f86e..eed57ef8dc 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java
@@ -56,7 +56,7 @@ public class Q10316_UndecayingMemoryOfThePast extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java
index faa824d4eb..c28308b733 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java
@@ -44,7 +44,7 @@ public class Q10317_OrbisWitch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java
index b92fa5339e..d79519ea24 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java
@@ -68,7 +68,7 @@ public class Q10318_DecayingDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java
index d255cd6511..db013985a5 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java
@@ -60,7 +60,7 @@ public class Q10320_LetsGoToTheCentralSquare extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java
index a3dbb72cb9..80d7904685 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java
@@ -49,7 +49,7 @@ public class Q10321_QualificationsOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/Q10322_SearchingForTheMysteriousPower.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/Q10322_SearchingForTheMysteriousPower.java
index f119759a61..29df370feb 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/Q10322_SearchingForTheMysteriousPower.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/Q10322_SearchingForTheMysteriousPower.java
@@ -86,7 +86,7 @@ public class Q10322_SearchingForTheMysteriousPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/Q10323_TrainLikeItsReal.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/Q10323_TrainLikeItsReal.java
index 14eb605eb2..430904627f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/Q10323_TrainLikeItsReal.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/Q10323_TrainLikeItsReal.java
@@ -61,7 +61,7 @@ public class Q10323_TrainLikeItsReal extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/Q10324_FindingMagisterGallint.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/Q10324_FindingMagisterGallint.java
index 67d68d86c7..0036622855 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/Q10324_FindingMagisterGallint.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/Q10324_FindingMagisterGallint.java
@@ -47,7 +47,7 @@ public class Q10324_FindingMagisterGallint extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/Q10325_SearchingForNewPower.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/Q10325_SearchingForNewPower.java
index 980bfdb126..64ccbbb949 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/Q10325_SearchingForNewPower.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/Q10325_SearchingForNewPower.java
@@ -56,7 +56,7 @@ public class Q10325_SearchingForNewPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10326_RespectYourElders/Q10326_RespectYourElders.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10326_RespectYourElders/Q10326_RespectYourElders.java
index 38090b7545..af9d431814 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10326_RespectYourElders/Q10326_RespectYourElders.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10326_RespectYourElders/Q10326_RespectYourElders.java
@@ -68,7 +68,7 @@ public class Q10326_RespectYourElders extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/Q10327_IntruderWhoWantsTheBookOfGiants.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/Q10327_IntruderWhoWantsTheBookOfGiants.java
index ce7e3ae6ad..9e7d997f17 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/Q10327_IntruderWhoWantsTheBookOfGiants.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/Q10327_IntruderWhoWantsTheBookOfGiants.java
@@ -51,7 +51,7 @@ public class Q10327_IntruderWhoWantsTheBookOfGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10328_RequestToSealTheEvilFragment/Q10328_RequestToSealTheEvilFragment.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10328_RequestToSealTheEvilFragment/Q10328_RequestToSealTheEvilFragment.java
index 07763e049a..8ddb8c0d8c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10328_RequestToSealTheEvilFragment/Q10328_RequestToSealTheEvilFragment.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10328_RequestToSealTheEvilFragment/Q10328_RequestToSealTheEvilFragment.java
@@ -49,7 +49,7 @@ public class Q10328_RequestToSealTheEvilFragment extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10329_BackupSeekers/Q10329_BackupSeekers.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10329_BackupSeekers/Q10329_BackupSeekers.java
index 28f958e3fe..62810b5451 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10329_BackupSeekers/Q10329_BackupSeekers.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10329_BackupSeekers/Q10329_BackupSeekers.java
@@ -83,7 +83,7 @@ public class Q10329_BackupSeekers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java
index d87b14e791..c791f34718 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java
@@ -52,7 +52,7 @@ public class Q10330_ToTheRuinsOfYeSagira extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java
index afcf9d4622..8a5d9e447e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java
@@ -74,7 +74,7 @@ public class Q10331_StartOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10332_ToughRoad/Q10332_ToughRoad.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10332_ToughRoad/Q10332_ToughRoad.java
index 0ec104da2a..cafb348a86 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10332_ToughRoad/Q10332_ToughRoad.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10332_ToughRoad/Q10332_ToughRoad.java
@@ -57,7 +57,7 @@ public class Q10332_ToughRoad extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java
index 1f30d7ba2b..780273250e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java
@@ -65,7 +65,7 @@ public class Q10333_DisappearedSakum extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10334_ReportingTheStatusOfTheWindmillHill/Q10334_ReportingTheStatusOfTheWindmillHill.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10334_ReportingTheStatusOfTheWindmillHill/Q10334_ReportingTheStatusOfTheWindmillHill.java
index af92819fea..d6fa3cc296 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10334_ReportingTheStatusOfTheWindmillHill/Q10334_ReportingTheStatusOfTheWindmillHill.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10334_ReportingTheStatusOfTheWindmillHill/Q10334_ReportingTheStatusOfTheWindmillHill.java
@@ -49,7 +49,7 @@ public class Q10334_ReportingTheStatusOfTheWindmillHill extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java
index fd75a5574f..d0b51c1c17 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java
@@ -58,7 +58,7 @@ public class Q10335_RequestToFindSakum extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10336_DividedSakumKanilov/Q10336_DividedSakumKanilov.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10336_DividedSakumKanilov/Q10336_DividedSakumKanilov.java
index b0b1051d9f..8b0acf0de3 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10336_DividedSakumKanilov/Q10336_DividedSakumKanilov.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10336_DividedSakumKanilov/Q10336_DividedSakumKanilov.java
@@ -57,7 +57,7 @@ public class Q10336_DividedSakumKanilov extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java
index 8154285f16..4d3d655611 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java
@@ -58,7 +58,7 @@ public class Q10337_SakumsImpact extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
index edc0bdf638..b92033f3e6 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
@@ -66,7 +66,7 @@ public class Q10338_SeizeYourDestiny extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java
index a8277707fa..1d6eeab187 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java
@@ -66,7 +66,7 @@ public class Q10339_FightingTheForgotten extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java
index 9bb47bafb8..718b70bbcd 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java
@@ -48,7 +48,7 @@ public class Q10341_DayOfDestinyHumansFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10341_DayOfDestinyHumansFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java
index 715453f3bb..071deb3562 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java
@@ -48,7 +48,7 @@ public class Q10342_DayOfDestinyElvenFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10342_DayOfDestinyElvenFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java
index b958ae1683..5701012e2c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java
@@ -48,7 +48,7 @@ public class Q10343_DayOfDestinyDarkElfsFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10343_DayOfDestinyDarkElfsFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java
index 3a9540d6f0..ff5519a3f1 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java
@@ -48,7 +48,7 @@ public class Q10344_DayOfDestinyOrcsFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10344_DayOfDestinyOrcsFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java
index f0b38f0d8f..9ad485a695 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java
@@ -48,7 +48,7 @@ public class Q10345_DayOfDestinyDwarfsFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10345_DayOfDestinyDwarfsFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java
index 0f3195f574..5690e3622f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java
@@ -48,7 +48,7 @@ public class Q10346_DayOfDestinyKamaelsFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10346_DayOfDestinyKamaelsFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java
index 2874c31889..6a7bf0c265 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java
@@ -51,7 +51,7 @@ public class Q10351_OwnerOfHall extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java
index 1175e2cdd1..18cd204fc0 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java
@@ -94,7 +94,7 @@ public class Q10353_CertificationOfValue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java
index ea20f5fe52..c1723c3065 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java
@@ -51,7 +51,7 @@ public class Q10354_ResurrectedOwnerOfHall extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java
index 3a33d33da4..816efa29cd 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java
@@ -59,7 +59,7 @@ public class Q10358_DividedSakumPoslof extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10359_TracesOfEvil/Q10359_TracesOfEvil.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10359_TracesOfEvil/Q10359_TracesOfEvil.java
index e03bf7a6a2..f294b34dcb 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10359_TracesOfEvil/Q10359_TracesOfEvil.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10359_TracesOfEvil/Q10359_TracesOfEvil.java
@@ -69,7 +69,7 @@ public class Q10359_TracesOfEvil extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java
index 118dcc772c..6e00e7dec9 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java
@@ -83,7 +83,7 @@ public class Q10360_CertificationOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10361_RolesOfTheSeeker/Q10361_RolesOfTheSeeker.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10361_RolesOfTheSeeker/Q10361_RolesOfTheSeeker.java
index 4a359f1271..3274842be2 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10361_RolesOfTheSeeker/Q10361_RolesOfTheSeeker.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10361_RolesOfTheSeeker/Q10361_RolesOfTheSeeker.java
@@ -46,7 +46,7 @@ public class Q10361_RolesOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java
index b074359175..a96045b4a4 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java
@@ -60,7 +60,7 @@ public class Q10362_CertificationOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java
index c9063645d9..6f65769834 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java
@@ -70,7 +70,7 @@ public class Q10363_RequestOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java
index 0290c74bc2..e70159b207 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java
@@ -59,7 +59,7 @@ public class Q10364_ObligationsOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java
index 90233e009b..037eb3f7a3 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java
@@ -99,7 +99,7 @@ public class Q10365_SeekerEscort extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/Q10366_RuinsStatusUpdate.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/Q10366_RuinsStatusUpdate.java
index 7f659e666c..e3fc076ffe 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/Q10366_RuinsStatusUpdate.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/Q10366_RuinsStatusUpdate.java
@@ -55,7 +55,7 @@ public class Q10366_RuinsStatusUpdate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10368_RebellionOfMonsters/Q10368_RebellionOfMonsters.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10368_RebellionOfMonsters/Q10368_RebellionOfMonsters.java
index b9babf7571..c1ae7d8715 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10368_RebellionOfMonsters/Q10368_RebellionOfMonsters.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10368_RebellionOfMonsters/Q10368_RebellionOfMonsters.java
@@ -53,7 +53,7 @@ public class Q10368_RebellionOfMonsters extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10369_NoblesseSoulTesting/Q10369_NoblesseSoulTesting.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10369_NoblesseSoulTesting/Q10369_NoblesseSoulTesting.java
index fe2c807240..793791ff71 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10369_NoblesseSoulTesting/Q10369_NoblesseSoulTesting.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10369_NoblesseSoulTesting/Q10369_NoblesseSoulTesting.java
@@ -122,11 +122,11 @@ public class Q10369_NoblesseSoulTesting extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player == null)
 		{
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
@@ -321,7 +321,7 @@ public class Q10369_NoblesseSoulTesting extends Quest
 									final Quest instance = QuestManager.getInstance().getQuest(EvasHiddenSpace.class.getSimpleName());
 									if (instance != null)
 									{
-										instance.onAdvEvent("enterInstance", npc, player);
+										instance.onEvent("enterInstance", npc, player);
 									}
 									htmltext = null;
 									break;
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10370_MenacingTimes/Q10370_MenacingTimes.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10370_MenacingTimes/Q10370_MenacingTimes.java
index dc213da234..4763dba885 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10370_MenacingTimes/Q10370_MenacingTimes.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10370_MenacingTimes/Q10370_MenacingTimes.java
@@ -65,7 +65,7 @@ public class Q10370_MenacingTimes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10371_GraspThyPower/Q10371_GraspThyPower.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10371_GraspThyPower/Q10371_GraspThyPower.java
index a3a431ae90..f19d9a6240 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10371_GraspThyPower/Q10371_GraspThyPower.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10371_GraspThyPower/Q10371_GraspThyPower.java
@@ -61,7 +61,7 @@ public class Q10371_GraspThyPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10372_PurgatoryVolvere/Q10372_PurgatoryVolvere.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10372_PurgatoryVolvere/Q10372_PurgatoryVolvere.java
index 34e367af3f..73c9586552 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10372_PurgatoryVolvere/Q10372_PurgatoryVolvere.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10372_PurgatoryVolvere/Q10372_PurgatoryVolvere.java
@@ -58,7 +58,7 @@ public class Q10372_PurgatoryVolvere extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10374_ThatPlaceSuccubus/Q10374_ThatPlaceSuccubus.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10374_ThatPlaceSuccubus/Q10374_ThatPlaceSuccubus.java
index 8d91352295..44d4e50656 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10374_ThatPlaceSuccubus/Q10374_ThatPlaceSuccubus.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10374_ThatPlaceSuccubus/Q10374_ThatPlaceSuccubus.java
@@ -65,7 +65,7 @@ public class Q10374_ThatPlaceSuccubus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10375_SuccubusDisciples/Q10375_SuccubusDisciples.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10375_SuccubusDisciples/Q10375_SuccubusDisciples.java
index 2bbdfeff18..f14f026f93 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10375_SuccubusDisciples/Q10375_SuccubusDisciples.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10375_SuccubusDisciples/Q10375_SuccubusDisciples.java
@@ -64,7 +64,7 @@ public class Q10375_SuccubusDisciples extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java
index 965d1d06dd..8d6af4cb2d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java
@@ -66,7 +66,7 @@ public class Q10376_BloodyGoodTime extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java
index 255a3ce354..6a38565c9f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java
@@ -59,7 +59,7 @@ public class Q10377_TheInvadedExecutionGrounds extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10378_WeedingWork/Q10378_WeedingWork.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10378_WeedingWork/Q10378_WeedingWork.java
index e55058d9a5..cc498e2821 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10378_WeedingWork/Q10378_WeedingWork.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10378_WeedingWork/Q10378_WeedingWork.java
@@ -57,7 +57,7 @@ public class Q10378_WeedingWork extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10379_AnUninvitedGuest/Q10379_AnUninvitedGuest.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10379_AnUninvitedGuest/Q10379_AnUninvitedGuest.java
index 8502410bee..e227de28c7 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10379_AnUninvitedGuest/Q10379_AnUninvitedGuest.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10379_AnUninvitedGuest/Q10379_AnUninvitedGuest.java
@@ -69,7 +69,7 @@ public class Q10379_AnUninvitedGuest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10380_TheExecutionersExecution/Q10380_TheExecutionersExecution.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10380_TheExecutionersExecution/Q10380_TheExecutionersExecution.java
index 7b59d40bcb..5b4910c43e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10380_TheExecutionersExecution/Q10380_TheExecutionersExecution.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10380_TheExecutionersExecution/Q10380_TheExecutionersExecution.java
@@ -67,7 +67,7 @@ public class Q10380_TheExecutionersExecution extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java
index 3fdb1d2625..1a0550ce7a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java
@@ -49,7 +49,7 @@ public class Q10381_ToTheSeedOfHellfire extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10382_DayOfLiberation/Q10382_DayOfLiberation.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10382_DayOfLiberation/Q10382_DayOfLiberation.java
index bd81dc237a..f0417eca8e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10382_DayOfLiberation/Q10382_DayOfLiberation.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10382_DayOfLiberation/Q10382_DayOfLiberation.java
@@ -48,7 +48,7 @@ public class Q10382_DayOfLiberation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java
index 2a535823ae..f818f19a58 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java
@@ -61,7 +61,7 @@ public class Q10383_FergasonsOffer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java
index ed9cb571ed..279d9baa06 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java
@@ -52,7 +52,7 @@ public class Q10384_AnAudienceWithTauti extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10385_RedThreadOfFate/Q10385_RedThreadOfFate.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10385_RedThreadOfFate/Q10385_RedThreadOfFate.java
index 31cfe72faa..e28f4d4bba 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10385_RedThreadOfFate/Q10385_RedThreadOfFate.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10385_RedThreadOfFate/Q10385_RedThreadOfFate.java
@@ -120,7 +120,7 @@ public class Q10385_RedThreadOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -755,7 +755,7 @@ public class Q10385_RedThreadOfFate extends Quest
 						final Quest instance = QuestManager.getInstance().getQuest(TalkingIslandPast.class.getSimpleName());
 						if (instance != null)
 						{
-							instance.onAdvEvent("enterInstance", npc, player);
+							instance.onEvent("enterInstance", npc, player);
 						}
 					}
 					break;
@@ -843,7 +843,7 @@ public class Q10385_RedThreadOfFate extends Quest
 							final Quest instance = QuestManager.getInstance().getQuest(TalkingIslandPast.class.getSimpleName());
 							if (instance != null)
 							{
-								instance.onAdvEvent("enterInstance", npc, player);
+								instance.onEvent("enterInstance", npc, player);
 							}
 							break;
 						}
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10386_MysteriousJourney/Q10386_MysteriousJourney.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10386_MysteriousJourney/Q10386_MysteriousJourney.java
index 6c704faa98..ef3cae06be 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10386_MysteriousJourney/Q10386_MysteriousJourney.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10386_MysteriousJourney/Q10386_MysteriousJourney.java
@@ -50,7 +50,7 @@ public class Q10386_MysteriousJourney extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10387_SoullessOne/Q10387_SoullessOne.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10387_SoullessOne/Q10387_SoullessOne.java
index f411d2f043..a602978f36 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10387_SoullessOne/Q10387_SoullessOne.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10387_SoullessOne/Q10387_SoullessOne.java
@@ -54,7 +54,7 @@ public class Q10387_SoullessOne extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java
index 174ea1a300..e5a8517a69 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java
@@ -46,7 +46,7 @@ public class Q10388_ConspiracyBehindDoor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java
index 6d60016a06..619cf89fa5 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java
@@ -66,7 +66,7 @@ public class Q10389_TheVoiceOfAuthority extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10390_KekropusLetter/Q10390_KekropusLetter.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10390_KekropusLetter/Q10390_KekropusLetter.java
index 5e59060743..501925f30e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10390_KekropusLetter/Q10390_KekropusLetter.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10390_KekropusLetter/Q10390_KekropusLetter.java
@@ -68,7 +68,7 @@ public class Q10390_KekropusLetter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10391_ASuspiciousHelper/Q10391_ASuspiciousHelper.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10391_ASuspiciousHelper/Q10391_ASuspiciousHelper.java
index 5c96feab38..915e3c1f84 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10391_ASuspiciousHelper/Q10391_ASuspiciousHelper.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10391_ASuspiciousHelper/Q10391_ASuspiciousHelper.java
@@ -52,7 +52,7 @@ public class Q10391_ASuspiciousHelper extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10392_FailureAndItsConsequences/Q10392_FailureAndItsConsequences.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10392_FailureAndItsConsequences/Q10392_FailureAndItsConsequences.java
index b228973062..b083f4154f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10392_FailureAndItsConsequences/Q10392_FailureAndItsConsequences.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10392_FailureAndItsConsequences/Q10392_FailureAndItsConsequences.java
@@ -60,7 +60,7 @@ public class Q10392_FailureAndItsConsequences extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10393_KekropusLetterAClueCompleted/Q10393_KekropusLetterAClueCompleted.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10393_KekropusLetterAClueCompleted/Q10393_KekropusLetterAClueCompleted.java
index 2333feba9a..5ad013083f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10393_KekropusLetterAClueCompleted/Q10393_KekropusLetterAClueCompleted.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10393_KekropusLetterAClueCompleted/Q10393_KekropusLetterAClueCompleted.java
@@ -59,7 +59,7 @@ public class Q10393_KekropusLetterAClueCompleted extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java
index 03cd8902d2..c7c76563db 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java
@@ -56,7 +56,7 @@ public class Q10394_MutualBenefit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java
index 11cba933b5..0dd1b301df 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java
@@ -65,7 +65,7 @@ public class Q10395_NotATraitor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10397_KekropusLetterASuspiciousBadge/Q10397_KekropusLetterASuspiciousBadge.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10397_KekropusLetterASuspiciousBadge/Q10397_KekropusLetterASuspiciousBadge.java
index 7af2523627..0f04ac68f7 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10397_KekropusLetterASuspiciousBadge/Q10397_KekropusLetterASuspiciousBadge.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10397_KekropusLetterASuspiciousBadge/Q10397_KekropusLetterASuspiciousBadge.java
@@ -59,7 +59,7 @@ public class Q10397_KekropusLetterASuspiciousBadge extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10398_ASuspiciousBadge/Q10398_ASuspiciousBadge.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10398_ASuspiciousBadge/Q10398_ASuspiciousBadge.java
index 9558f71ee8..5b67846fc7 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10398_ASuspiciousBadge/Q10398_ASuspiciousBadge.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10398_ASuspiciousBadge/Q10398_ASuspiciousBadge.java
@@ -60,7 +60,7 @@ public class Q10398_ASuspiciousBadge extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10399_TheAlphabetOfTheGiants/Q10399_TheAlphabetOfTheGiants.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10399_TheAlphabetOfTheGiants/Q10399_TheAlphabetOfTheGiants.java
index b8d0573c5e..30db3f6efe 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10399_TheAlphabetOfTheGiants/Q10399_TheAlphabetOfTheGiants.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10399_TheAlphabetOfTheGiants/Q10399_TheAlphabetOfTheGiants.java
@@ -58,7 +58,7 @@ public class Q10399_TheAlphabetOfTheGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10401_KekropusLetterDecodingTheBadge/Q10401_KekropusLetterDecodingTheBadge.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10401_KekropusLetterDecodingTheBadge/Q10401_KekropusLetterDecodingTheBadge.java
index 5920fad949..65887d6f03 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10401_KekropusLetterDecodingTheBadge/Q10401_KekropusLetterDecodingTheBadge.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10401_KekropusLetterDecodingTheBadge/Q10401_KekropusLetterDecodingTheBadge.java
@@ -59,7 +59,7 @@ public class Q10401_KekropusLetterDecodingTheBadge extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java
index 5e4d8b1482..4fd1ce9cab 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java
@@ -65,7 +65,7 @@ public class Q10402_NowhereToTurn extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10403_TheGuardianGiant/Q10403_TheGuardianGiant.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10403_TheGuardianGiant/Q10403_TheGuardianGiant.java
index 51b91a715d..72cf81d741 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10403_TheGuardianGiant/Q10403_TheGuardianGiant.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10403_TheGuardianGiant/Q10403_TheGuardianGiant.java
@@ -64,7 +64,7 @@ public class Q10403_TheGuardianGiant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10404_KekropusLetterAHiddenMeaning/Q10404_KekropusLetterAHiddenMeaning.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10404_KekropusLetterAHiddenMeaning/Q10404_KekropusLetterAHiddenMeaning.java
index b20d24d3cb..0d4cec46e4 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10404_KekropusLetterAHiddenMeaning/Q10404_KekropusLetterAHiddenMeaning.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10404_KekropusLetterAHiddenMeaning/Q10404_KekropusLetterAHiddenMeaning.java
@@ -59,7 +59,7 @@ public class Q10404_KekropusLetterAHiddenMeaning extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10405_KartiasSeed/Q10405_KartiasSeed.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10405_KartiasSeed/Q10405_KartiasSeed.java
index db6aedfb48..4d8063a514 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10405_KartiasSeed/Q10405_KartiasSeed.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10405_KartiasSeed/Q10405_KartiasSeed.java
@@ -67,7 +67,7 @@ public class Q10405_KartiasSeed extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java
index c8889e1fe1..78fb20d20a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java
@@ -57,7 +57,7 @@ public class Q10406_BeforeDarknessBearsFruit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10408_KekropusLetterTheSwampOfScreams/Q10408_KekropusLetterTheSwampOfScreams.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10408_KekropusLetterTheSwampOfScreams/Q10408_KekropusLetterTheSwampOfScreams.java
index 6e6ff67975..59d6ea191d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10408_KekropusLetterTheSwampOfScreams/Q10408_KekropusLetterTheSwampOfScreams.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10408_KekropusLetterTheSwampOfScreams/Q10408_KekropusLetterTheSwampOfScreams.java
@@ -59,7 +59,7 @@ public class Q10408_KekropusLetterTheSwampOfScreams extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java
index 2098f70548..5b4eced23f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java
@@ -50,7 +50,7 @@ public class Q10409_ASuspiciousVagabondInTheSwamp extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java
index 9ab8e09794..361f62720b 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java
@@ -75,7 +75,7 @@ public class Q10410_EmbryoInTheSwampOfScreams extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10411_KekropusLetterTheForestOfTheDead/Q10411_KekropusLetterTheForestOfTheDead.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10411_KekropusLetterTheForestOfTheDead/Q10411_KekropusLetterTheForestOfTheDead.java
index 97b3c6b112..82bba6e8b3 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10411_KekropusLetterTheForestOfTheDead/Q10411_KekropusLetterTheForestOfTheDead.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10411_KekropusLetterTheForestOfTheDead/Q10411_KekropusLetterTheForestOfTheDead.java
@@ -59,7 +59,7 @@ public class Q10411_KekropusLetterTheForestOfTheDead extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java
index e81dd514b7..ae77b686d0 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java
@@ -50,7 +50,7 @@ public class Q10412_ASuspiciousVagabondInTheForest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java
index 981177a544..bfe5518086 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java
@@ -104,7 +104,7 @@ public class Q10413_EmbryoInTheForestOfTheDead extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10414_KekropusLetterWithCourage/Q10414_KekropusLetterWithCourage.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10414_KekropusLetterWithCourage/Q10414_KekropusLetterWithCourage.java
index 9ccfbd816a..d7087994d4 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10414_KekropusLetterWithCourage/Q10414_KekropusLetterWithCourage.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10414_KekropusLetterWithCourage/Q10414_KekropusLetterWithCourage.java
@@ -59,7 +59,7 @@ public class Q10414_KekropusLetterWithCourage extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10415_KekropusLetterWithWisdom/Q10415_KekropusLetterWithWisdom.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10415_KekropusLetterWithWisdom/Q10415_KekropusLetterWithWisdom.java
index 75e5d02fcd..9c59892974 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10415_KekropusLetterWithWisdom/Q10415_KekropusLetterWithWisdom.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10415_KekropusLetterWithWisdom/Q10415_KekropusLetterWithWisdom.java
@@ -60,7 +60,7 @@ public class Q10415_KekropusLetterWithWisdom extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java
index 4861df0eb2..96e7a785ae 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java
@@ -48,7 +48,7 @@ public class Q10416_InSearchOfTheEyeOfArgos extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java
index 420cdd5236..fbd6b69cb2 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java
@@ -53,7 +53,7 @@ public class Q10417_DaimonTheWhiteEyed extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10419_KekropusLetterKampfsWhereabouts/Q10419_KekropusLetterKampfsWhereabouts.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10419_KekropusLetterKampfsWhereabouts/Q10419_KekropusLetterKampfsWhereabouts.java
index 6549b92bf6..6475a8bb53 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10419_KekropusLetterKampfsWhereabouts/Q10419_KekropusLetterKampfsWhereabouts.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10419_KekropusLetterKampfsWhereabouts/Q10419_KekropusLetterKampfsWhereabouts.java
@@ -59,7 +59,7 @@ public class Q10419_KekropusLetterKampfsWhereabouts extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10420_TheVarkaSilenosSupporters/Q10420_TheVarkaSilenosSupporters.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10420_TheVarkaSilenosSupporters/Q10420_TheVarkaSilenosSupporters.java
index 698897c1c3..839f6f03d5 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10420_TheVarkaSilenosSupporters/Q10420_TheVarkaSilenosSupporters.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10420_TheVarkaSilenosSupporters/Q10420_TheVarkaSilenosSupporters.java
@@ -77,7 +77,7 @@ public class Q10420_TheVarkaSilenosSupporters extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10421_AssassinationOfTheVarkaSilenosCommander/Q10421_AssassinationOfTheVarkaSilenosCommander.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10421_AssassinationOfTheVarkaSilenosCommander/Q10421_AssassinationOfTheVarkaSilenosCommander.java
index 8b7feff241..c7629b3637 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10421_AssassinationOfTheVarkaSilenosCommander/Q10421_AssassinationOfTheVarkaSilenosCommander.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10421_AssassinationOfTheVarkaSilenosCommander/Q10421_AssassinationOfTheVarkaSilenosCommander.java
@@ -53,7 +53,7 @@ public class Q10421_AssassinationOfTheVarkaSilenosCommander extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java
index 7c9b29ca62..e4f5a2f5b7 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java
@@ -57,7 +57,7 @@ public class Q10422_AssassinationOfTheVarkaSilenosChief extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10424_KekropusLetterBelosWhereabouts/Q10424_KekropusLetterBelosWhereabouts.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10424_KekropusLetterBelosWhereabouts/Q10424_KekropusLetterBelosWhereabouts.java
index deb3c13012..6d21d04d40 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10424_KekropusLetterBelosWhereabouts/Q10424_KekropusLetterBelosWhereabouts.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10424_KekropusLetterBelosWhereabouts/Q10424_KekropusLetterBelosWhereabouts.java
@@ -59,7 +59,7 @@ public class Q10424_KekropusLetterBelosWhereabouts extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10425_TheKetraOrcSupporters/Q10425_TheKetraOrcSupporters.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10425_TheKetraOrcSupporters/Q10425_TheKetraOrcSupporters.java
index d7fc88c94c..39fc075b58 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10425_TheKetraOrcSupporters/Q10425_TheKetraOrcSupporters.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10425_TheKetraOrcSupporters/Q10425_TheKetraOrcSupporters.java
@@ -80,7 +80,7 @@ public class Q10425_TheKetraOrcSupporters extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10426_AssassinationOfTheKetraOrcCommander/Q10426_AssassinationOfTheKetraOrcCommander.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10426_AssassinationOfTheKetraOrcCommander/Q10426_AssassinationOfTheKetraOrcCommander.java
index e5b518988d..231e2242c2 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10426_AssassinationOfTheKetraOrcCommander/Q10426_AssassinationOfTheKetraOrcCommander.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10426_AssassinationOfTheKetraOrcCommander/Q10426_AssassinationOfTheKetraOrcCommander.java
@@ -55,7 +55,7 @@ public class Q10426_AssassinationOfTheKetraOrcCommander extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java
index 70922047ea..d277aca298 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java
@@ -57,7 +57,7 @@ public class Q10427_AssassinationOfTheKetraOrcChief extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10430_KekropusLetterTrackingTheEvil/Q10430_KekropusLetterTrackingTheEvil.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10430_KekropusLetterTrackingTheEvil/Q10430_KekropusLetterTrackingTheEvil.java
index 33a07f181d..d43771aea0 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10430_KekropusLetterTrackingTheEvil/Q10430_KekropusLetterTrackingTheEvil.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10430_KekropusLetterTrackingTheEvil/Q10430_KekropusLetterTrackingTheEvil.java
@@ -62,7 +62,7 @@ public class Q10430_KekropusLetterTrackingTheEvil extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10431_TheSealOfPunishmentDenOfEvil/Q10431_TheSealOfPunishmentDenOfEvil.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10431_TheSealOfPunishmentDenOfEvil/Q10431_TheSealOfPunishmentDenOfEvil.java
index 43d578d9ec..8c351470ba 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10431_TheSealOfPunishmentDenOfEvil/Q10431_TheSealOfPunishmentDenOfEvil.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10431_TheSealOfPunishmentDenOfEvil/Q10431_TheSealOfPunishmentDenOfEvil.java
@@ -67,7 +67,7 @@ public class Q10431_TheSealOfPunishmentDenOfEvil extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10432_ChasingVarangka/Q10432_ChasingVarangka.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10432_ChasingVarangka/Q10432_ChasingVarangka.java
index 6806985ecb..ce4a70d010 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10432_ChasingVarangka/Q10432_ChasingVarangka.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10432_ChasingVarangka/Q10432_ChasingVarangka.java
@@ -56,7 +56,7 @@ public class Q10432_ChasingVarangka extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10433_KekropusLetterRegardingASeal/Q10433_KekropusLetterRegardingASeal.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10433_KekropusLetterRegardingASeal/Q10433_KekropusLetterRegardingASeal.java
index e2a9dfba50..586db27a1e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10433_KekropusLetterRegardingASeal/Q10433_KekropusLetterRegardingASeal.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10433_KekropusLetterRegardingASeal/Q10433_KekropusLetterRegardingASeal.java
@@ -61,7 +61,7 @@ public class Q10433_KekropusLetterRegardingASeal extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10434_TheSealOfPunishmentSelMahumTrainingGrounds/Q10434_TheSealOfPunishmentSelMahumTrainingGrounds.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10434_TheSealOfPunishmentSelMahumTrainingGrounds/Q10434_TheSealOfPunishmentSelMahumTrainingGrounds.java
index 1ae56447b7..10e416c8e9 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10434_TheSealOfPunishmentSelMahumTrainingGrounds/Q10434_TheSealOfPunishmentSelMahumTrainingGrounds.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10434_TheSealOfPunishmentSelMahumTrainingGrounds/Q10434_TheSealOfPunishmentSelMahumTrainingGrounds.java
@@ -72,7 +72,7 @@ public class Q10434_TheSealOfPunishmentSelMahumTrainingGrounds extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10435_ChasingKeltron/Q10435_ChasingKeltron.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10435_ChasingKeltron/Q10435_ChasingKeltron.java
index abb4e76ece..d35f571f3f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10435_ChasingKeltron/Q10435_ChasingKeltron.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10435_ChasingKeltron/Q10435_ChasingKeltron.java
@@ -54,7 +54,7 @@ public class Q10435_ChasingKeltron extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10436_KekropusLetterTheSealOfPunishment/Q10436_KekropusLetterTheSealOfPunishment.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10436_KekropusLetterTheSealOfPunishment/Q10436_KekropusLetterTheSealOfPunishment.java
index 8a1a07e9aa..bbc276da63 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10436_KekropusLetterTheSealOfPunishment/Q10436_KekropusLetterTheSealOfPunishment.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10436_KekropusLetterTheSealOfPunishment/Q10436_KekropusLetterTheSealOfPunishment.java
@@ -61,7 +61,7 @@ public class Q10436_KekropusLetterTheSealOfPunishment extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10437_TheSealOfPunishmentPlainsOfTheLizardmen/Q10437_TheSealOfPunishmentPlainsOfTheLizardmen.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10437_TheSealOfPunishmentPlainsOfTheLizardmen/Q10437_TheSealOfPunishmentPlainsOfTheLizardmen.java
index 9776b90066..32874e15c9 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10437_TheSealOfPunishmentPlainsOfTheLizardmen/Q10437_TheSealOfPunishmentPlainsOfTheLizardmen.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10437_TheSealOfPunishmentPlainsOfTheLizardmen/Q10437_TheSealOfPunishmentPlainsOfTheLizardmen.java
@@ -64,7 +64,7 @@ public class Q10437_TheSealOfPunishmentPlainsOfTheLizardmen extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10438_ChasingLoygen/Q10438_ChasingLoygen.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10438_ChasingLoygen/Q10438_ChasingLoygen.java
index ec65ae6c14..73196c30d9 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10438_ChasingLoygen/Q10438_ChasingLoygen.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10438_ChasingLoygen/Q10438_ChasingLoygen.java
@@ -54,7 +54,7 @@ public class Q10438_ChasingLoygen extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10439_KekropusLetterTheOriginsOfARumor/Q10439_KekropusLetterTheOriginsOfARumor.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10439_KekropusLetterTheOriginsOfARumor/Q10439_KekropusLetterTheOriginsOfARumor.java
index 568549de98..8485ccd0d0 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10439_KekropusLetterTheOriginsOfARumor/Q10439_KekropusLetterTheOriginsOfARumor.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10439_KekropusLetterTheOriginsOfARumor/Q10439_KekropusLetterTheOriginsOfARumor.java
@@ -64,7 +64,7 @@ public class Q10439_KekropusLetterTheOriginsOfARumor extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10440_TheSealOfPunishmentTheFields/Q10440_TheSealOfPunishmentTheFields.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10440_TheSealOfPunishmentTheFields/Q10440_TheSealOfPunishmentTheFields.java
index 69ae9d48d8..0e67f792e2 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10440_TheSealOfPunishmentTheFields/Q10440_TheSealOfPunishmentTheFields.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10440_TheSealOfPunishmentTheFields/Q10440_TheSealOfPunishmentTheFields.java
@@ -63,7 +63,7 @@ public class Q10440_TheSealOfPunishmentTheFields extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10441_ChasingMeccadan/Q10441_ChasingMeccadan.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10441_ChasingMeccadan/Q10441_ChasingMeccadan.java
index 50ac964978..159e919eb2 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10441_ChasingMeccadan/Q10441_ChasingMeccadan.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10441_ChasingMeccadan/Q10441_ChasingMeccadan.java
@@ -58,7 +58,7 @@ public class Q10441_ChasingMeccadan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10442_TheAnnihilatedPlains1/Q10442_TheAnnihilatedPlains1.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10442_TheAnnihilatedPlains1/Q10442_TheAnnihilatedPlains1.java
index 5d9569f1bc..cfa2532708 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10442_TheAnnihilatedPlains1/Q10442_TheAnnihilatedPlains1.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10442_TheAnnihilatedPlains1/Q10442_TheAnnihilatedPlains1.java
@@ -43,7 +43,7 @@ public class Q10442_TheAnnihilatedPlains1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10443_TheAnnihilatedPlains2/Q10443_TheAnnihilatedPlains2.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10443_TheAnnihilatedPlains2/Q10443_TheAnnihilatedPlains2.java
index a17b25f237..4a8eacfbf6 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10443_TheAnnihilatedPlains2/Q10443_TheAnnihilatedPlains2.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10443_TheAnnihilatedPlains2/Q10443_TheAnnihilatedPlains2.java
@@ -52,7 +52,7 @@ public class Q10443_TheAnnihilatedPlains2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10444_TheOriginOfMonsters/Q10444_TheOriginOfMonsters.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10444_TheOriginOfMonsters/Q10444_TheOriginOfMonsters.java
index ad98ec175b..e52d6f6c4f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10444_TheOriginOfMonsters/Q10444_TheOriginOfMonsters.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10444_TheOriginOfMonsters/Q10444_TheOriginOfMonsters.java
@@ -57,7 +57,7 @@ public class Q10444_TheOriginOfMonsters extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10445_AnImpendingThreat/Q10445_AnImpendingThreat.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10445_AnImpendingThreat/Q10445_AnImpendingThreat.java
index c78d904936..dac215a5b1 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10445_AnImpendingThreat/Q10445_AnImpendingThreat.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10445_AnImpendingThreat/Q10445_AnImpendingThreat.java
@@ -53,7 +53,7 @@ public class Q10445_AnImpendingThreat extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java
index bb70f87faa..4649f7548e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java
@@ -58,7 +58,7 @@ public class Q10446_HitAndRun extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java
index c49b98c92d..c173bf24b6 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java
@@ -74,7 +74,7 @@ public class Q10447_TimingIsEverything extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10450_ADarkAmbition/Q10450_ADarkAmbition.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10450_ADarkAmbition/Q10450_ADarkAmbition.java
index c3f232b499..8f085a2197 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10450_ADarkAmbition/Q10450_ADarkAmbition.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10450_ADarkAmbition/Q10450_ADarkAmbition.java
@@ -49,7 +49,7 @@ public class Q10450_ADarkAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10452_IsItEdible/Q10452_IsItEdible.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10452_IsItEdible/Q10452_IsItEdible.java
index 921c507a44..751de64b84 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10452_IsItEdible/Q10452_IsItEdible.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10452_IsItEdible/Q10452_IsItEdible.java
@@ -53,7 +53,7 @@ public class Q10452_IsItEdible extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10453_StoppingTheWindDragon/Q10453_StoppingTheWindDragon.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10453_StoppingTheWindDragon/Q10453_StoppingTheWindDragon.java
index 3b567c5d04..6a74beb026 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10453_StoppingTheWindDragon/Q10453_StoppingTheWindDragon.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10453_StoppingTheWindDragon/Q10453_StoppingTheWindDragon.java
@@ -46,7 +46,7 @@ public class Q10453_StoppingTheWindDragon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java
index b6cec7570e..7268e0de45 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java
@@ -50,7 +50,7 @@ public class Q10455_ElikiasLetter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10457_KefensisIllusion/Q10457_KefensisIllusion.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10457_KefensisIllusion/Q10457_KefensisIllusion.java
index 671cad847e..ac05730f92 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10457_KefensisIllusion/Q10457_KefensisIllusion.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10457_KefensisIllusion/Q10457_KefensisIllusion.java
@@ -63,7 +63,7 @@ public class Q10457_KefensisIllusion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java
index fc5b941631..11718fe3dc 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java
@@ -54,7 +54,7 @@ public class Q10459_ASickAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10460_ReturnOfTheAlligatorHunter/Q10460_ReturnOfTheAlligatorHunter.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10460_ReturnOfTheAlligatorHunter/Q10460_ReturnOfTheAlligatorHunter.java
index d62452bd77..e5379d1f25 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10460_ReturnOfTheAlligatorHunter/Q10460_ReturnOfTheAlligatorHunter.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10460_ReturnOfTheAlligatorHunter/Q10460_ReturnOfTheAlligatorHunter.java
@@ -61,7 +61,7 @@ public class Q10460_ReturnOfTheAlligatorHunter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10461_TappingThePowerWithin/Q10461_TappingThePowerWithin.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10461_TappingThePowerWithin/Q10461_TappingThePowerWithin.java
index a4430ab548..396844a384 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10461_TappingThePowerWithin/Q10461_TappingThePowerWithin.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10461_TappingThePowerWithin/Q10461_TappingThePowerWithin.java
@@ -46,7 +46,7 @@ public class Q10461_TappingThePowerWithin extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10462_TemperARustingBlade/Q10462_TemperARustingBlade.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10462_TemperARustingBlade/Q10462_TemperARustingBlade.java
index 5379818de9..1baa90cb8d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10462_TemperARustingBlade/Q10462_TemperARustingBlade.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10462_TemperARustingBlade/Q10462_TemperARustingBlade.java
@@ -56,7 +56,7 @@ public class Q10462_TemperARustingBlade extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10464_BePreparedForAnything/Q10464_BePreparedForAnything.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10464_BePreparedForAnything/Q10464_BePreparedForAnything.java
index 2c9196dbd7..4533bb6597 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10464_BePreparedForAnything/Q10464_BePreparedForAnything.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10464_BePreparedForAnything/Q10464_BePreparedForAnything.java
@@ -51,7 +51,7 @@ public class Q10464_BePreparedForAnything extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10472_WindsOfFateEncroachingShadows/Q10472_WindsOfFateEncroachingShadows.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10472_WindsOfFateEncroachingShadows/Q10472_WindsOfFateEncroachingShadows.java
index 0ffb1623b8..eb5b37a492 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10472_WindsOfFateEncroachingShadows/Q10472_WindsOfFateEncroachingShadows.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10472_WindsOfFateEncroachingShadows/Q10472_WindsOfFateEncroachingShadows.java
@@ -91,7 +91,7 @@ public class Q10472_WindsOfFateEncroachingShadows extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
index bacbb7058b..ad79a5980b 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
@@ -73,7 +73,7 @@ public class Q10501_ZakenEmbroideredSoulCloak extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (player.getLevel() >= MIN_LEVEL) && event.equals("32612-04.html"))
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
index d1678a7601..38f4514197 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
@@ -73,7 +73,7 @@ public class Q10502_FreyaEmbroideredSoulCloak extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (player.getLevel() >= MIN_LEVEL) && event.equals("32612-04.html"))
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
index 224940ecd9..08aa62d532 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
@@ -74,7 +74,7 @@ public class Q10503_FrintezzaEmbroideredSoulCloak extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (player.getLevel() >= MIN_LEVEL) && event.equals("32612-04.html"))
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java
index dc59cfeb9d..c8cd4ccd15 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java
@@ -66,7 +66,7 @@ public class Q10504_JewelOfAntharas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java
index b587e54fe8..a67d6cf0d5 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java
@@ -66,7 +66,7 @@ public class Q10505_JewelOfValakas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java
index 593c0d4936..e2bb80f5e5 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java
@@ -46,7 +46,7 @@ public class Q10701_TheRoadToDestruction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java
index 1ede0c4ba5..ba1153cd88 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java
@@ -46,7 +46,7 @@ public class Q10702_TheRoadToInfinity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java
index 2ee25d6af7..253b12cda4 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java
@@ -48,7 +48,7 @@ public class Q10703_BottleOfIstinasSoul extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java
index 23bae467b4..9e799c2fcb 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java
@@ -48,7 +48,7 @@ public class Q10704_BottleOfOctavisSoul extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java
index 94c10b561b..4c8ae1432b 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java
@@ -48,7 +48,7 @@ public class Q10705_BottleOfTautisSoul extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java
index 16b4f7af81..680a69f7b3 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java
@@ -63,7 +63,7 @@ public class Q10707_FlamesOfSorrow extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java
index b017aff70d..8e3922d564 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java
@@ -53,7 +53,7 @@ public class Q10708_StrengthenTheBarrier extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (event.equals("activateKey"))
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10709_TheStolenSeed/Q10709_TheStolenSeed.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10709_TheStolenSeed/Q10709_TheStolenSeed.java
index aac4d6c526..203816dd05 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10709_TheStolenSeed/Q10709_TheStolenSeed.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10709_TheStolenSeed/Q10709_TheStolenSeed.java
@@ -58,7 +58,7 @@ public class Q10709_TheStolenSeed extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (event.equals("action"))
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10710_LifeEnergyRepository/Q10710_LifeEnergyRepository.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10710_LifeEnergyRepository/Q10710_LifeEnergyRepository.java
index d85b1154c8..d3ec85c20a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10710_LifeEnergyRepository/Q10710_LifeEnergyRepository.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10710_LifeEnergyRepository/Q10710_LifeEnergyRepository.java
@@ -64,7 +64,7 @@ public class Q10710_LifeEnergyRepository extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (event.equals("action"))
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java
index 6e5eb3cafd..7a20bc6711 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java
@@ -46,7 +46,7 @@ public class Q10732_AForeignLand extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java
index 72240e61bb..ab45ced198 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java
@@ -51,7 +51,7 @@ public class Q10733_TheTestForSurvival extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java
index f7fe13789b..59236f55a2 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java
@@ -68,7 +68,7 @@ public class Q10734_DoOrDie extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java
index 6d51149018..fa1ffbfa27 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java
@@ -64,7 +64,7 @@ public class Q10735_ASpecialPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("33942-02.htm"))
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java
index 195b92dea1..112039ce84 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java
@@ -63,7 +63,7 @@ public class Q10736_ASpecialPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("33943-02.htm"))
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java
index 350792eb17..94214632aa 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java
@@ -57,7 +57,7 @@ public class Q10737_GrakonsWarehouse extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java
index 063ad7d06c..8c1406aac3 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java
@@ -51,7 +51,7 @@ public class Q10738_AnInnerBeauty extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java
index d31c254fe7..80fb44427a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java
@@ -65,7 +65,7 @@ public class Q10739_SupplyAndDemand extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java
index 4b4379d023..0e0f8218fd 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java
@@ -66,7 +66,7 @@ public class Q10740_NeverForget extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java
index 897dc08246..14d56cb857 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java
@@ -57,7 +57,7 @@ public class Q10741_ADraughtForTheCold extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java
index 91747ce053..61518ac855 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java
@@ -62,7 +62,7 @@ public class Q10742_AFurryFriend extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java
index 62be95fe57..e57fe9584e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java
@@ -64,7 +64,7 @@ public class Q10743_StrangeFungus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java
index a30ff5fd9d..59e6700719 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java
@@ -53,7 +53,7 @@ public class Q10744_StrongerThanSteel extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java
index 6edc5ade14..085bc4830c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java
@@ -60,7 +60,7 @@ public class Q10745_TheSecretIngredients extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java
index e20bcad916..d6997b7d2a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java
@@ -56,7 +56,7 @@ public class Q10746_SeeTheWorld extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10748_MysteriousSuggestion1/Q10748_MysteriousSuggestion1.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10748_MysteriousSuggestion1/Q10748_MysteriousSuggestion1.java
index bf24739d4a..1db27a83de 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10748_MysteriousSuggestion1/Q10748_MysteriousSuggestion1.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10748_MysteriousSuggestion1/Q10748_MysteriousSuggestion1.java
@@ -54,7 +54,7 @@ public final class Q10748_MysteriousSuggestion1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10749_MysteriousSuggestion2/Q10749_MysteriousSuggestion2.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10749_MysteriousSuggestion2/Q10749_MysteriousSuggestion2.java
index 2e1b4f7932..fe683bb978 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10749_MysteriousSuggestion2/Q10749_MysteriousSuggestion2.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10749_MysteriousSuggestion2/Q10749_MysteriousSuggestion2.java
@@ -54,7 +54,7 @@ public final class Q10749_MysteriousSuggestion2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java
index fff89fae07..8a3fd4b331 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java
@@ -94,7 +94,7 @@ public class Q10751_WindsOfFateEncounters extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java
index 62e8365c2b..e6602bc163 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java
@@ -87,7 +87,7 @@ public class Q10752_WindsOfFateAPromise extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java
index 70f64ecbfc..d7a4d79eff 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java
@@ -135,7 +135,7 @@ public class Q10753_WindsOfFateChoices extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10755_LettersFromTheQueenWindyHill/Q10755_LettersFromTheQueenWindyHill.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10755_LettersFromTheQueenWindyHill/Q10755_LettersFromTheQueenWindyHill.java
index d5c4bced8d..979254f51d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10755_LettersFromTheQueenWindyHill/Q10755_LettersFromTheQueenWindyHill.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10755_LettersFromTheQueenWindyHill/Q10755_LettersFromTheQueenWindyHill.java
@@ -55,7 +55,7 @@ public class Q10755_LettersFromTheQueenWindyHill extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java
index 88303627aa..f3d60b3ab9 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java
@@ -62,7 +62,7 @@ public class Q10756_AnInterdimensionalDraft extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java
index 827f52bf70..4971f73a3f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java
@@ -59,7 +59,7 @@ public class Q10757_QuietingTheStorm extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10758_TheOathOfTheWind/Q10758_TheOathOfTheWind.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10758_TheOathOfTheWind/Q10758_TheOathOfTheWind.java
index 4485888467..a6b19e4eb5 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10758_TheOathOfTheWind/Q10758_TheOathOfTheWind.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10758_TheOathOfTheWind/Q10758_TheOathOfTheWind.java
@@ -54,7 +54,7 @@ public class Q10758_TheOathOfTheWind extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10760_LettersFromTheQueenOrcBarracks/Q10760_LettersFromTheQueenOrcBarracks.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10760_LettersFromTheQueenOrcBarracks/Q10760_LettersFromTheQueenOrcBarracks.java
index 6f19d93f5b..728a4d8750 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10760_LettersFromTheQueenOrcBarracks/Q10760_LettersFromTheQueenOrcBarracks.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10760_LettersFromTheQueenOrcBarracks/Q10760_LettersFromTheQueenOrcBarracks.java
@@ -55,7 +55,7 @@ public class Q10760_LettersFromTheQueenOrcBarracks extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java
index cc57420b36..b19c945784 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java
@@ -65,7 +65,7 @@ public class Q10761_AnOrcInLove extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10762_MarionetteSpirit/Q10762_MarionetteSpirit.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10762_MarionetteSpirit/Q10762_MarionetteSpirit.java
index b4724c2b81..5b5d3dc231 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10762_MarionetteSpirit/Q10762_MarionetteSpirit.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10762_MarionetteSpirit/Q10762_MarionetteSpirit.java
@@ -55,7 +55,7 @@ public class Q10762_MarionetteSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java
index 1ae3f48a9b..cb7c39a7c0 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java
@@ -54,7 +54,7 @@ public class Q10763_TerrifyingChertuba extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java
index 7dd9c4ebae..8067e73cf3 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java
@@ -62,7 +62,7 @@ public class Q10764_FreeSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10766_ANewCraft/Q10766_ANewCraft.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10766_ANewCraft/Q10766_ANewCraft.java
index 1914dbf9c1..0b73dbcc98 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10766_ANewCraft/Q10766_ANewCraft.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10766_ANewCraft/Q10766_ANewCraft.java
@@ -63,7 +63,7 @@ public class Q10766_ANewCraft extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java
index 6fb43e4cd6..a82c8271e6 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java
@@ -60,7 +60,7 @@ public class Q10767_AWholeNewLevelOfAlchemy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10769_LettersFromTheQueenCrumaTowerPart1/Q10769_LettersFromTheQueenCrumaTowerPart1.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10769_LettersFromTheQueenCrumaTowerPart1/Q10769_LettersFromTheQueenCrumaTowerPart1.java
index dd3094b3e1..8d340700ac 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10769_LettersFromTheQueenCrumaTowerPart1/Q10769_LettersFromTheQueenCrumaTowerPart1.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10769_LettersFromTheQueenCrumaTowerPart1/Q10769_LettersFromTheQueenCrumaTowerPart1.java
@@ -57,7 +57,7 @@ public class Q10769_LettersFromTheQueenCrumaTowerPart1 extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java
index 54e0a0f389..2acfad68bd 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java
@@ -62,7 +62,7 @@ public class Q10770_InSearchOfTheGrail extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java
index 78b1a969d8..f744ad750f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java
@@ -60,7 +60,7 @@ public class Q10771_VolatilePower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java
index 6e5545e8f4..78a1c7ec03 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java
@@ -60,7 +60,7 @@ public class Q10772_ReportsFromCrumaTowerPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java
index ddd688d95a..c29029eed7 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java
@@ -56,7 +56,7 @@ public class Q10774_LettersFromTheQueenCrumaTowerPart2 extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java
index 461bb753c7..a6e48a1216 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java
@@ -64,7 +64,7 @@ public class Q10775_InSearchOfAnAncientGiant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java
index 16c146334a..f9e797dc7f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java
@@ -70,7 +70,7 @@ public class Q10776_TheWrathOfTheGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java
index d8030e4eee..0fd3f2e737 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java
@@ -60,7 +60,7 @@ public class Q10777_ReportsFromCrumaTowerPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10779_LettersFromTheQueenSeaOfSpores/Q10779_LettersFromTheQueenSeaOfSpores.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10779_LettersFromTheQueenSeaOfSpores/Q10779_LettersFromTheQueenSeaOfSpores.java
index 20e9699738..1743f54b84 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10779_LettersFromTheQueenSeaOfSpores/Q10779_LettersFromTheQueenSeaOfSpores.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10779_LettersFromTheQueenSeaOfSpores/Q10779_LettersFromTheQueenSeaOfSpores.java
@@ -56,7 +56,7 @@ public class Q10779_LettersFromTheQueenSeaOfSpores extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java
index c6cf778a6d..bca75549d5 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java
@@ -66,7 +66,7 @@ public class Q10780_AWeakenedBarrier extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10781_IngredientsToEnforcements/Q10781_IngredientsToEnforcements.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10781_IngredientsToEnforcements/Q10781_IngredientsToEnforcements.java
index 5c290d968c..11ed3d2ae0 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10781_IngredientsToEnforcements/Q10781_IngredientsToEnforcements.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10781_IngredientsToEnforcements/Q10781_IngredientsToEnforcements.java
@@ -61,7 +61,7 @@ public class Q10781_IngredientsToEnforcements extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java
index 6c11c32381..ba9cdbe126 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java
@@ -56,7 +56,7 @@ public class Q10782_LettersFromTheQueenForsakenPlains extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java
index bf536b64e4..dfbaa8ddc2 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java
@@ -79,7 +79,7 @@ public class Q10783_TracesOfAnAmbush extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java
index 9558be2c38..a8d28a2891 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java
@@ -63,7 +63,7 @@ public class Q10784_TheBrokenDevice extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java
index c688e09ef8..1edfa79000 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java
@@ -56,7 +56,7 @@ public class Q10785_LettersFromTheQueenFieldsOfMassacre extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java
index 8234edf8b1..b64830bfcd 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java
@@ -74,7 +74,7 @@ public class Q10786_ResidentProblemSolver extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java
index 09bd9760de..8aa64b279c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java
@@ -58,7 +58,7 @@ public class Q10787_ASpyMission extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java
index 8f151450ce..602b67c92f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java
@@ -56,7 +56,7 @@ public class Q10789_LettersFromTheQueenSwampOfScreams extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java
index 6c7cb90aec..ad66ca1d28 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java
@@ -75,7 +75,7 @@ public class Q10790_AMercenaryHelper extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java
index 06e621609d..ce55607210 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java
@@ -66,7 +66,7 @@ public class Q10791_TheManOfMystery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java
index 199a233254..82e3335ab0 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java
@@ -56,7 +56,7 @@ public class Q10792_LettersFromTheQueenForestOfTheDead extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java
index c1d1d998d8..e1d0307f88 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java
@@ -72,7 +72,7 @@ public class Q10793_SaveTheSouls extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java
index a6755ce1c7..55fc667c4a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java
@@ -95,7 +95,7 @@ public class Q10794_InvestigateTheForest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java
index 41036407f6..2fde8e412d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java
@@ -41,7 +41,7 @@ public class Q10795_LettersFromTheQueenWallOfAgros extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java
index 143abbad30..e83fbb835a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java
@@ -48,7 +48,7 @@ public class Q10796_TheEyeThatDefiedTheGods extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
index 7d89984145..46893db27c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
@@ -53,7 +53,7 @@ public class Q10797_CrossingFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java
index a4388db16a..2cc223805a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java
@@ -57,7 +57,7 @@ public class Q10798_LettersFromTheQueenDragonValley extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java
index 71d7d125c0..5b2a84886c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java
@@ -72,7 +72,7 @@ public class Q10799_StrangeThingsAfootInTheValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java
index 6bf9ad2e94..2395ed2625 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java
@@ -72,7 +72,7 @@ public class Q10800_ReconnaissanceAtDragonValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
index b1dca4d5b3..15fc371c1a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
@@ -55,7 +55,7 @@ public class Q10801_TheDimensionalWarpPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
index 1339720830..1b0c8d74d0 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
@@ -56,7 +56,7 @@ public class Q10802_TheDimensionalWarpPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
index 117f5cc53e..4cae513e93 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
@@ -57,7 +57,7 @@ public class Q10803_TheDimensionalWarpPart3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
index 124823783a..f16e276a8f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
@@ -57,7 +57,7 @@ public class Q10804_TheDimensionalWarpPart4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
index a6796e0c63..b80b2b6ae5 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
@@ -57,7 +57,7 @@ public class Q10805_TheDimensionalWarpPart5 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
index d6ecba6b8e..5a8d67d930 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
@@ -56,7 +56,7 @@ public class Q10806_TheDimensionalWarpPart6 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
index 12462309a1..393bbe074c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
@@ -56,7 +56,7 @@ public class Q10807_TheDimensionalWarpPart7 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/ThirdClassTransferQuest.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
index 9cb14382cb..89146d7a27 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
@@ -131,7 +131,7 @@ public abstract class ThirdClassTransferQuest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/vehicles/AirShipController.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/vehicles/AirShipController.java
index 682f3b238b..ee534c5f04 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/vehicles/AirShipController.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/vehicles/AirShipController.java
@@ -117,7 +117,7 @@ public abstract class AirShipController extends AbstractNpcAI
 	private static final SystemMessage SM_NEED_MORE = new SystemMessage(SystemMessageId.AN_AIRSHIP_CANNOT_BE_SUMMONED_BECAUSE_YOU_DON_T_HAVE_ENOUGH_S1).addItemName(STARSTONE);
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("summon".equalsIgnoreCase(event))
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
index f3974aa349..c748e1c2cd 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
@@ -162,7 +162,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player.isTransformed())
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
index 7ff39fb0c0..8675a7ec2c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
@@ -51,7 +51,7 @@ public class AllianceMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!"9001-01.htm".equals(event) && (player.getClan() == null))
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
index 58c0e304f2..20648ef643 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
@@ -80,7 +80,7 @@ public class ClanMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LEADER_REQUIRED.containsKey(event) && !player.isClanLeader())
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/Quest.java
index e344bd9190..d49114c4bb 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/Quest.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/Quest.java
@@ -244,7 +244,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -266,7 +266,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -557,7 +557,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 			{
 				player.setSimulatedTalking(false);
 			}
-			res = onAdvEvent(event, npc, player);
+			res = onEvent(event, npc, player);
 		}
 		catch (Exception e)
 		{
@@ -1035,12 +1035,11 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 */
 	public String onDeath(Creature killer, Creature victim, QuestState qs)
 	{
-		return onAdvEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
+		return onEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
 	}
 	
 	/**
 	 * This function is called whenever a player clicks on a link in a quest dialog and whenever a timer fires.<br>
-	 * If is not overridden by a subclass, then default to the returned value of the simpler (and older) {@link #onEvent(String, QuestState)} override.<br>
 	 * If the player has a quest state, use it as parameter in the next call, otherwise return null.
 	 * @param event this parameter contains a string identifier for the event.<br>
 	 *            Generally, this string is passed directly via the link.<br>
@@ -1059,35 +1058,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 *            This parameter may be {@code null} in certain circumstances.
 	 * @return the text returned by the event (may be {@code null}, a filename or just text)
 	 */
-	public String onAdvEvent(String event, Npc npc, Player player)
-	{
-		if (player != null)
-		{
-			final QuestState qs = player.getQuestState(getName());
-			if (qs != null)
-			{
-				return onEvent(event, qs);
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * This function is called in place of {@link #onAdvEvent(String, Npc, Player)} if the former is not implemented.<br>
-	 * If a script contains both {@link #onAdvEvent(String, Npc, Player)} and this implementation, then this method will never be called unless the script's {@link #onAdvEvent(String, Npc, Player)} explicitly calls this method.
-	 * @param event this parameter contains a string identifier for the event.<br>
-	 *            Generally, this string is passed directly via the link.<br>
-	 *            For example:<br>
-	 *            <code>
-	 *            &lt;a action="bypass -h Quest 626_ADarkTwilight 31517-01.htm"&gt;hello&lt;/a&gt;
-	 *            </code><br>
-	 *            The above link sets the event variable to "31517-01.htm" for the quest 626_ADarkTwilight.<br>
-	 *            In the case of timers, this will be the name of the timer.<br>
-	 *            This parameter serves as a sort of identifier.
-	 * @param qs this parameter contains a reference to the quest state of the player who used the link or started the timer.
-	 * @return the text returned by the event (may be {@code null}, a filename or just text)
-	 */
-	public String onEvent(String event, QuestState qs)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return null;
 	}
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
index e85df039b0..0ebae68471 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
@@ -73,7 +73,7 @@ public class AncientArcanCity extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CHANGE_STATE"))
 		{
@@ -107,7 +107,7 @@ public class AncientArcanCity extends AbstractNpcAI
 				cat.broadcastSocialAction(2);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
index d76c158f9e..d38ceb917e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
@@ -42,7 +42,7 @@ public class Lykus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
index 4fd3e87bb7..92979a713e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
@@ -39,7 +39,7 @@ public class Mumu extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
index 56ceed0cda..34c3cc9100 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
@@ -329,7 +329,7 @@ public class AteliaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
index c87c4e9224..a2a2891b57 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
@@ -56,7 +56,7 @@ public class BabyPets extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("HEAL") && (player != null))
 		{
@@ -78,7 +78,7 @@ public class BabyPets extends AbstractNpcAI
 				cancelQuestTimer("HEAL", null, player);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGOUT)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
index b0153ef5da..f0f610c8b9 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
@@ -56,7 +56,7 @@ public class ImprovedBabyPets extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player != null)
 		{
@@ -108,7 +108,7 @@ public class ImprovedBabyPets extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
index 6b4a147550..301899a76f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
@@ -42,7 +42,7 @@ public class Tunatun extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java
index f6485e07b4..2693ef7a00 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java
@@ -48,7 +48,7 @@ public class Alarm extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Player player0 = npc.getVariables().getObject("player0", Player.class);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
index a2b4810dfa..ad01bdba4a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
@@ -46,14 +46,14 @@ public class CrumaTower extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("MESSAGE") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_GO_TO_UNDERGROUND_LV_3_USING_THE_ELEVATOR_IN_THE_BACK);
 			startQuestTimer(event, 15000, npc, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
index 7cab0d9caf..9ac87f3024 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
@@ -77,7 +77,7 @@ public class FrightenedRagnaOrc extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
index ee5d44d59e..db9d7838fc 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
@@ -53,7 +53,7 @@ public class DragonVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("Spawn".equals(event))
 		{
@@ -104,7 +104,7 @@ public class DragonVortex extends AbstractNpcAI
 		{
 			npc.setScriptValue(0);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
index de54d68cf6..ce248d3f8f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
@@ -53,7 +53,7 @@ public class LairOfAntharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CHECK_HOME") && (npc != null) && !npc.isDead())
 		{
@@ -67,7 +67,7 @@ public class LairOfAntharas extends AbstractNpcAI
 				npc.broadcastPacket(new ValidateLocation(npc));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
index bf46d16542..c4e625c565 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
@@ -55,7 +55,7 @@ public class LeopardDragonHachling extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && event.equals("MOVE_TO_TRANSFORM"))
 		{
@@ -77,7 +77,7 @@ public class LeopardDragonHachling extends AbstractNpcAI
 				npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, nearestLocation(npc));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
index 02cbc8234d..b51816c1d6 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
@@ -40,13 +40,13 @@ public class MercenaryCaptain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THE_SOUTHERN_PART_OF_DRAGON_VALLEY_IS_MUCH_MORE_DANGEROUS_THAN_THE_NORTH_BE_CAREFUL));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
index 13dfbd313b..324120327b 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
@@ -61,10 +61,10 @@ public class MercenaryTeleport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		player.teleToLocation(LOCATIONS.get(event), true);
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DragonValley/Namo.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
index 99057c816c..f21c497157 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
@@ -40,13 +40,13 @@ public class Namo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THIS_PLACE_SWARMS_WITH_DRAGONS_BY_DAY_AND_UNDEAD_BY_NIGHT));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
index 32c7beb400..c02404f76a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
@@ -40,13 +40,13 @@ public class Rakun extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THIS_PLACE_SWARMS_WITH_DRAGONS_BY_DAY_AND_UNDEAD_BY_NIGHT));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
index 349976c56b..cc5487971c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
@@ -72,7 +72,7 @@ public class SeparatedSoul extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LOCATIONS.containsKey(event))
 		{
@@ -98,7 +98,7 @@ public class SeparatedSoul extends AbstractNpcAI
 				return "no-items.htm";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java
index 4cb6303606..8d927f12d2 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java
@@ -48,7 +48,7 @@ public class FlowerBud extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("spawn") && npc.isDead())
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
index 8ca5f0c7d4..a3b3d2da62 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
@@ -49,7 +49,7 @@ public class AltarOfSouls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -96,7 +96,7 @@ public class AltarOfSouls extends AbstractNpcAI
 				return "33920-9.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
index 47beace94a..c82e8969f1 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
@@ -41,7 +41,7 @@ public class RemembranceTower extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("action") && npc.isScriptValue(0))
 		{
@@ -54,7 +54,7 @@ public class RemembranceTower extends AbstractNpcAI
 			npc.setScriptValue(0);
 			npc.broadcastPacket(new OnEventTrigger(EMMITER_ID, false));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
index 39625630cd..0d3824cd68 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
@@ -60,7 +60,7 @@ public class LargeCocoon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -138,7 +138,7 @@ public class LargeCocoon extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
index d4a9137f8d..20aad104b0 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
@@ -41,7 +41,7 @@ public class KrateisCube extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
index 54f813c829..c1de7e5630 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
@@ -365,7 +365,7 @@ public class TalentShow extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((event == null) || event.isEmpty())
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
index 099500e9bb..8dea4780a1 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
@@ -41,7 +41,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -54,7 +54,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 				npc.deleteMe();
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_DAY_NIGHT_CHANGE)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
index 8029a17703..20dfae5ccf 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
@@ -88,7 +88,7 @@ public class ForgeOfTheGods extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
index ba045bd19c..39fcc5a8d7 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
@@ -84,7 +84,7 @@ public class Rooney extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport") && !npc.isDecayed())
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
index a3bc5828d9..40c8ad2e0d 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
@@ -87,7 +87,7 @@ public class GainakSiege extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("GAINAK_WAR"))
 		{
@@ -129,7 +129,7 @@ public class GainakSiege extends AbstractNpcAI
 				ZoneManager.getInstance().getZoneById(GAINAK_TOWN_ZONE.getId(), PeaceZone.class).setEnabled(false);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
index 27e969e0c9..955c7ddd25 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
@@ -46,7 +46,7 @@ public class Lailly extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
index 35274b2de7..ca8919593a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
@@ -128,7 +128,7 @@ public class TavernEmployee extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
index c99c7cdf42..0ff79c4f5d 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
@@ -76,7 +76,7 @@ public class Apherus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("buff"))
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
index 06a75493ac..d7944dd6f3 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
@@ -40,7 +40,7 @@ public class ApherusLookout extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		if (event.equals("open_bag"))
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
index e984558e2c..0d30623e93 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
@@ -48,7 +48,7 @@ public class GardenWatchman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -78,7 +78,7 @@ public class GardenWatchman extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
index 02b6a47091..42752aea0c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
@@ -42,7 +42,7 @@ public class GenesisVines extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CAST_SKILL") && npc.isScriptValue(1))
 		{
@@ -58,7 +58,7 @@ public class GenesisVines extends AbstractNpcAI
 			npc.setScriptValue(0);
 			npc.deleteMe();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
index 3216884d13..ab0d91e3cd 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
@@ -53,7 +53,7 @@ public class Statues extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("fight"))
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
index 29ccfb6308..64246fbb51 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
@@ -46,7 +46,7 @@ public class FuryKiku extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -76,7 +76,7 @@ public class FuryKiku extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
index 84b5b0c214..08ba28f0fd 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
@@ -50,7 +50,7 @@ public class Isabella extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAWN"))
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
index 2e3f7d5967..611d053b97 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
@@ -44,7 +44,7 @@ public class GiantsCave extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("ATTACK") && (player != null) && (npc != null) && !npc.isDead())
 		{
@@ -69,7 +69,7 @@ public class GiantsCave extends AbstractNpcAI
 		{
 			npc.setScriptValue(0);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
index d4c54fcddd..9e41be2b4a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
@@ -82,7 +82,7 @@ public class Spirit extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -102,7 +102,7 @@ public class Spirit extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/Heine/WrapGate.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
index eb934ee4dc..bd1d86a743 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
@@ -43,7 +43,7 @@ public class WrapGate extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("enter_hellbound".equals(event))
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java
index 515fc7df94..9ee6847840 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java
@@ -82,7 +82,7 @@ public class EnchantedMegaliths extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
index e49050b695..c4486b2670 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
@@ -39,7 +39,7 @@ public class LeonaBlackbird extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/HellboundIsland/QuarryRebel/QuarryRebel.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/HellboundIsland/QuarryRebel/QuarryRebel.java
index 248f2be6e0..7d2ec669ef 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/HellboundIsland/QuarryRebel/QuarryRebel.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/HellboundIsland/QuarryRebel/QuarryRebel.java
@@ -59,7 +59,7 @@ public class QuarryRebel extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAWN"))
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
index 888a2980ef..5923d188eb 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
@@ -60,7 +60,7 @@ public class Theorn extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
index e026f3cd57..5ef95aed5e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
@@ -47,7 +47,7 @@ public class Merlot extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/ImperialTomb/BloodySuccubus.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/ImperialTomb/BloodySuccubus.java
index 1f56178ded..2ab48d235a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/ImperialTomb/BloodySuccubus.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/ImperialTomb/BloodySuccubus.java
@@ -118,7 +118,7 @@ public class BloodySuccubus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
index 1879ece1c7..a69a2810f4 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
@@ -218,7 +218,7 @@ public class FourSepulchers extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
index 6ea0a0760f..14c4560f16 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
@@ -43,7 +43,7 @@ public class Zenya extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
index 2b048463f8..99e8fa6078 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
@@ -63,7 +63,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -135,7 +135,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 				npc.reduceCurrentHp(500, npc, null); // poison kills Fafurion if he is not healed
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
index 2a0a8014f8..d4dc25aab8 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
@@ -47,7 +47,7 @@ public class Rignos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -90,7 +90,7 @@ public class Rignos extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
index 43e2c64226..af4b116516 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
@@ -57,7 +57,7 @@ public class HillsOfGold extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -75,7 +75,7 @@ public class HillsOfGold extends AbstractNpcAI
 			});
 			startQuestTimer("SPICULA_AGGRO", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
index edf9416113..efaf6d6bf8 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
@@ -61,7 +61,7 @@ public class AvantGarde extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
index 37f35f00f8..ac8772d975 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
@@ -108,7 +108,7 @@ public class KetraOrcSupport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
index 6c1085f7d0..f253eadcb6 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
@@ -38,13 +38,13 @@ public class El extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_USE_THE_JUMP_BOARD_TO_GET_STRAIGHT_TO_THE_2ND_FLOOR, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
index 282d7a6326..debef79252 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
@@ -58,7 +58,7 @@ public class GeneralDilios extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("command_"))
 		{
@@ -87,7 +87,7 @@ public class GeneralDilios extends AbstractNpcAI
 				startQuestTimer("guard_animation_" + (value + 1), 1500, null, null);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
index 0a84cf47a0..b4dbbc74ae 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
@@ -47,7 +47,7 @@ public class Lekon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
index 89bccaaa2e..d1ee34cd79 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
@@ -54,7 +54,7 @@ public class LindviorScene extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -107,7 +107,7 @@ public class LindviorScene extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public void scheduleNextLindviorVisit()
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
index 79aaecd2f1..9d38ce28a4 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
@@ -59,7 +59,7 @@ public class Nottingale extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
index 975e4a2614..b0ded82d61 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
@@ -38,13 +38,13 @@ public class Plenos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_BE_TELEPORTED_TO_EACH_SEED_IF_YOU_VOLUNTEER_WHY_NOT_TRY, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
index 6b54823416..f19b854050 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
@@ -46,7 +46,7 @@ public class SeedTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -75,7 +75,7 @@ public class SeedTeleportDevice extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
index 23b5c50033..c8498cbee5 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
@@ -49,7 +49,7 @@ public class MithrilMinesTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int index = Integer.parseInt(event) - 1;
 		if (LOCS.length > index)
@@ -57,7 +57,7 @@ public class MithrilMinesTeleporter extends AbstractNpcAI
 			final Location loc = LOCS[index];
 			player.teleToLocation(loc, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
index d398cfc3b8..2901995fbe 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
@@ -82,7 +82,7 @@ public class MonasteryOfSilence extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -130,7 +130,7 @@ public class MonasteryOfSilence extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
index 9a2ee10f60..434807bd9e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
@@ -62,7 +62,7 @@ public class PaganTeleporters extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
index 7eed58ebec..1c6e6ba756 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
@@ -60,7 +60,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -90,7 +90,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI
 				instanceScript.notifyEvent(event, npc, player);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
index 9d4b3bde33..781bfa3af3 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
@@ -39,13 +39,13 @@ public class Fioren extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("startMovie"))
 		{
 			playMovie(player, Movie.SI_BARLOG_STORY);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java
index 9c52a15e19..2d6d808bad 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java
@@ -93,7 +93,7 @@ public class PlainsOfLizardman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("fantasy_mushroom") && (npc != null) && (player != null))
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
index 21ff72d2e7..c8747c6857 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
@@ -179,7 +179,7 @@ public class PrimevalIsle extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -239,7 +239,7 @@ public class PrimevalIsle extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
index 5ffc401682..6a166ec683 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
@@ -74,7 +74,7 @@ public class Kaysen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
index 619d9e57f4..ceb8d8a7b9 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
@@ -63,7 +63,7 @@ public class NervasTemporaryPrison extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
index b8b803e57f..43691cef06 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
@@ -38,14 +38,14 @@ public class RoAGuard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THIS_IS_RUINS_OF_AGONY_WHERE_KANILOV_IS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
index f3af67aba7..dd2a52bdc5 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
@@ -38,14 +38,14 @@ public class RoDGuard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THIS_IS_THE_RUINS_OF_AGONY_WHERE_POSLOF_IS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
index 5e57a9fb94..a19c1d4085 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
@@ -48,7 +48,7 @@ public class AltarOfSacrifice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("msg_text"))
 		{
@@ -68,7 +68,7 @@ public class AltarOfSacrifice extends AbstractNpcAI
 			startQuestTimer("msg_text", 135000, npc, null);
 			_jenas_guard.setScriptValue(0);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
index a025e62542..b50f530164 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
@@ -147,7 +147,7 @@ public class Venom extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
index ed4ce2d782..cd89ebcb9e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
@@ -43,7 +43,7 @@ public class Klemis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("portInside"))
 		{
@@ -56,7 +56,7 @@ public class Klemis extends AbstractNpcAI
 				return "32734-01.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
index d66782538a..c1db3c8180 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
@@ -80,7 +80,7 @@ public class Maguen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || (player == null))
 		{
@@ -163,7 +163,7 @@ public class Maguen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
index 344d65a44f..d5ab73ff74 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
@@ -48,7 +48,7 @@ public class Nemo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
index 251458ea98..ae26a6c701 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
@@ -297,7 +297,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("ChangeSeedsStatus"))
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
index d6f644fa86..765deb4a7d 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
@@ -51,7 +51,7 @@ public class Seyo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (npc == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
index f213bbec6c..f62aa835e8 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
@@ -132,7 +132,7 @@ public class SelMahumDrill extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -188,7 +188,7 @@ public class SelMahumDrill extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
index 4d3891946f..4e0a01cea2 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
@@ -83,7 +83,7 @@ public class SelMahumSquad extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -189,7 +189,7 @@ public class SelMahumSquad extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java
index 1c47135e60..a38df65796 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java
@@ -70,7 +70,7 @@ public class SilentValley extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
index ebf70cc5ae..6ba58ffc8e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
@@ -197,7 +197,7 @@ public class StakatoNest extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || (player == null) || npc.isDead())
 		{
@@ -225,7 +225,7 @@ public class StakatoNest extends AbstractNpcAI
 			addAttackPlayerDesire(spawned, player);
 			npc.deleteMe();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private static Monster checkMinion(Npc npc)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
index 611b134c70..2469300cb4 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
@@ -49,7 +49,7 @@ public class StakatoNestTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int index = Integer.parseInt(event) - 1;
 		if (LOCS.length > index)
@@ -67,7 +67,7 @@ public class StakatoNestTeleporter extends AbstractNpcAI
 			}
 			player.teleToLocation(loc, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
index 9acd290f95..535b8c912e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
@@ -48,7 +48,7 @@ public class Apprentice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("rideKukuru"))
 		{
@@ -74,7 +74,7 @@ public class Apprentice extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TRY_RIDING_A_KUKURI, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
index e09ab8270d..8c1824fe61 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
@@ -97,7 +97,7 @@ public class AwakeningMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
index cd6185a888..8ed7701c68 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
@@ -38,7 +38,7 @@ public class Banette extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
@@ -62,7 +62,7 @@ public class Banette extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
index 87e0629227..858331ae3e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
@@ -38,13 +38,13 @@ public class Bink extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TALKING_ISLAND_VILLAGE_IS_REALLY_BEAUTIFUL, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
index e439d986ad..5d231aa00d 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
@@ -45,7 +45,7 @@ public class BoyAndGirl extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_CHANGEWEAP"))
 		{
@@ -66,7 +66,7 @@ public class BoyAndGirl extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, npc.getId() == BOY ? NpcStringId.WEEE : NpcStringId.BOYS_ARE_SO_ANNOYING);
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
index ff53080809..22d19b3496 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
@@ -41,7 +41,7 @@ public class Devno extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -74,7 +74,7 @@ public class Devno extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
index a4f08b8c99..18c04b2e7e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
@@ -42,7 +42,7 @@ public class DrillSergeant extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SOCIAL_SHOW"))
 		{
@@ -66,7 +66,7 @@ public class DrillSergeant extends AbstractNpcAI
 				npc.broadcastSocialAction(socialActionId);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
index 8e3f9e5943..83363ef157 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
@@ -41,7 +41,7 @@ public class Eleve extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Eleve extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
index b8863b9963..114728632b 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
@@ -44,13 +44,13 @@ public class Gagabu extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, GAGABU_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
index 44dab7df42..d490504792 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
@@ -38,14 +38,14 @@ public class Galad extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSocialAction(3);
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.OCCASIONALLY_RARE_JEWELS_OF_GIANTS_ARE_DISCOVERED_IN_THE_BEACH, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
index a0c7f71816..3a56943e20 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
@@ -52,7 +52,7 @@ public class GiantSoldiers extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
index a703c40323..b94d2f9624 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
@@ -38,7 +38,7 @@ public class GuardSoldier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -49,7 +49,7 @@ public class GuardSoldier extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(2);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
index b26d9fd748..1b0dd65c82 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
@@ -43,7 +43,7 @@ public class Hadel extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
index bdb70d1f2d..d7ff70d9a0 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
@@ -38,7 +38,7 @@ public class Handermonkey extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE") && (npc != null))
 		{
@@ -54,7 +54,7 @@ public class Handermonkey extends AbstractNpcAI
 				npc.broadcastSocialAction(9);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
index b8370bffe7..5ea0569424 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
@@ -60,7 +60,7 @@ public class Hardin extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = getHtmlMessage(player);
 		if (htmltext != null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
index a8bded51f1..536ee7f5cd 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
@@ -58,7 +58,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("HARNAK_SPAWN"))
 		{
@@ -70,7 +70,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
 				_templates.forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName), null));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private static class zoneInfo
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
index 3c2080e85a..03dca71bb5 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
@@ -55,13 +55,13 @@ public class HurnakMobMsg extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("ATTACK"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomEntry(ON_ATTACK_MSG));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
index 81f6617329..7055381eab 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
@@ -38,14 +38,14 @@ public class Hera extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomBoolean() ? NpcStringId.DOES_THE_GODDESS_SEE_WHAT_SHE_HAS_DONE : NpcStringId.WHY_HAVE_THE_HEROES_ABANDONED_US);
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
index 7003ad014d..2b6a1a1e51 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
@@ -38,7 +38,7 @@ public class Heymond extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
@@ -62,7 +62,7 @@ public class Heymond extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
index 52ce99be7f..8033f3c1ec 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
@@ -38,7 +38,7 @@ public class Holly extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -48,7 +48,7 @@ public class Holly extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(6);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
index 3f9141b931..e11490debc 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
@@ -41,7 +41,7 @@ public class Karonf extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Karonf extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
index 597cfd80f2..c102b0cc4c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
@@ -44,7 +44,7 @@ public class Luderic extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -54,7 +54,7 @@ public class Luderic extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(1);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
index 0c07720a0a..08de6143f0 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
@@ -45,13 +45,13 @@ public class Lumi extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, LUMI_SHOUT[getRandom(3)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
index 68b2789416..3bdb8de60b 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
@@ -38,13 +38,13 @@ public class Mahram extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.ALCHEMY_IS_A_SCIENCE_AND_AN_ART, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
index e00fd6c98c..85117713a0 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
@@ -38,13 +38,13 @@ public class Mai extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EVERY_RACE_BUILT_A_PIECE_OF_THIS_VILLAGE, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
index dcd47a9822..2d44f1568a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
@@ -38,13 +38,13 @@ public class MarinSmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.HMM_IS_THIS_STILL_A_DECENT_WEAPON, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
index d5e5496e16..0d4e8f79e3 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
@@ -41,7 +41,7 @@ public class Marsha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Marsha extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
index aa9eb0eb87..81bc246742 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
@@ -43,7 +43,7 @@ public class Milia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("gludioAirship"))
 		{
@@ -53,7 +53,7 @@ public class Milia extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SPEAK_WITH_ME_ABOUT_TRAVELING_AROUND_ADEN, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
index b1e037eb5a..933c139b8c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
@@ -64,7 +64,7 @@ public class MonkOfChaos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
index f6cd83883a..0bedb09eb6 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
@@ -41,7 +41,7 @@ public class Morgan extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Morgan extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
index e7ce45a4e5..fd5e025cd2 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
@@ -40,7 +40,7 @@ public class Oris extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SOCIAL_ACTION_1"))
 		{
@@ -55,7 +55,7 @@ public class Oris extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_HAVEN_T_FELT_THIS_GOOD_IN_AGES, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
index 328de6a4df..34ae4f55b6 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
@@ -49,7 +49,7 @@ public class Pantheon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
index 869ebf3119..e44fe2e373 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
@@ -152,7 +152,7 @@ public class Raina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
index 4c8862c733..8d66a71766 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
@@ -41,7 +41,7 @@ public class Rubentis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Rubentis extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
index d5c86cee97..87e1df4a6b 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
@@ -38,14 +38,14 @@ public class Ruks extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomBoolean() ? NpcStringId.THE_SEVEN_SIGNS_ENDED : NpcStringId.WE_NEED_TO_FIND_HER_WEAKNESS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
index cc9a63c666..880532e52c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
@@ -38,13 +38,13 @@ public class Sebion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TIS_A_SCRATCH, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
index fa3cc06633..4b05120bde 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
@@ -38,13 +38,13 @@ public class Shannon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.LOOK_AT_ALL_THE_NEWBIES_HA_HA_HA, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
index 219ac48515..7fd067c374 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
@@ -44,13 +44,13 @@ public class Sodian extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, SODIAN_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
index e11dfb9aaf..8413c93bc8 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
@@ -44,13 +44,13 @@ public class Stiller extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, STILLER_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
index b10f044196..d196091a8e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
@@ -38,13 +38,13 @@ public class Theodore extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.AND_NOW_YOUR_JOURNEY_BEGINS, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
index 4290aa8fc6..8e4f8ed738 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
@@ -38,7 +38,7 @@ public class TomaJunior extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -49,7 +49,7 @@ public class TomaJunior extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(6);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java
index 85da23b9b2..bf230b7f50 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java
@@ -48,7 +48,7 @@ public class Toyron extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true);
 		if (event.equals("museum_teleport"))
@@ -59,7 +59,7 @@ public class Toyron extends AbstractNpcAI
 			}
 			player.teleToLocation(MUSEUM_OUT);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
index c3aa031317..78ce6f2c8c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
@@ -38,7 +38,7 @@ public class TrainningSoldier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -55,7 +55,7 @@ public class TrainningSoldier extends AbstractNpcAI
 			}
 			startQuestTimer("START_ATTACK", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
index 219dbdca43..2e18e168e1 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
@@ -63,7 +63,7 @@ public class Trandon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String[] substrings = event.split(" ");
 		if (substrings.length < 1)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
index 8cd3cd965d..b65bd9a7ad 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
@@ -42,7 +42,7 @@ public class YeSagiraGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -56,7 +56,7 @@ public class YeSagiraGuards extends AbstractNpcAI
 			}
 			startQuestTimer("GUARD_AGGRO", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
index 2d8154f844..f7eec1d081 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
@@ -88,7 +88,7 @@ public class YeSegiraTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LOCATIONS.containsKey(event))
 		{
@@ -111,7 +111,7 @@ public class YeSegiraTeleportDevice extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_PLAYER_CREATE)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java
index e546cbc086..be903e83d2 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java
@@ -87,7 +87,7 @@ public class ToIVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int npcId = npc.getId();
 		
@@ -133,7 +133,7 @@ public class ToIVortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TownOfGiran/Alexandria/Alexandria.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TownOfGiran/Alexandria/Alexandria.java
index 1a0064cbcd..8091ac70e6 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TownOfGiran/Alexandria/Alexandria.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TownOfGiran/Alexandria/Alexandria.java
@@ -82,7 +82,7 @@ public class Alexandria extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("30098-02.html"))
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
index 2c8e967539..4bb6be2086 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
@@ -40,7 +40,7 @@ public class Acateo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("give_circlet"))
 		{
@@ -51,7 +51,7 @@ public class Acateo extends AbstractNpcAI
 			giveItems(player, ACADEMY_CIRCLET, 1);
 			return "33905-2.html";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TownOfGoddard/Cerenas/Cerenas.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TownOfGoddard/Cerenas/Cerenas.java
index 4b87f5ec09..f2df150f21 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TownOfGoddard/Cerenas/Cerenas.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TownOfGoddard/Cerenas/Cerenas.java
@@ -41,7 +41,7 @@ public class Cerenas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(Q10369_NoblesseSoulTesting.class.getSimpleName());
 		String htmltext = null;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
index 949fb8f279..48ca778074 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
@@ -108,7 +108,7 @@ public class VarkaSilenosSupport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
index b7fb571500..3a94d3d378 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
@@ -43,7 +43,7 @@ public class ElmoredenServantsGhost extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("teleport1") || event.equals("teleport2"))
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
index 427084ea7a..150fee7dfb 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
@@ -83,7 +83,7 @@ public class Wastelands extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || !npc.isSpawned())
 		{
@@ -184,7 +184,7 @@ public class Wastelands extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
index 61678a5cb2..5e24c8040c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
@@ -47,7 +47,7 @@ public class ZealotOfShilen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -75,7 +75,7 @@ public class ZealotOfShilen extends AbstractNpcAI
 			}
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
index 2da266ca0e..ab6a6ebc3e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
@@ -38,14 +38,14 @@ public class Commando extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.WE_RE_COLLECTING_SEEKER_OF_ADEN);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Anais/Anais.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Anais/Anais.java
index 74fe879672..823d08142f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Anais/Anais.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Anais/Anais.java
@@ -75,7 +75,7 @@ public class Anais extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -134,7 +134,7 @@ public class Anais extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
index 00ebb5f34f..6f04200e6f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
@@ -361,7 +361,7 @@ public class Anakim extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -475,7 +475,7 @@ public class Anakim extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index d236e19d43..a5157acfc7 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -193,7 +193,7 @@ public class Antharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -605,7 +605,7 @@ public class Antharas extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 3051d87c77..3d8308a45c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -164,7 +164,7 @@ public class Baium extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -478,7 +478,7 @@ public class Baium extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
index 992eae3c7c..7bea095520 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
@@ -105,7 +105,7 @@ public class BalokWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -115,7 +115,7 @@ public class BalokWarzone extends AbstractInstance
 				takeItems(player, PRISON_KEY, -1);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
index 6684b9b04c..ce39ed9b22 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
@@ -72,7 +72,7 @@ public class BaylorWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -124,7 +124,7 @@ public class BaylorWarzone extends AbstractInstance
 				player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index b5a24845bb..3748875859 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -126,7 +126,7 @@ public class Beleth extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -536,7 +536,7 @@ public class Beleth extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
index e2770b5bec..b768e563e9 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
@@ -49,7 +49,7 @@ public class Wormhole extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Core/Core.java
index 344ad52a0a..34584c31c3 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -143,7 +143,7 @@ public class Core extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
@@ -162,7 +162,7 @@ public class Core extends AbstractNpcAI
 			_minions.forEach(Attackable::decayMe);
 			_minions.clear();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
index 859e6fc695..ed664b4197 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
@@ -65,7 +65,7 @@ public class IceQueensCastle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class IceQueensCastle extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
index a07501ed22..9f3772a47d 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
@@ -160,7 +160,7 @@ public class IceQueensCastleBattle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterEasy"))
 		{
@@ -700,7 +700,7 @@ public class IceQueensCastleBattle extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
index 7fa44d08d6..21e250c482 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
@@ -45,7 +45,7 @@ public class Jinia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
index 62de6736d0..3a3ddc74e7 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
@@ -165,7 +165,7 @@ public class LastImperialTomb extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
index 282b9f8fbc..254c891bc5 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
@@ -62,7 +62,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
index e4260628ce..d61884c91b 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
@@ -92,7 +92,7 @@ public class IstinaCavern extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance instance = npc.getInstanceWorld();
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
index 27728f34c1..f1945e2def 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
@@ -40,7 +40,7 @@ public class Rumiese extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
index b94d17f47b..ae0e6aaef9 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
@@ -141,7 +141,7 @@ public class Kelbim extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -281,7 +281,7 @@ public class Kelbim extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
index 9f677053b2..c3e066a466 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
@@ -137,7 +137,7 @@ public class KimerianCommon extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance instance = npc.getInstanceWorld();
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
index 8d618ecd4f..f0d8652322 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
@@ -387,7 +387,7 @@ public class Lilith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -501,7 +501,7 @@ public class Lilith extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
index 5b16c333e2..ced833a889 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
@@ -49,7 +49,7 @@ public class KatoSicanus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
index 2bd8aeb2c6..7dacdd2c16 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
@@ -674,7 +674,7 @@ public class Lindvior extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
index 73d5d88407..f676f620a3 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
@@ -49,7 +49,7 @@ public class Vortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -110,7 +110,7 @@ public class Vortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java
index 190f1ce9ea..02f57b1bd5 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java
@@ -59,7 +59,7 @@ public class Lydia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
index 49a224c8bc..8c7d0eb77d 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
@@ -122,7 +122,7 @@ public class OctavisWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -146,7 +146,7 @@ public class OctavisWarzone extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index e74bc817e6..11c8477773 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -180,7 +180,7 @@ public class Orfen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -263,7 +263,7 @@ public class Orfen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 93735c996b..72e174bb65 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -155,7 +155,7 @@ public class QueenAnt extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -239,7 +239,7 @@ public class QueenAnt extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
index 7a3322b68a..297948d172 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
@@ -53,7 +53,7 @@ public class QueenShyeed extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
index ad87d93fe0..20e1572d8a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
@@ -80,7 +80,7 @@ public class Sailren extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -249,7 +249,7 @@ public class Sailren extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
index 02f0987432..ee16f1920f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
@@ -74,7 +74,7 @@ public class Cannon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
index f754206b22..45b4c89ee7 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
@@ -62,7 +62,7 @@ public class TautiWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -170,7 +170,7 @@ public class TautiWarzone extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
index 50da94c8b2..f973bf0e12 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
@@ -182,7 +182,7 @@ public class TeredorWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
index 7b07413999..63b2c0589a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
@@ -507,7 +507,7 @@ public class Stage1 extends AbstractInstance implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
index 70d36f9c61..d2abf63365 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
@@ -50,7 +50,7 @@ public class Daichir extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterEarthWyrnCave"))
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
index e69a688d77..2c365d7f61 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
@@ -570,7 +570,7 @@ public class Trasken extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -694,7 +694,7 @@ public class Trasken extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index 74f7b64063..4eaf667f0a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -191,7 +191,7 @@ public class Valakas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -380,7 +380,7 @@ public class Valakas extends AbstractNpcAI
 		{
 			BOSS_ZONE.oustAllPlayers();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
index a211f7bfc0..bae4d63898 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
@@ -172,7 +172,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter60"))
 		{
@@ -254,7 +254,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/AdenReconstructorManager.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
index efa4bfa6ca..65a08050b6 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
@@ -42,7 +42,7 @@ public class AdenReconstructorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -67,7 +67,7 @@ public class AdenReconstructorManager extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
index f6a8c7b5ab..a3bba67d4c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
@@ -62,7 +62,7 @@ public class AdventureGuildsman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
index 454c5b400f..dea128399c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
@@ -65,7 +65,7 @@ public class AdventurersGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
index 8bb8061495..3428520002 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
@@ -53,7 +53,7 @@ public class AlchemistManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index b939ece983..849ed827d3 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -63,7 +63,7 @@ public class ArenaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -128,7 +128,7 @@ public class ArenaManager extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
index 1c51b94358..352c31c8fc 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
@@ -38,7 +38,7 @@ public class BlackJudge extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("weakenBreath"))
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
index d35adf8706..e203aecd5e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
@@ -42,7 +42,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equals("31092-01.html"))
@@ -79,7 +79,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 			giveAdena(player, count, false);
 			return "31092-04.html";
 		}
-		return super.onAdvEvent(htmltext, npc, player);
+		return super.onEvent(htmltext, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
index 6a44d63e0b..81e90f2d67 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
@@ -56,7 +56,7 @@ public class CastleAmbassador extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
index b07792cd2d..11b8786523 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
@@ -57,7 +57,7 @@ public class CastleBlacksmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return (event.equalsIgnoreCase(npc.getId() + "-02.html") && hasRights(player, npc)) ? event : null;
 	}
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
index 355012ffea..5385531356 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
@@ -393,7 +393,7 @@ public class CastleChamberlain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Castle castle = npc.getCastle();
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
index 3e2cd16930..4a8fac8c0e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
@@ -140,7 +140,7 @@ public class CastleCourtMagician extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player.getClan() == null) && (player.getClanId() != npc.getCastle().getOwnerId()))
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
index b9c1f3faf5..70bae86615 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
@@ -72,7 +72,7 @@ public class CastleDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
index bb32dde319..a319e3977f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
@@ -56,7 +56,7 @@ public class CastleMercenaryManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index ac71c1afad..0e8137bb1d 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -78,7 +78,7 @@ public class CastleTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
@@ -168,7 +168,7 @@ public class CastleTeleporter extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
index bffed40bcc..ea1b40c41c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
@@ -52,7 +52,7 @@ public class CastleWarehouse extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final boolean isMyLord = player.isClanLeader() && (player.getClan().getCastleId() == (npc.getCastle() != null ? npc.getCastle().getResidenceId() : -1));
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index f1c43a8aaa..f5f4d8caa7 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -64,7 +64,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
index a86581206e..afd7250ca4 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
@@ -57,7 +57,7 @@ public class ClanHallDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 51ff62c312..4da19f2400 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -107,7 +107,7 @@ public class ClanHallManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
index 1d8e114daa..77845525b2 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
@@ -68,7 +68,7 @@ public class ClanTrader extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index e4dab602d4..c84d0a6c26 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -235,7 +235,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		if (!_isEnabled)
 		{
@@ -936,7 +936,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	{
 		if (event.getCommand().startsWith("Quest ClassMaster "))
 		{
-			final String html = onAdvEvent(event.getCommand().substring(18), null, event.getPlayer());
+			final String html = onEvent(event.getCommand().substring(18), null, event.getPlayer());
 			event.getPlayer().sendPacket(TutorialCloseHtml.STATIC_PACKET);
 			showResult(event.getPlayer(), html);
 		}
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
index 21aafa7e87..7b61214c91 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
@@ -43,7 +43,7 @@ public class CrimsonHatuOtis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -69,7 +69,7 @@ public class CrimsonHatuOtis extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java
index e1f6de3c80..c66ba04bfe 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java
@@ -73,7 +73,7 @@ public class DimensionalMerchant extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/DivineBeast.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/DivineBeast.java
index 1f247a7b35..3f3a076992 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/DivineBeast.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/DivineBeast.java
@@ -44,7 +44,7 @@ public class DivineBeast extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player == null) || !player.hasServitors())
 		{
@@ -55,7 +55,7 @@ public class DivineBeast extends AbstractNpcAI
 			cancelQuestTimer(event, npc, player);
 			player.getServitors().values().forEach(summon -> summon.unSummon(player));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/EnergySeeds.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/EnergySeeds.java
index 509c12bbeb..befbad7bff 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/EnergySeeds.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/EnergySeeds.java
@@ -196,7 +196,7 @@ public class EnergySeeds extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("StartSoDAi"))
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/FameManager/FameManager.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/FameManager/FameManager.java
index d4f16a9b96..b0a7bc0a20 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/FameManager/FameManager.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/FameManager/FameManager.java
@@ -49,7 +49,7 @@ public class FameManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
index 79742f7171..c5a075fbcf 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
@@ -69,7 +69,7 @@ public class FortressSiegeManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
index 344d4c5547..db32dd6f2b 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
@@ -67,7 +67,7 @@ public class HealerTrainer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
index 94b2f5f16d..2b2e0d3c40 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
@@ -89,7 +89,7 @@ public class HermuncusMinion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(eventValue, " ");
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
index 2928fbd023..abe98a50e5 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
@@ -47,7 +47,7 @@ public class LaVieEnRose extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/Mammons/Mammons.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/Mammons/Mammons.java
index 3ff005b72b..f58c7b8b86 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/Mammons/Mammons.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/Mammons/Mammons.java
@@ -79,12 +79,12 @@ public class Mammons extends AbstractNpcAI
 		addTalkId(MAMMONS);
 		addFirstTalkId(MAMMONS);
 		
-		onAdvEvent("RESPAWN_MAMMONS", null, null);
+		onEvent("RESPAWN_MAMMONS", null, null);
 		startQuestTimer("RESPAWN_MAMMONS", TELEPORT_DELAY, null, null, true);
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
index 8d38a27541..6763b0367c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
@@ -71,7 +71,7 @@ public class ManorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
index 0ef47a4ae0..efd307540c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
@@ -145,7 +145,7 @@ public class MentorGuide extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("exchange"))
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/Minigame/Minigame.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/Minigame/Minigame.java
index 14e3f84dbd..3971049085 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/Minigame/Minigame.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/Minigame/Minigame.java
@@ -68,7 +68,7 @@ public class Minigame extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final MinigameRoom room = getRoomByManager(npc);
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
index fe59e53b0b..a020799422 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
@@ -79,7 +79,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/MysteriousWizard/MysteriousWizard.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/MysteriousWizard/MysteriousWizard.java
index 2c423c6490..667463de4d 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/MysteriousWizard/MysteriousWizard.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/MysteriousWizard/MysteriousWizard.java
@@ -41,7 +41,7 @@ public class MysteriousWizard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return event.equals("33980-01.html") ? event : null;
 	}
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
index 4ad7e0a2fc..d3576b9fff 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
@@ -48,14 +48,14 @@ public class NornilTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("teleport_"))
 		{
 			final int locId = Integer.parseInt(event.replace("teleport_", ""));
 			player.teleToLocation(LOCATIONS[locId - 1]);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
index d3feff3b2f..42cfbf60d0 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
@@ -69,7 +69,7 @@ public class OlyBuffer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index 16d309eed4..a6fed0f973 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -88,7 +88,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/PrisonGuards.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/PrisonGuards.java
index 4084beddca..c79356a1f0 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/PrisonGuards.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/PrisonGuards.java
@@ -53,7 +53,7 @@ public class PrisonGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CLEAR_STATUS"))
 		{
@@ -67,7 +67,7 @@ public class PrisonGuards extends AbstractNpcAI
 			}
 			startQuestTimer("CHECK_HOME", 30000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
index 21d281c6c9..435f293345 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
@@ -84,7 +84,7 @@ public class Proclaimer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("giveBuff"))
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
index 8b3515e12b..83098c1eaf 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
@@ -79,7 +79,7 @@ public class ProvisionalHalls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/Servitors/SinEater.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/Servitors/SinEater.java
index 1ed8d645a5..d7536614e8 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/Servitors/SinEater.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/Servitors/SinEater.java
@@ -48,7 +48,7 @@ public class SinEater extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TALK") && (player != null) && (player.getPet() != null))
 		{
@@ -79,7 +79,7 @@ public class SinEater extends AbstractNpcAI
 			}
 			startQuestTimer("TALK", 60000, null, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_CREATURE_DEATH)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
index ec177e537e..373c64200b 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
@@ -128,7 +128,7 @@ public class SupportUnitCaptain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int fortOwner = npc.getFort().getOwnerClan() == null ? 0 : npc.getFort().getOwnerClan().getId();
 		if ((player.getClan() == null) || (player.getClanId() != fortOwner))
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
index f6d1e74529..a733b87dad 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
@@ -53,7 +53,7 @@ public class SymbolMaker extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
index f9cd32a0dd..82ec9274c2 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
@@ -94,7 +94,7 @@ public class TeleportToUndergroundColiseum extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.endsWith(".htm"))
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
index dbe26ae6a3..7052b10367 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
@@ -75,7 +75,7 @@ public class TersisHerald extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("giveBuff"))
 		{
@@ -87,7 +87,7 @@ public class TersisHerald extends AbstractNpcAI
 			npc.setTarget(player);
 			npc.doCast(DRAGON_BUFF.getSkill());
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java
index 3c46f755ca..c2f0970ccc 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java
@@ -58,7 +58,7 @@ public class TrainingCamp extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (!Config.TRAINING_CAMP_ENABLE || !checkConditions(player))
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
index 8e94950d76..520a057481 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
@@ -62,7 +62,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = "";
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
index 9924fb4ace..0a6b873028 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
@@ -85,7 +85,7 @@ public class ClassTransferTalk extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/WarriorFishingBlock.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
index 56b29fee5b..78e3d1c99e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
@@ -75,7 +75,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -104,7 +104,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
index b9439eb0ec..a1878b037b 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
@@ -156,7 +156,7 @@ public class WeaverOlf extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.contains("_grade_"))
 		{
@@ -185,7 +185,7 @@ public class WeaverOlf extends AbstractNpcAI
 			}
 			else
 			{
-				return super.onAdvEvent(event, npc, player);
+				return super.onEvent(event, npc, player);
 			}
 			
 			if (hasQuestItems(player, itemIds[0]))
@@ -225,7 +225,7 @@ public class WeaverOlf extends AbstractNpcAI
 			{
 				return npc.getId() + "-no.htm";
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		return event;
 	}
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index 777998cde4..48bf41ab6d 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -210,7 +210,7 @@ public class WyvernManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
index 0c2e7586c9..c49be5297b 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
@@ -36,7 +36,7 @@ public class DelevelManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.DELEVEL_MANAGER_ENABLED)
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
index 5eaddb78ba..76b7f1e559 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
@@ -54,7 +54,7 @@ public class FactionSystem extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class FactionSystem extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
index 8b9c676ad5..771c8a9058 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
@@ -34,7 +34,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -77,7 +77,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 				npc.broadcastInfo(); // update flag status
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
index e6fdc75e16..7423521604 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
@@ -70,7 +70,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("AUTOBUFF") && (npc != null) && !npc.isDead())
 		{
@@ -98,7 +98,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
 			}
 			startQuestTimer("AUTOBUFF", 30000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
index f19aa0cb6f..447c512987 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
@@ -39,7 +39,7 @@ public class NoblessMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.NOBLESS_MASTER_ENABLED)
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
index 370e9a1ced..3488295c5a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
@@ -163,7 +163,7 @@ public class Deathmatch extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
index 1eb84eca93..b92bbe7f77 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
@@ -213,7 +213,7 @@ public class Rabbits extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/events/Race/Race.java
index ff9fc462f6..6ac325ca6f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/events/Race/Race.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/events/Race/Race.java
@@ -320,7 +320,7 @@ public class Race extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 68f87b19cb..e38ed4d256 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -182,7 +182,7 @@ public class TvT extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
index 77c055cc79..84a2d7763d 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
@@ -45,7 +45,7 @@ public class BirthOfDraco extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
index 9bc0ff9c55..87ac868dc7 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
@@ -64,7 +64,7 @@ public class CharacterBirthday extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("despawn_npc"))
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index a966bdff3e..4648d78f95 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -56,7 +56,7 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
index a8f534ca97..76c5aa611f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
@@ -73,7 +73,7 @@ public class FreyaCelebration extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("give_potion"))
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
index b45e872a60..2570ef061a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
@@ -86,7 +86,7 @@ public class GiftOfVitality extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
index aa5419e179..76aaa4ab09 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
@@ -59,7 +59,7 @@ public class HeavyMedal extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		int level = checkLevel(player);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/HungryHorse/HungryHorse.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
index 5232662a42..44000b61a0 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
@@ -60,7 +60,7 @@ public class HungryHorse extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
index 6107af7f71..502fce9a30 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
@@ -55,7 +55,7 @@ public class HuntForSanta extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/LetterCollector/LetterCollector.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
index 744b1f2ae4..d87bd82b02 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
@@ -123,7 +123,7 @@ public class LetterCollector extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
index b71176a555..a42e986ee4 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
@@ -49,7 +49,7 @@ public class LoveYourGatekeeper extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
index c868fad2b3..6460eb4ab0 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
@@ -61,7 +61,7 @@ public class LoversJubilee extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmtext = event;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
index dd6b8696a7..b73bce80f1 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
@@ -68,7 +68,7 @@ public class MasterOfEnchanting extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("buy_staff"))
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/RedLibra/RedLibra.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/RedLibra/RedLibra.java
index 69414f20c6..693f2efd18 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/RedLibra/RedLibra.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/RedLibra/RedLibra.java
@@ -42,7 +42,7 @@ public class RedLibra extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
index f6c714eddc..7d3462224b 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
@@ -58,7 +58,7 @@ public class RudolphsBlessing extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("rudolph_eat") && (player != null) && player.isOnline())
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
index 3f076fc92b..17ff961002 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
@@ -297,7 +297,7 @@ public class SavingSanta extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!isEventPeriod())
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
index 5c00677d25..862a8df578 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
@@ -51,7 +51,7 @@ public class ThePowerOfLove extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
index 53e011000c..e87126ed19 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
@@ -129,7 +129,7 @@ public class AltarOfShilen extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (event.equals("enterInstance"))
@@ -265,7 +265,7 @@ public class AltarOfShilen extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
index 4fcc21b412..56b8393b3a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
@@ -154,7 +154,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -269,7 +269,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
index d804da8ba1..1d83951eff 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
@@ -467,7 +467,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
index 1100b43aee..80911f4423 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
@@ -72,7 +72,7 @@ public class ChamberOfProphecies extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
index 4f0f2f7a19..b815b5bae7 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
@@ -177,7 +177,7 @@ public class ChamberOfDelusion extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CommandPost/CommandPost.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CommandPost/CommandPost.java
index 23da57e021..4a68caa376 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CommandPost/CommandPost.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CommandPost/CommandPost.java
@@ -105,7 +105,7 @@ public class CommandPost extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
index ff860c70bb..c8bed455cc 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
@@ -114,13 +114,13 @@ public class CrystalCavernsCoralGarden extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
index 6db8525e11..46f3d2fdf6 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
@@ -79,13 +79,13 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
index c51b5d7887..121e3a89f4 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
@@ -135,13 +135,13 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
index 72d2fe0f6f..58eec2329b 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
@@ -122,7 +122,7 @@ public class DarkCloudMansion extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
index 605b8ebdf8..981a91d4a7 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
@@ -53,13 +53,13 @@ public class DimensionalArchon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), getRandomEntry(ARCHON_MSG)));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
index 176ee5b803..9243451cde 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
@@ -53,7 +53,7 @@ public class DimensionalTrap extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || npc.isAlikeDead())
 		{
@@ -102,7 +102,7 @@ public class DimensionalTrap extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
index 4da8316b88..5b922b7ecd 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
@@ -115,7 +115,7 @@ public class DimensionalWrap extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
index 8211e90098..4d937103a7 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
@@ -45,7 +45,7 @@ public class EvasHiddenSpace extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = player.getQuestState(Q10369_NoblesseSoulTesting.class.getSimpleName());
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
index 98e2ac0c8b..a40e7e3c88 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
@@ -195,12 +195,12 @@ public class EvilIncubator extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player);
 		if ((st == null) || !st.isStarted())
 		{
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java
index d0098998c9..429e0ddd64 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java
@@ -69,7 +69,7 @@ public class FaeronTrainingGrounds1 extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(Q10735_ASpecialPower.class.getSimpleName());
 		String htmltext = null;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java
index 299468b58f..485d2168fc 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java
@@ -68,7 +68,7 @@ public class FaeronTrainingGrounds2 extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(Q10736_ASpecialPower.class.getSimpleName());
 		String htmltext = null;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
index 6d58bd6eb4..1477e297c5 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
@@ -59,7 +59,7 @@ public class FortressOfTheDead extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/Fortuna/Fortuna.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/Fortuna/Fortuna.java
index 339328eea4..ef7b65659f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/Fortuna/Fortuna.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/Fortuna/Fortuna.java
@@ -51,7 +51,7 @@ public class Fortuna extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -472,7 +472,7 @@ public class Fortuna extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
index ef73cf3920..a205145189 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
@@ -119,7 +119,7 @@ public class HarnakUndergroundRuins extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
index 598a7460c7..c7180064eb 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
@@ -642,7 +642,7 @@ public class Kamaloka extends AbstractInstance
 	 * Handles only player's enter, single parameter - integer kamaloka index
 	 */
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java
index 7a8f1aa4b3..ef3b1ae1ba 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java
@@ -48,7 +48,7 @@ public class KaraphonHabitat extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(Q10745_TheSecretIngredients.class.getSimpleName());
 		if (qs != null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
index cccdf5d51f..4db13d5b98 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
@@ -195,7 +195,7 @@ public class KartiasLabyrinth extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -268,7 +268,7 @@ public class KartiasLabyrinth extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java
index db91907f42..59668140ab 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java
@@ -95,7 +95,7 @@ public class LabyrinthOfBelis extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter_instance"))
 		{
@@ -209,7 +209,7 @@ public class LabyrinthOfBelis extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java
index 0284ac988f..7f88562bc4 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java
@@ -61,7 +61,7 @@ public class MithrilMine extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -108,7 +108,7 @@ public class MithrilMine extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java
index 7e442c2e87..c9cbdda483 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java
@@ -105,7 +105,7 @@ public class MuseumDungeon extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter_instance"))
 		{
@@ -166,7 +166,7 @@ public class MuseumDungeon extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
index f83f2fcec1..024065f4e9 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
@@ -83,7 +83,7 @@ public class MysticTavern extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
index 48ee563ff5..56d62a42d1 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
@@ -81,7 +81,7 @@ public class StoryOfFreya extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance world = npc.getInstanceWorld();
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
index e21d937eb6..d1d82fe8d7 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
@@ -107,7 +107,7 @@ public class StoryOfTauti extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		switch (event)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
index 150d8f3496..acd2b4b1f7 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
@@ -67,7 +67,7 @@ public class NightmareKamaloka extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -132,7 +132,7 @@ public class NightmareKamaloka extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
index 68ff2fba1b..d91167b4bb 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
@@ -93,7 +93,7 @@ public class NornilsGarden extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (isInInstance(world))
@@ -157,7 +157,7 @@ public class NornilsGarden extends AbstractInstance
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/Nursery/Nursery.java
index 2e394a7446..9042632611 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/Nursery/Nursery.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/Nursery/Nursery.java
@@ -192,7 +192,7 @@ public class Nursery extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance instance = npc.getInstanceWorld();
 		if (isInInstance(instance))
@@ -269,7 +269,7 @@ public class Nursery extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
index 8ddaa9cd0f..f78f43a9dc 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
@@ -101,7 +101,7 @@ public class PailakaDevilsLegacy extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter"))
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java
index b9b2064a77..07fcb7c67b 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java
@@ -139,7 +139,7 @@ public class PailakaInjuredDragon extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = player.getQuestState(Q00144_PailakaInjuredDragon.class.getSimpleName());
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
index 5f1d771719..64f2155310 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
@@ -105,7 +105,7 @@ public class PailakaRuneCastle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
index 00fb1c9096..7b25c61e9d 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
@@ -63,7 +63,7 @@ public class PailakaSongOfIceAndFire extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -102,7 +102,7 @@ public class PailakaSongOfIceAndFire extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
index 422cbc96a0..48039ff29e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
@@ -173,7 +173,7 @@ public class PrisonOfDarkness extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -313,7 +313,7 @@ public class PrisonOfDarkness extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java
index c72d9b8646..da8c6e785c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java
@@ -162,7 +162,7 @@ public class SSQDisciplesNecropolisPast extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = player.getInstanceWorld();
 		if (world != null)
@@ -264,7 +264,7 @@ public class SSQDisciplesNecropolisPast extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java
index be0450dd2e..b4d398e7d9 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java
@@ -63,7 +63,7 @@ public class SSQLibraryOfSages extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = player.getInstanceWorld();
 		if (world != null)
@@ -103,7 +103,7 @@ public class SSQLibraryOfSages extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java
index e378631253..4b2f28016a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java
@@ -126,7 +126,7 @@ public class SSQMonasteryOfSilence extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = player.getInstanceWorld();
 		if (world != null)
@@ -218,7 +218,7 @@ public class SSQMonasteryOfSilence extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/SSQSanctumOftheLordsOfDawn/SSQSanctumOftheLordsOfDawn.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/SSQSanctumOftheLordsOfDawn/SSQSanctumOftheLordsOfDawn.java
index 9a84142109..863594e558 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/SSQSanctumOftheLordsOfDawn/SSQSanctumOftheLordsOfDawn.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/SSQSanctumOftheLordsOfDawn/SSQSanctumOftheLordsOfDawn.java
@@ -89,7 +89,7 @@ public class SSQSanctumOftheLordsOfDawn extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -126,7 +126,7 @@ public class SSQSanctumOftheLordsOfDawn extends AbstractInstance
 				player.teleToLocation(SAVE_POINT[npc.getScriptValue()]);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java
index dfb00caae2..d5bece244e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java
@@ -196,13 +196,13 @@ public class TaintedDimension extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java
index b0f641adfe..1c74f89fdf 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java
@@ -60,7 +60,7 @@ public class TalkingIslandPast extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -74,7 +74,7 @@ public class TalkingIslandPast extends AbstractInstance
 				teleportPlayerOut(player, world);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
index e4f0fea409..0aa8f7b0be 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
@@ -46,7 +46,7 @@ public class Q00013_ParcelDelivery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
index a9332344fe..5772a2064d 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
@@ -44,7 +44,7 @@ public class Q00015_SweetWhispers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
index d825925804..37d92fabd2 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
@@ -53,7 +53,7 @@ public class Q00016_TheComingDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
index 4a1a62c19a..0e0ef5512d 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
@@ -52,7 +52,7 @@ public class Q00017_LightAndDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
index c8de373b1f..cb246e0b70 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
@@ -47,7 +47,7 @@ public class Q00019_GoToThePastureland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
index 8467c0a18f..b161006570 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
@@ -44,7 +44,7 @@ public class Q00020_BringUpWithLove extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java
index 40d607557b..c52ab50412 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java
@@ -52,7 +52,7 @@ public class Q00026_TiredOfWaiting extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
index c1ede03985..b885fa960d 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
@@ -56,7 +56,7 @@ public class Q00031_SecretBuriedInTheSwamp extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
index ab85113705..02fd7814dd 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
@@ -64,7 +64,7 @@ public class Q00032_AnObviousLie extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
index cff62495f3..7916e5fd79 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
@@ -53,7 +53,7 @@ public class Q00033_MakeAPairOfDressShoes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
index 629f0d440a..4ba35fa397 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
@@ -61,7 +61,7 @@ public class Q00034_InSearchOfCloth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
index 99bc974ff4..4f3318567f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
@@ -57,7 +57,7 @@ public class Q00035_FindGlitteringJewelry extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
index 9757c1e50d..77215c5860 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
@@ -53,7 +53,7 @@ public class Q00036_MakeASewingKit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
index 97d846f2a9..92b800016c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
@@ -54,7 +54,7 @@ public class Q00037_MakeFormalWear extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java
index bf248d2979..3f960fd905 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java
@@ -62,7 +62,7 @@ public class Q00038_DragonFangs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00039_RedEyedInvaders/Q00039_RedEyedInvaders.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00039_RedEyedInvaders/Q00039_RedEyedInvaders.java
index 4fad38ca19..98d9ae9315 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00039_RedEyedInvaders/Q00039_RedEyedInvaders.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00039_RedEyedInvaders/Q00039_RedEyedInvaders.java
@@ -59,7 +59,7 @@ public class Q00039_RedEyedInvaders extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
index 163aa23813..66e186b0f6 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
@@ -50,7 +50,7 @@ public class Q00040_ASpecialOrder extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
index 100213b849..fe31a6ab4e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
@@ -54,7 +54,7 @@ public class Q00042_HelpTheUncle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
index 9d5f9265df..a5d1225fca 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
@@ -60,7 +60,7 @@ public class Q00043_HelpTheSister extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
index 7cc6c0f337..a13197fc21 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
@@ -55,7 +55,7 @@ public class Q00044_HelpTheSon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java
index 40f94bc778..f5e2c90ed0 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java
@@ -43,7 +43,7 @@ public class Q00061_LawEnforcement extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
index 497ede1a1b..2f336b06fd 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
@@ -44,7 +44,7 @@ public class Q00109_InSearchOfTheNest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
index 15340bee9a..14c25c7237 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
@@ -43,7 +43,7 @@ public class Q00110_ToThePrimevalIsle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java
index 107f5789b6..f03064394b 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java
@@ -85,7 +85,7 @@ public class Q00111_ElrokianHuntersProof extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java
index b80c49a7fd..01a4539f57 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java
@@ -44,7 +44,7 @@ public class Q00113_StatusOfTheBeaconTower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java
index dd0bca4999..a85cbbfc9c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java
@@ -64,7 +64,7 @@ public class Q00114_ResurrectionOfAnOldManager extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
index 61b544f2f0..6d23e5039b 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
@@ -54,7 +54,7 @@ public class Q00115_TheOtherSideOfTruth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00117_TheOceanOfDistantStars/Q00117_TheOceanOfDistantStars.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00117_TheOceanOfDistantStars/Q00117_TheOceanOfDistantStars.java
index 32b638a0ea..d73c7abc26 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00117_TheOceanOfDistantStars/Q00117_TheOceanOfDistantStars.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00117_TheOceanOfDistantStars/Q00117_TheOceanOfDistantStars.java
@@ -62,7 +62,7 @@ public class Q00117_TheOceanOfDistantStars extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
index 720f90157c..7701c4bef7 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
@@ -44,7 +44,7 @@ public class Q00119_LastImperialPrince extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00120_PavelsLastResearch/Q00120_PavelsLastResearch.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00120_PavelsLastResearch/Q00120_PavelsLastResearch.java
index bfe1ca1acc..a3291bdafd 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00120_PavelsLastResearch/Q00120_PavelsLastResearch.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00120_PavelsLastResearch/Q00120_PavelsLastResearch.java
@@ -64,12 +64,12 @@ public class Q00120_PavelsLastResearch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
 		{
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		String html = null;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java
index af7e42a40e..bedeae5ab3 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java
@@ -40,7 +40,7 @@ public class Q00121_PavelTheGiant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java
index 29f3ef94b5..be0c05d5b7 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java
@@ -43,7 +43,7 @@ public class Q00122_OminousNews extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
index 84e03ee2a4..cdaa5c33f0 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
@@ -46,7 +46,7 @@ public class Q00124_MeetingTheElroki extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
index 0f59ea74d7..34b0e7404d 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
@@ -77,7 +77,7 @@ public class Q00125_TheNameOfEvil1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
index c880bfcd78..2cdaa0aa91 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
@@ -55,7 +55,7 @@ public class Q00126_TheNameOfEvil2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
index d24519b130..60e67abdd0 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
@@ -82,7 +82,7 @@ public class Q00128_PailakaSongOfIceAndFire extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java
index 8afec644ae..f60ce01f79 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java
@@ -68,7 +68,7 @@ public class Q00129_PailakaDevilsLegacy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
index 3b340ac633..7d7eeb1bf5 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
@@ -72,7 +72,7 @@ public class Q00134_TempleMissionary extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
index b16e0481cc..c9771f6f78 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
@@ -70,7 +70,7 @@ public class Q00135_TempleExecutor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
index 62a45e847c..7e8051404a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
@@ -82,7 +82,7 @@ public class Q00136_MoreThanMeetsTheEye extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
index ffd1206433..f9ecfc2056 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
@@ -56,7 +56,7 @@ public class Q00137_TempleChampionPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
index 25dc2dc925..6a75d8880b 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
@@ -58,7 +58,7 @@ public class Q00138_TempleChampionPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
index df1521d00e..ff220cfb81 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
@@ -59,7 +59,7 @@ public class Q00139_ShadowFoxPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
index 2a37d17413..a168e639b0 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
@@ -68,7 +68,7 @@ public class Q00140_ShadowFoxPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
index c9b1f579f9..0df4d73fda 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
@@ -63,7 +63,7 @@ public class Q00141_ShadowFoxPart3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player, false);
 		if (st == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
index 0c1af718d5..78fb0e0b32 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
@@ -73,7 +73,7 @@ public class Q00142_FallenAngelRequestOfDawn extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
index 78a954764d..9d44b1bc42 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
@@ -52,7 +52,7 @@ public class Q00143_FallenAngelRequestOfDusk extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java
index 8f024cd03b..686696b998 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java
@@ -99,7 +99,7 @@ public class Q00144_PailakaInjuredDragon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java
index e22a0075dd..856ecd88b0 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java
@@ -53,7 +53,7 @@ public class Q00146_TheZeroHour extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java
index f197dee99a..44145d4eed 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java
@@ -50,7 +50,7 @@ public class Q00149_PrimalMotherIstina extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java
index 04ab71a2eb..2d50cdf25e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java
@@ -49,7 +49,7 @@ public class Q00150_ExtremeChallengePrimalMotherResurrected extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
index 422fe286e6..c0deea86c9 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
@@ -76,7 +76,7 @@ public class Q00177_SplitDestiny extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00180_InfernalFlamesBurningInCrystalPrison/Q00180_InfernalFlamesBurningInCrystalPrison.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00180_InfernalFlamesBurningInCrystalPrison/Q00180_InfernalFlamesBurningInCrystalPrison.java
index 3aadc906fe..7a005c6b00 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00180_InfernalFlamesBurningInCrystalPrison/Q00180_InfernalFlamesBurningInCrystalPrison.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00180_InfernalFlamesBurningInCrystalPrison/Q00180_InfernalFlamesBurningInCrystalPrison.java
@@ -53,7 +53,7 @@ public class Q00180_InfernalFlamesBurningInCrystalPrison extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java
index a325fcb987..d44207205c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java
@@ -54,7 +54,7 @@ public class Q00181_DevilsStrikeBackAdventOfBalok extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java
index 2c9337e950..cf6321781b 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java
@@ -47,7 +47,7 @@ public class Q00183_RelicExploration extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java
index 56fa89ac7f..416ef1fbd8 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java
@@ -54,7 +54,7 @@ public class Q00184_ArtOfPersuasion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java
index f98dd20667..5a3e22a29c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java
@@ -54,7 +54,7 @@ public class Q00185_NikolasCooperation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java
index e02899fc82..bc04a591e4 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java
@@ -68,7 +68,7 @@ public class Q00186_ContractExecution extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java
index 9c540f6338..a2460cb6c8 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java
@@ -49,7 +49,7 @@ public class Q00187_NikolasHeart extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java
index 1c1777caec..47b0cf65fc 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java
@@ -52,7 +52,7 @@ public class Q00188_SealRemoval extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java
index 5af9afe0fd..68da52d09c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java
@@ -49,7 +49,7 @@ public class Q00189_ContractCompletion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java
index 898d20eee3..45237f5fde 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java
@@ -46,7 +46,7 @@ public class Q00190_LostDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java
index ebc1748aa6..5fcd0f8944 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java
@@ -49,7 +49,7 @@ public class Q00191_VainConclusion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java
index 07c28bdb93..88b7048a5f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java
@@ -52,7 +52,7 @@ public class Q00192_SevenSignsSeriesOfDoubt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
index f81be2e67f..78a292d3d9 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
@@ -66,7 +66,7 @@ public class Q00193_SevenSignsDyingMessage extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == SHILENS_EVIL_THOUGHTS) && "despawn".equals(event))
 		{
@@ -76,7 +76,7 @@ public class Q00193_SevenSignsDyingMessage extends Quest
 				npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.NEXT_TIME_YOU_WILL_NOT_ESCAPE);
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
index 63ec681f3e..1420f8b7af 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
@@ -63,7 +63,7 @@ public class Q00194_SevenSignsMammonsContract extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java
index 4c400a55b1..122ede966b 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java
@@ -62,7 +62,7 @@ public class Q00195_SevenSignsSecretRitualOfThePriests extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java
index 5320deacab..129c02898e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java
@@ -60,14 +60,14 @@ public class Q00196_SevenSignsSealOfTheEmperor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == MERCHANT_OF_MAMMON) && "DESPAWN".equals(event))
 		{
 			isBusy = false;
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THE_ANCIENT_PROMISE_TO_THE_EMPEROR_HAS_BEEN_FULFILLED);
 			npc.deleteMe();
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
index 5dab25e1e5..092819fee0 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
@@ -62,7 +62,7 @@ public class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == SHILENS_EVIL_THOUGHTS) && "despawn".equals(event))
 		{
@@ -72,7 +72,7 @@ public class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
 				npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.NEXT_TIME_YOU_WILL_NOT_ESCAPE);
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
index c026781542..c1400b2fe9 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
@@ -65,7 +65,7 @@ public class Q00198_SevenSignsEmbryo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == SHILENS_EVIL_THOUGHTS) && "despawn".equals(event))
 		{
@@ -75,7 +75,7 @@ public class Q00198_SevenSignsEmbryo extends Quest
 				npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.NEXT_TIME_YOU_WILL_NOT_ESCAPE);
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java
index aaf98cd2ae..3495505fb2 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java
@@ -47,7 +47,7 @@ public class Q00210_ObtainAWolfPet extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java
index d0ea67a785..87a060a1c1 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java
@@ -56,7 +56,7 @@ public class Q00237_WindsOfChange extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java
index 31a6cd6c0f..006525cd6f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java
@@ -58,7 +58,7 @@ public class Q00238_SuccessFailureOfBusiness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java
index 1318b53727..e31a6f3e4f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java
@@ -58,7 +58,7 @@ public class Q00239_WontYouJoinUs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
index b8e21a687e..631714d268 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
@@ -65,7 +65,7 @@ public class Q00240_ImTheOnlyOneYouCanTrust extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java
index cef8901dd4..aec784b926 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java
@@ -77,7 +77,7 @@ public class Q00245_ComeToMe extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player.isMentor() && event.equals("30847-13.html"))
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java
index d563a46c8c..282ad1a84b 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java
@@ -135,7 +135,7 @@ public class Q00254_LegendaryTales extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java
index 5ff293f59c..69d9549a06 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java
@@ -61,7 +61,7 @@ public class Q00270_TheOneWhoEndsSilence extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java
index 74b891182a..812619fff6 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java
@@ -50,7 +50,7 @@ public class Q00278_HomeSecurity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00298_LizardmensConspiracy/Q00298_LizardmensConspiracy.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00298_LizardmensConspiracy/Q00298_LizardmensConspiracy.java
index e120a0e6c5..22b91e083a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00298_LizardmensConspiracy/Q00298_LizardmensConspiracy.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00298_LizardmensConspiracy/Q00298_LizardmensConspiracy.java
@@ -64,7 +64,7 @@ public class Q00298_LizardmensConspiracy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java
index 7041a462b2..7194fb9afd 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java
@@ -56,7 +56,7 @@ public class Q00307_ControlDeviceOfTheGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
index 0680c8e1ac..8002b57df8 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
@@ -73,7 +73,7 @@ public class Q00310_OnlyWhatRemains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java
index 4a131a976e..8abaacd4ac 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java
@@ -264,7 +264,7 @@ public class Q00336_CoinsOfMagic extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
index 0d07218c43..75053b1f0a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
@@ -113,7 +113,7 @@ public class Q00337_AudienceWithTheLandDragon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
index c8a74d6b71..0bbbc76a1c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
@@ -87,7 +87,7 @@ public class Q00344_1000YearsTheEndOfLamentation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/Q00359_ForASleeplessDeadman.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/Q00359_ForASleeplessDeadman.java
index 288b4479db..08014f2e38 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/Q00359_ForASleeplessDeadman.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/Q00359_ForASleeplessDeadman.java
@@ -71,7 +71,7 @@ public class Q00359_ForASleeplessDeadman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java
index 83367dcfbc..b25cd98ed0 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java
@@ -85,7 +85,7 @@ public class Q00371_ShrieksOfGhosts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java
index 898da5400e..34b3f425ca 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java
@@ -153,7 +153,7 @@ public class Q00373_SupplierOfReagents extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java
index 749eba8a07..86885d704c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java
@@ -63,7 +63,7 @@ public class Q00376_ExplorationOfTheGiantsCavePart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java
index 3a52057d9a..5e4237d3d1 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java
@@ -66,7 +66,7 @@ public class Q00377_ExplorationOfTheGiantsCavePart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java
index c3e1ccf97e..a1a64e3167 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java
@@ -55,7 +55,7 @@ public class Q00381_LetsBecomeARoyalMember extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00382_KailsMagicCoin/Q00382_KailsMagicCoin.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00382_KailsMagicCoin/Q00382_KailsMagicCoin.java
index a0bcce3bb7..61ce390c1a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00382_KailsMagicCoin/Q00382_KailsMagicCoin.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00382_KailsMagicCoin/Q00382_KailsMagicCoin.java
@@ -66,7 +66,7 @@ public class Q00382_KailsMagicCoin extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
index a25f98dcb7..d0c8bd1115 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
@@ -124,7 +124,7 @@ public class Q00386_StolenDignity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (npc.getId() == WAREHOUSE_KEEPER_ROMP))
@@ -259,7 +259,7 @@ public class Q00386_StolenDignity extends Quest
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private String takeHtml(Player player, QuestState qs, int num)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
index e17419a71e..447c1a9bc0 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
@@ -127,7 +127,7 @@ public class Q00420_LittleWing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
index 6390601ce2..14cbad6537 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
@@ -86,7 +86,7 @@ public class Q00421_LittleWingsBigAdventure extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java
index f405e8e276..b7d17445ed 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java
@@ -54,7 +54,7 @@ public class Q00431_WeddingMarch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java
index 7bef93d4f1..6e57baac6c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java
@@ -50,7 +50,7 @@ public class Q00432_BirthdayPartySong extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
index 47fc9d7da4..ee9504f119 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
@@ -54,7 +54,7 @@ public class Q00450_GraveRobberRescue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
index 47e03b544f..e38e415a0a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
@@ -61,7 +61,7 @@ public class Q00451_LuciensAltar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
index 946e2fb51d..be55660c3e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
@@ -50,7 +50,7 @@ public class Q00452_FindingtheLostSoldiers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
index 76ba1205f5..18e37daee3 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
@@ -174,7 +174,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java
index 507820dc6a..0fd000078b 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java
@@ -63,7 +63,7 @@ public class Q00454_CompletelyLost extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
index 6daf2a37e3..f67b20750b 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
@@ -91,7 +91,7 @@ public class Q00455_WingsOfSand extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
index 10f2f47f73..cabd56f883 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
@@ -230,7 +230,7 @@ public class Q00456_DontKnowDontCare extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java
index 524655a0ae..3aa766a77b 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java
@@ -65,7 +65,7 @@ public class Q00457_LostAndFound extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java
index 05ac4029e1..baf20da08a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java
@@ -83,7 +83,7 @@ public class Q00458_PerfectForm extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String noQuest = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00459_TheVillainOfTheUndergroundMineTeredor/Q00459_TheVillainOfTheUndergroundMineTeredor.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00459_TheVillainOfTheUndergroundMineTeredor/Q00459_TheVillainOfTheUndergroundMineTeredor.java
index bcec6a35af..0cf6ea0dcb 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00459_TheVillainOfTheUndergroundMineTeredor/Q00459_TheVillainOfTheUndergroundMineTeredor.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00459_TheVillainOfTheUndergroundMineTeredor/Q00459_TheVillainOfTheUndergroundMineTeredor.java
@@ -51,7 +51,7 @@ public class Q00459_TheVillainOfTheUndergroundMineTeredor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00460_PreciousResearchMaterial/Q00460_PreciousResearchMaterial.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00460_PreciousResearchMaterial/Q00460_PreciousResearchMaterial.java
index fb020c3040..981ff3c14e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00460_PreciousResearchMaterial/Q00460_PreciousResearchMaterial.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00460_PreciousResearchMaterial/Q00460_PreciousResearchMaterial.java
@@ -52,7 +52,7 @@ public class Q00460_PreciousResearchMaterial extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java
index bdda5c0ff1..2092e40879 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java
@@ -71,7 +71,7 @@ public class Q00462_StuffedAncientHeroes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java
index b7018cf82c..5b24a44f30 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java
@@ -110,7 +110,7 @@ public class Q00463_IMustBeaGenius extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java
index f7dbd2b655..4b978752e6 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java
@@ -87,7 +87,7 @@ public class Q00464_Oath extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00465_WeAreFriends/Q00465_WeAreFriends.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00465_WeAreFriends/Q00465_WeAreFriends.java
index 52d86f67f3..af30a59f5d 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00465_WeAreFriends/Q00465_WeAreFriends.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00465_WeAreFriends/Q00465_WeAreFriends.java
@@ -51,7 +51,7 @@ public class Q00465_WeAreFriends extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java
index c350641b85..3eb4b71954 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java
@@ -83,7 +83,7 @@ public class Q00466_PlacingMySmallPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00468_BeLostInTheMysteriousScent/Q00468_BeLostInTheMysteriousScent.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00468_BeLostInTheMysteriousScent/Q00468_BeLostInTheMysteriousScent.java
index d880c919e2..5b347e1276 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00468_BeLostInTheMysteriousScent/Q00468_BeLostInTheMysteriousScent.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00468_BeLostInTheMysteriousScent/Q00468_BeLostInTheMysteriousScent.java
@@ -53,7 +53,7 @@ public class Q00468_BeLostInTheMysteriousScent extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00469_SuspiciousGardener/Q00469_SuspiciousGardener.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00469_SuspiciousGardener/Q00469_SuspiciousGardener.java
index 77e00cc205..c739186b4d 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00469_SuspiciousGardener/Q00469_SuspiciousGardener.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00469_SuspiciousGardener/Q00469_SuspiciousGardener.java
@@ -52,7 +52,7 @@ public class Q00469_SuspiciousGardener extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00470_DivinityProtector/Q00470_DivinityProtector.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00470_DivinityProtector/Q00470_DivinityProtector.java
index 73c7cefac0..4948dcf1ee 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00470_DivinityProtector/Q00470_DivinityProtector.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00470_DivinityProtector/Q00470_DivinityProtector.java
@@ -72,7 +72,7 @@ public class Q00470_DivinityProtector extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00471_BreakingThroughTheEmeraldSquare/Q00471_BreakingThroughTheEmeraldSquare.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00471_BreakingThroughTheEmeraldSquare/Q00471_BreakingThroughTheEmeraldSquare.java
index 78f677a640..c563bbad31 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00471_BreakingThroughTheEmeraldSquare/Q00471_BreakingThroughTheEmeraldSquare.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00471_BreakingThroughTheEmeraldSquare/Q00471_BreakingThroughTheEmeraldSquare.java
@@ -50,7 +50,7 @@ public class Q00471_BreakingThroughTheEmeraldSquare extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00472_ChallengeSteamCorridor/Q00472_ChallengeSteamCorridor.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00472_ChallengeSteamCorridor/Q00472_ChallengeSteamCorridor.java
index 69f96d292c..0d36fed463 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00472_ChallengeSteamCorridor/Q00472_ChallengeSteamCorridor.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00472_ChallengeSteamCorridor/Q00472_ChallengeSteamCorridor.java
@@ -50,7 +50,7 @@ public class Q00472_ChallengeSteamCorridor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00473_InTheCoralGarden/Q00473_InTheCoralGarden.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00473_InTheCoralGarden/Q00473_InTheCoralGarden.java
index 3331b4528f..7489bd9a3f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00473_InTheCoralGarden/Q00473_InTheCoralGarden.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00473_InTheCoralGarden/Q00473_InTheCoralGarden.java
@@ -50,7 +50,7 @@ public class Q00473_InTheCoralGarden extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00474_WaitingForTheSummer/Q00474_WaitingForTheSummer.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00474_WaitingForTheSummer/Q00474_WaitingForTheSummer.java
index 51691cc5ff..7d5a64da50 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00474_WaitingForTheSummer/Q00474_WaitingForTheSummer.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00474_WaitingForTheSummer/Q00474_WaitingForTheSummer.java
@@ -59,7 +59,7 @@ public class Q00474_WaitingForTheSummer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java
index 3890d7cd62..d98e0f6ace 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java
@@ -79,7 +79,7 @@ public class Q00476_PlainMission extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00481_ShadowHelper/Q00481_ShadowHelper.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00481_ShadowHelper/Q00481_ShadowHelper.java
index adedcb6f7f..5aa50bf5bd 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00481_ShadowHelper/Q00481_ShadowHelper.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00481_ShadowHelper/Q00481_ShadowHelper.java
@@ -75,7 +75,7 @@ public class Q00481_ShadowHelper extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00482_RecertificationOfValue/Q00482_RecertificationOfValue.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00482_RecertificationOfValue/Q00482_RecertificationOfValue.java
index 62d524dfd3..35d3fa4406 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00482_RecertificationOfValue/Q00482_RecertificationOfValue.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00482_RecertificationOfValue/Q00482_RecertificationOfValue.java
@@ -131,7 +131,7 @@ public class Q00482_RecertificationOfValue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java
index e15e32b144..c10c564ffb 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java
@@ -68,7 +68,7 @@ public class Q00483_IntendedTactic extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00485_HotSpringWater/Q00485_HotSpringWater.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00485_HotSpringWater/Q00485_HotSpringWater.java
index a35badf96b..6b75b6753e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00485_HotSpringWater/Q00485_HotSpringWater.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00485_HotSpringWater/Q00485_HotSpringWater.java
@@ -62,7 +62,7 @@ public class Q00485_HotSpringWater extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00488_WondersOfCaring/Q00488_WondersOfCaring.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00488_WondersOfCaring/Q00488_WondersOfCaring.java
index a310d9ea60..7f6097ddf1 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00488_WondersOfCaring/Q00488_WondersOfCaring.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00488_WondersOfCaring/Q00488_WondersOfCaring.java
@@ -61,7 +61,7 @@ public class Q00488_WondersOfCaring extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00489_InThisQuietPlace/Q00489_InThisQuietPlace.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00489_InThisQuietPlace/Q00489_InThisQuietPlace.java
index 6da9fd75c7..12cf169210 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00489_InThisQuietPlace/Q00489_InThisQuietPlace.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00489_InThisQuietPlace/Q00489_InThisQuietPlace.java
@@ -58,7 +58,7 @@ public class Q00489_InThisQuietPlace extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java
index 4c6f1e68d7..19f3e9b8c6 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java
@@ -74,7 +74,7 @@ public class Q00490_DutyOfTheSurvivor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00491_InNominePatris/Q00491_InNominePatris.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00491_InNominePatris/Q00491_InNominePatris.java
index 3090a9cabe..915b628983 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00491_InNominePatris/Q00491_InNominePatris.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00491_InNominePatris/Q00491_InNominePatris.java
@@ -63,7 +63,7 @@ public class Q00491_InNominePatris extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00492_TombRaiders/Q00492_TombRaiders.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00492_TombRaiders/Q00492_TombRaiders.java
index e45ffa88ae..78553efafa 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00492_TombRaiders/Q00492_TombRaiders.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00492_TombRaiders/Q00492_TombRaiders.java
@@ -59,7 +59,7 @@ public class Q00492_TombRaiders extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java
index 0ccf941b24..9519660a54 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java
@@ -53,7 +53,7 @@ public class Q00493_KickingOutUnwelcomeGuests extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java
index 0f9eb53194..4084aa0142 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java
@@ -49,7 +49,7 @@ public class Q00494_IncarnationOfGreedZellakaGroup extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java
index ccf3cd1614..e3fe44aa0f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java
@@ -49,7 +49,7 @@ public class Q00495_IncarnationOfJealousyPellineGroup extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java
index 366e0d572d..94df5d6174 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java
@@ -49,7 +49,7 @@ public class Q00496_IncarnationOfGluttonyKaliosGroup extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java
index 008f69dd2f..d1580e694f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java
@@ -49,7 +49,7 @@ public class Q00497_IncarnationOfGreedZellakaSolo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java
index fe6d1060e8..9585452d7d 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java
@@ -49,7 +49,7 @@ public class Q00498_IncarnationOfJealousyPellineSolo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java
index 3023aa50c3..3c2e128522 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java
@@ -49,7 +49,7 @@ public class Q00499_IncarnationOfGluttonyKaliosSolo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
index fe55c5fcac..b93014bb39 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
@@ -69,7 +69,7 @@ public class Q00500_BrothersBoundInChains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java
index ffc938563f..9004f3f63d 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java
@@ -106,7 +106,7 @@ public class Q00501_ProofOfClanAlliance extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java
index 1496baa0e7..fa050bef5e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java
@@ -85,7 +85,7 @@ public class Q00503_PursuitOfClanAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
index 1badd9d119..840fe1eb90 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
@@ -74,7 +74,7 @@ public class Q00508_AClansReputation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
index 41dec6a58c..dbc9ddda44 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
@@ -68,7 +68,7 @@ public class Q00509_AClansFame extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
index 4a03ad47de..5a3658c28d 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
@@ -56,7 +56,7 @@ public class Q00510_AClansPrestige extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
index 8facc4a8cd..6476fcc9c3 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
@@ -71,7 +71,7 @@ public class Q00511_AwlUnderFoot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
index eab4647ba2..31444f8866 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
@@ -58,7 +58,7 @@ public class Q00512_BladeUnderFoot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
index 0348f88e9b..f97ce90a8e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
@@ -50,7 +50,7 @@ public class Q00551_OlympiadStarter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
index 1a59edd6b7..b06358dc78 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
@@ -50,7 +50,7 @@ public class Q00553_OlympiadUndefeated extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
index 295b613316..d362ed8b48 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
@@ -84,7 +84,7 @@ public class Q00617_GatherTheFlames extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
index 22d8a3f362..481380c065 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
@@ -65,7 +65,7 @@ public class Q00618_IntoTheFlame extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
index 24dc552a09..554a65b448 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
@@ -108,7 +108,7 @@ public class Q00620_FourGoblets extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = player.getQuestState(getName());
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
index effc3c81e3..e473202bfa 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
@@ -62,7 +62,7 @@ public class Q00621_EggDelivery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
index 8a857ca301..0aa311db9e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
@@ -62,7 +62,7 @@ public class Q00622_SpecialtyLiquorDelivery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
index a464df7f99..a0ed4ec2a8 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
@@ -66,7 +66,7 @@ public class Q00623_TheFinestFood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java
index 326d893b5a..50657405cf 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java
@@ -75,7 +75,7 @@ public class Q00626_ADarkTwilight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
index 335ef36527..882e4a1ad1 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
@@ -78,7 +78,7 @@ public class Q00627_HeartInSearchOfPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
index 79d69e4221..d4e6a5b7a8 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
@@ -88,7 +88,7 @@ public class Q00631_DeliciousTopChoiceMeat extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
index 6ab1e34b5a..f7548f5322 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
@@ -57,7 +57,7 @@ public class Q00641_AttackSailren extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
index 3ad4eb9269..f4030b7e1d 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
@@ -66,7 +66,7 @@ public class Q00642_APowerfulPrimevalCreature extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
index 41c5a83b2a..48d241ef82 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
@@ -103,7 +103,7 @@ public class Q00643_RiseAndFallOfTheElrokiTribe extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
index dec61c1331..ac5cb7ff52 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
@@ -59,7 +59,7 @@ public class Q00645_GhostsOfBatur extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java
index e9693f778b..f08be3dbfb 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java
@@ -80,7 +80,7 @@ public class Q00647_InfluxOfMachines extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
index 6f6013cac1..ff2f3a5bfe 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
@@ -99,7 +99,7 @@ public class Q00648_AnIceMerchantsDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		final QuestState q115 = player.getQuestState(Q00115_TheOtherSideOfTruth.class.getSimpleName());
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java
index b776b73a69..f34fd0f9fe 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java
@@ -61,7 +61,7 @@ public class Q00650_ABrokenDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java
index 8846fa0e4f..0fab46f486 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java
@@ -43,7 +43,7 @@ public class Q00652_AnAgedExAdventurer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
index e012de30f8..b36fd12f72 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
@@ -90,7 +90,7 @@ public class Q00662_AGameOfCards extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
index 3b05df07a2..51e520cc09 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
@@ -153,7 +153,7 @@ public class Q00663_SeductiveWhispers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
index 1dfdc81b32..e1e41ba51e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
@@ -49,7 +49,7 @@ public class Q00688_DefeatTheElrokianRaiders extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
index 0278e46ec2..17895d5c45 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
@@ -69,7 +69,7 @@ public class Q00726_LightWithinTheDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
index da19640964..bd744f7aaa 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
@@ -57,7 +57,7 @@ public class Q00727_HopeWithinTheDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java
index 9161bfd4b9..31eace47ba 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java
@@ -72,7 +72,7 @@ public class Q00751_LiberatingTheSpirits extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java
index 3c5f3d9861..e22b624bc5 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java
@@ -70,7 +70,7 @@ public class Q00752_UncoverTheSecret extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java
index 6f5853054b..935c3a7c37 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java
@@ -78,7 +78,7 @@ public class Q00753_ReactingToACrisis extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00754_AssistingTheRebelForces/Q00754_AssistingTheRebelForces.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00754_AssistingTheRebelForces/Q00754_AssistingTheRebelForces.java
index efd21fd055..fbbb9eb5c6 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00754_AssistingTheRebelForces/Q00754_AssistingTheRebelForces.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00754_AssistingTheRebelForces/Q00754_AssistingTheRebelForces.java
@@ -54,7 +54,7 @@ public class Q00754_AssistingTheRebelForces extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00755_InNeedOfPetras/Q00755_InNeedOfPetras.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00755_InNeedOfPetras/Q00755_InNeedOfPetras.java
index 20aa2199c8..09d9216654 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00755_InNeedOfPetras/Q00755_InNeedOfPetras.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00755_InNeedOfPetras/Q00755_InNeedOfPetras.java
@@ -67,7 +67,7 @@ public class Q00755_InNeedOfPetras extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java
index 40e84f4dd0..9038173a19 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java
@@ -48,7 +48,7 @@ public class Q00756_TopQualityPetra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java
index 1927ac253f..0b6815a166 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java
@@ -71,7 +71,7 @@ public class Q00757_TriolsMovement extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java
index 0578c5952a..c777c72641 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java
@@ -70,7 +70,7 @@ public class Q00758_TheFallenKingsMen extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00759_TheDwarvenNightmareContinues/Q00759_TheDwarvenNightmareContinues.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00759_TheDwarvenNightmareContinues/Q00759_TheDwarvenNightmareContinues.java
index e0db615674..4715b055c5 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00759_TheDwarvenNightmareContinues/Q00759_TheDwarvenNightmareContinues.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00759_TheDwarvenNightmareContinues/Q00759_TheDwarvenNightmareContinues.java
@@ -68,7 +68,7 @@ public class Q00759_TheDwarvenNightmareContinues extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java
index e163658293..33169c48a7 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java
@@ -47,7 +47,7 @@ public class Q00760_BlockTheExit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java
index bbe8918eef..42b3fd1c01 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java
@@ -87,7 +87,7 @@ public class Q00761_AssistingTheGoldenRamArmy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java
index 709817b6a5..ac13b91b3e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java
@@ -116,7 +116,7 @@ public class Q00762_AnOminousRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java
index ddad40b600..dd5413d73a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java
@@ -93,7 +93,7 @@ public class Q00763_ADauntingTask extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00764_WeakeningTheVarkaSilenosForces/Q00764_WeakeningTheVarkaSilenosForces.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00764_WeakeningTheVarkaSilenosForces/Q00764_WeakeningTheVarkaSilenosForces.java
index 5e10448397..fe404d0596 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00764_WeakeningTheVarkaSilenosForces/Q00764_WeakeningTheVarkaSilenosForces.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00764_WeakeningTheVarkaSilenosForces/Q00764_WeakeningTheVarkaSilenosForces.java
@@ -73,7 +73,7 @@ public class Q00764_WeakeningTheVarkaSilenosForces extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00765_WeakeningTheKetraOrcForces/Q00765_WeakeningTheKetraOrcForces.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00765_WeakeningTheKetraOrcForces/Q00765_WeakeningTheKetraOrcForces.java
index c700da56d0..84017857a4 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00765_WeakeningTheKetraOrcForces/Q00765_WeakeningTheKetraOrcForces.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00765_WeakeningTheKetraOrcForces/Q00765_WeakeningTheKetraOrcForces.java
@@ -73,7 +73,7 @@ public class Q00765_WeakeningTheKetraOrcForces extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00772_PurifyingSouls/Q00772_PurifyingSouls.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00772_PurifyingSouls/Q00772_PurifyingSouls.java
index e0ef1a907d..7da7d40be7 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00772_PurifyingSouls/Q00772_PurifyingSouls.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00772_PurifyingSouls/Q00772_PurifyingSouls.java
@@ -69,7 +69,7 @@ public class Q00772_PurifyingSouls extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java
index 1421423772..1c9feb9a4a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java
@@ -81,7 +81,7 @@ public class Q00775_RetrievingTheChaosFragment extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java
index ac2f54fa8d..18b9f67179 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java
@@ -49,7 +49,7 @@ public class Q00776_SlayDarkLordEkimus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java
index dad6a31213..ff385c026f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java
@@ -50,7 +50,7 @@ public class Q00777_SlayDarkLordTiat extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java
index c2266256c4..9cf140a913 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java
@@ -76,7 +76,7 @@ public class Q00778_OperationRoaringFlame extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00779_UtilizeTheDarknessSeedOfDestruction/Q00779_UtilizeTheDarknessSeedOfDestruction.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00779_UtilizeTheDarknessSeedOfDestruction/Q00779_UtilizeTheDarknessSeedOfDestruction.java
index 15fa0b1e53..c6fac96851 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00779_UtilizeTheDarknessSeedOfDestruction/Q00779_UtilizeTheDarknessSeedOfDestruction.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00779_UtilizeTheDarknessSeedOfDestruction/Q00779_UtilizeTheDarknessSeedOfDestruction.java
@@ -72,7 +72,7 @@ public class Q00779_UtilizeTheDarknessSeedOfDestruction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00780_UtilizeTheDarknessSeedOfInfinity/Q00780_UtilizeTheDarknessSeedOfInfinity.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00780_UtilizeTheDarknessSeedOfInfinity/Q00780_UtilizeTheDarknessSeedOfInfinity.java
index a71bdf61dc..3820918c63 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00780_UtilizeTheDarknessSeedOfInfinity/Q00780_UtilizeTheDarknessSeedOfInfinity.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00780_UtilizeTheDarknessSeedOfInfinity/Q00780_UtilizeTheDarknessSeedOfInfinity.java
@@ -61,7 +61,7 @@ public class Q00780_UtilizeTheDarknessSeedOfInfinity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00781_UtilizeTheDarknessSeedOfAnnihilation/Q00781_UtilizeTheDarknessSeedOfAnnihilation.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00781_UtilizeTheDarknessSeedOfAnnihilation/Q00781_UtilizeTheDarknessSeedOfAnnihilation.java
index 190b971f36..d662d9fc6d 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00781_UtilizeTheDarknessSeedOfAnnihilation/Q00781_UtilizeTheDarknessSeedOfAnnihilation.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00781_UtilizeTheDarknessSeedOfAnnihilation/Q00781_UtilizeTheDarknessSeedOfAnnihilation.java
@@ -78,7 +78,7 @@ public class Q00781_UtilizeTheDarknessSeedOfAnnihilation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00782_UtilizeTheDarknessSeedOfHellfire/Q00782_UtilizeTheDarknessSeedOfHellfire.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00782_UtilizeTheDarknessSeedOfHellfire/Q00782_UtilizeTheDarknessSeedOfHellfire.java
index 7feaaf443e..3b181f5417 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00782_UtilizeTheDarknessSeedOfHellfire/Q00782_UtilizeTheDarknessSeedOfHellfire.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00782_UtilizeTheDarknessSeedOfHellfire/Q00782_UtilizeTheDarknessSeedOfHellfire.java
@@ -79,7 +79,7 @@ public class Q00782_UtilizeTheDarknessSeedOfHellfire extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java
index 31988b5a71..90e06ede02 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java
@@ -67,7 +67,7 @@ public class Q00783_VestigeOfTheMagicPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00784_TheQuietKiller/Q00784_TheQuietKiller.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00784_TheQuietKiller/Q00784_TheQuietKiller.java
index aedc8da4cb..ab46f32466 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00784_TheQuietKiller/Q00784_TheQuietKiller.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00784_TheQuietKiller/Q00784_TheQuietKiller.java
@@ -70,7 +70,7 @@ public class Q00784_TheQuietKiller extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00785_ASuspiciousIngredient/Q00785_ASuspiciousIngredient.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00785_ASuspiciousIngredient/Q00785_ASuspiciousIngredient.java
index 036949a7aa..aad77c1617 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00785_ASuspiciousIngredient/Q00785_ASuspiciousIngredient.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00785_ASuspiciousIngredient/Q00785_ASuspiciousIngredient.java
@@ -82,7 +82,7 @@ public class Q00785_ASuspiciousIngredient extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00786_AwaitingTheVoiceOfTheGods/Q00786_AwaitingTheVoiceOfTheGods.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00786_AwaitingTheVoiceOfTheGods/Q00786_AwaitingTheVoiceOfTheGods.java
index 108b6b5efe..1ac648c4b4 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00786_AwaitingTheVoiceOfTheGods/Q00786_AwaitingTheVoiceOfTheGods.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00786_AwaitingTheVoiceOfTheGods/Q00786_AwaitingTheVoiceOfTheGods.java
@@ -74,7 +74,7 @@ public class Q00786_AwaitingTheVoiceOfTheGods extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java
index cbc8f95c2a..8c0a519de9 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java
@@ -78,7 +78,7 @@ public class Q00787_TheRoleOfAWatcher extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00789_WaitingForPaagrio/Q00789_WaitingForPaagrio.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00789_WaitingForPaagrio/Q00789_WaitingForPaagrio.java
index ab35b9c767..ea6997ed3a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00789_WaitingForPaagrio/Q00789_WaitingForPaagrio.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00789_WaitingForPaagrio/Q00789_WaitingForPaagrio.java
@@ -75,7 +75,7 @@ public final class Q00789_WaitingForPaagrio extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00790_ObtainingFerinsTrust/Q00790_ObtainingFerinsTrust.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00790_ObtainingFerinsTrust/Q00790_ObtainingFerinsTrust.java
index 77cd7ade02..2dd964610f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00790_ObtainingFerinsTrust/Q00790_ObtainingFerinsTrust.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00790_ObtainingFerinsTrust/Q00790_ObtainingFerinsTrust.java
@@ -71,7 +71,7 @@ public class Q00790_ObtainingFerinsTrust extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00816_PlansToRepairTheStronghold/Q00816_PlansToRepairTheStronghold.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00816_PlansToRepairTheStronghold/Q00816_PlansToRepairTheStronghold.java
index fb6f1666fd..8a6fdc1662 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00816_PlansToRepairTheStronghold/Q00816_PlansToRepairTheStronghold.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00816_PlansToRepairTheStronghold/Q00816_PlansToRepairTheStronghold.java
@@ -64,7 +64,7 @@ public class Q00816_PlansToRepairTheStronghold extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00817_BlackAteliaResearch/Q00817_BlackAteliaResearch.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00817_BlackAteliaResearch/Q00817_BlackAteliaResearch.java
index 7296ee314b..e4de6eff53 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00817_BlackAteliaResearch/Q00817_BlackAteliaResearch.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00817_BlackAteliaResearch/Q00817_BlackAteliaResearch.java
@@ -58,7 +58,7 @@ public class Q00817_BlackAteliaResearch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00823_DisappearedRaceNewFairy/Q00823_DisappearedRaceNewFairy.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00823_DisappearedRaceNewFairy/Q00823_DisappearedRaceNewFairy.java
index 42b81c1a80..65524b04d6 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00823_DisappearedRaceNewFairy/Q00823_DisappearedRaceNewFairy.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00823_DisappearedRaceNewFairy/Q00823_DisappearedRaceNewFairy.java
@@ -63,7 +63,7 @@ public class Q00823_DisappearedRaceNewFairy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00824_AttackTheCommandPost/Q00824_AttackTheCommandPost.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00824_AttackTheCommandPost/Q00824_AttackTheCommandPost.java
index db25590de0..c89f2abb8a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00824_AttackTheCommandPost/Q00824_AttackTheCommandPost.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00824_AttackTheCommandPost/Q00824_AttackTheCommandPost.java
@@ -51,7 +51,7 @@ public class Q00824_AttackTheCommandPost extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java
index 33c9979b4a..4f6a1dd284 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java
@@ -68,7 +68,7 @@ public class Q00826_InSearchOfTheSecretWeapon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java
index 8b7399c41e..739655c72f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java
@@ -89,7 +89,7 @@ public class Q00827_EinhasadsOrder extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00828_EvasBlessing/Q00828_EvasBlessing.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00828_EvasBlessing/Q00828_EvasBlessing.java
index 202e0fc3ca..72b34bd5f9 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00828_EvasBlessing/Q00828_EvasBlessing.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00828_EvasBlessing/Q00828_EvasBlessing.java
@@ -95,7 +95,7 @@ public class Q00828_EvasBlessing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00829_MaphrsSalvation/Q00829_MaphrsSalvation.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00829_MaphrsSalvation/Q00829_MaphrsSalvation.java
index 977c610974..457faaa28c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00829_MaphrsSalvation/Q00829_MaphrsSalvation.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00829_MaphrsSalvation/Q00829_MaphrsSalvation.java
@@ -54,7 +54,7 @@ public class Q00829_MaphrsSalvation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00830_TheWayOfTheGiantsPawn/Q00830_TheWayOfTheGiantsPawn.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00830_TheWayOfTheGiantsPawn/Q00830_TheWayOfTheGiantsPawn.java
index 1bac202074..64715ee4c7 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00830_TheWayOfTheGiantsPawn/Q00830_TheWayOfTheGiantsPawn.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00830_TheWayOfTheGiantsPawn/Q00830_TheWayOfTheGiantsPawn.java
@@ -89,7 +89,7 @@ public class Q00830_TheWayOfTheGiantsPawn extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java
index 9584d686bc..cb7bae51ab 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java
@@ -55,7 +55,7 @@ public class Q00831_SayhasScheme extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
index 755ff509f8..42c14d342e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
@@ -65,7 +65,7 @@ public class Q00833_DevilsTreasureTauti extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
index 6448125f2f..d2db3dae19 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
@@ -61,7 +61,7 @@ public class Q00835_PitiableMelisa extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
index 1140fc7490..2a6c62bb48 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
@@ -58,7 +58,7 @@ public class Q00901_HowLavasaurusesAreMade extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java
index b16bc679ac..d9d162c9f1 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java
@@ -77,7 +77,7 @@ public class Q00902_ReclaimOurEra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
index 36444e64ea..d5a5ab6b4c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
@@ -55,7 +55,7 @@ public class Q00903_TheCallOfAntharas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00904_DragonTrophyAntharas/Q00904_DragonTrophyAntharas.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00904_DragonTrophyAntharas/Q00904_DragonTrophyAntharas.java
index c635256fe0..3df27480bb 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00904_DragonTrophyAntharas/Q00904_DragonTrophyAntharas.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00904_DragonTrophyAntharas/Q00904_DragonTrophyAntharas.java
@@ -60,7 +60,7 @@ public class Q00904_DragonTrophyAntharas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
index 40d7efb2cc..51fff3997d 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
@@ -103,7 +103,7 @@ public class Q00905_RefinedDragonBlood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
index f2ad5396ea..5e11d70ca8 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
@@ -65,7 +65,7 @@ public class Q00906_TheCallOfValakas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java
index 50e65f2d21..d4737c9a91 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java
@@ -60,7 +60,7 @@ public class Q00907_DragonTrophyValakas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00943_FillingTheEnergyOfDestruction/Q00943_FillingTheEnergyOfDestruction.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00943_FillingTheEnergyOfDestruction/Q00943_FillingTheEnergyOfDestruction.java
index b8fba38e65..5889b73eae 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00943_FillingTheEnergyOfDestruction/Q00943_FillingTheEnergyOfDestruction.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00943_FillingTheEnergyOfDestruction/Q00943_FillingTheEnergyOfDestruction.java
@@ -73,7 +73,7 @@ public class Q00943_FillingTheEnergyOfDestruction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
index 2fbbe388b7..f5e61c063c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
@@ -54,7 +54,7 @@ public class Q10273_GoodDayToFly extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
index 92298a9598..c5cf9c1ed5 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
@@ -64,7 +64,7 @@ public class Q10274_CollectingInTheAir extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
index 80b9cdef66..f0eae3e565 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
@@ -60,7 +60,7 @@ public class Q10275_ContainingTheAttributePower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
index aea1e23329..adb2982ac1 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
@@ -48,7 +48,7 @@ public class Q10282_ToTheSeedOfAnnihilation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
index e5310632bd..dc9e9a1de4 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
@@ -51,7 +51,7 @@ public class Q10283_RequestOfIceMerchant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java
index c8822c8a8a..fb0cefa677 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java
@@ -54,7 +54,7 @@ public class Q10284_AcquisitionOfDivineSword extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
index a5a7eaace6..d0294d0369 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
@@ -55,7 +55,7 @@ public class Q10285_MeetingSirra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
index b9a00e8388..94f82457bd 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
@@ -56,7 +56,7 @@ public class Q10286_ReunionWithSirra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
index c072297d38..d98cd117bd 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
@@ -50,7 +50,7 @@ public class Q10287_StoryOfThoseLeft extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
index 6603c62c8f..88a4a9ebb4 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
@@ -48,7 +48,7 @@ public class Q10288_SecretMission extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java
index ebc3b15a3a..19e9c7f984 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java
@@ -48,7 +48,7 @@ public class Q10289_FadeToBlack extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
index 58aafa7832..8763b47647 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
@@ -54,7 +54,7 @@ public class Q10290_LandDragonConqueror extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
index ba1ee9eae4..7f62dc6645 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
@@ -52,7 +52,7 @@ public class Q10291_FireDragonDestroyer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
index 4a68875612..63cbf86f69 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
@@ -69,7 +69,7 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java
index 9578509dc1..f80fbdc02b 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java
@@ -57,7 +57,7 @@ public class Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java
index 72d0ca7ed5..0ddc585beb 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java
@@ -95,7 +95,7 @@ public class Q10294_SevenSignsToTheMonasteryOfSilence extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java
index 747a9b8e55..fff91fc378 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java
@@ -105,7 +105,7 @@ public class Q10295_SevenSignsSolinasTomb extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java
index e4cf9dbdf6..f350112a68 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java
@@ -60,7 +60,7 @@ public class Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java
index fbcd6311a7..990366217f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java
@@ -50,7 +50,7 @@ public class Q10297_GrandOpeningComeToOurPub extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java
index 5f07c99e9a..11d738f50b 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java
@@ -71,7 +71,7 @@ public class Q10301_ShadowOfTerrorBlackishRedFog extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10302_UnsettlingShadowAndRumors/Q10302_UnsettlingShadowAndRumors.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10302_UnsettlingShadowAndRumors/Q10302_UnsettlingShadowAndRumors.java
index 35634b2208..0ef255822a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10302_UnsettlingShadowAndRumors/Q10302_UnsettlingShadowAndRumors.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10302_UnsettlingShadowAndRumors/Q10302_UnsettlingShadowAndRumors.java
@@ -51,7 +51,7 @@ public class Q10302_UnsettlingShadowAndRumors extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java
index 075ada8600..77e10de1fd 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java
@@ -75,7 +75,7 @@ public class Q10303_CrossroadsBetweenLightAndDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java
index 2b1418f07c..81ad6d4996 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java
@@ -75,7 +75,7 @@ public class Q10304_ForForgottenHeroes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java
index 679a617f05..f1df52055e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java
@@ -53,7 +53,7 @@ public class Q10305_UnstoppableFutileEfforts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10306_TheCorruptedLeader/Q10306_TheCorruptedLeader.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10306_TheCorruptedLeader/Q10306_TheCorruptedLeader.java
index 6c34bbf0ec..e400458693 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10306_TheCorruptedLeader/Q10306_TheCorruptedLeader.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10306_TheCorruptedLeader/Q10306_TheCorruptedLeader.java
@@ -59,7 +59,7 @@ public class Q10306_TheCorruptedLeader extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java
index 836ba2610b..b557c0b277 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java
@@ -56,7 +56,7 @@ public class Q10307_TheCorruptedLeaderHisTruth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10310_TwistedCreationTree/Q10310_TwistedCreationTree.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10310_TwistedCreationTree/Q10310_TwistedCreationTree.java
index 9a5f3e93df..6eb9953cdc 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10310_TwistedCreationTree/Q10310_TwistedCreationTree.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10310_TwistedCreationTree/Q10310_TwistedCreationTree.java
@@ -56,7 +56,7 @@ public class Q10310_TwistedCreationTree extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java
index 9e2c35dd09..8971512507 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java
@@ -46,7 +46,7 @@ public class Q10311_PeacefulDaysAreOver extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java
index c7dc807cdf..40c76b9e2f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java
@@ -55,7 +55,7 @@ public class Q10312_AbandonedGodsCreature extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java
index 8f25603bcc..a17c3ebaf6 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java
@@ -49,7 +49,7 @@ public class Q10315_ToThePrisonOfDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java
index 9c05b1f86e..eed57ef8dc 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java
@@ -56,7 +56,7 @@ public class Q10316_UndecayingMemoryOfThePast extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java
index faa824d4eb..c28308b733 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java
@@ -44,7 +44,7 @@ public class Q10317_OrbisWitch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java
index b92fa5339e..d79519ea24 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java
@@ -68,7 +68,7 @@ public class Q10318_DecayingDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java
index d255cd6511..db013985a5 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java
@@ -60,7 +60,7 @@ public class Q10320_LetsGoToTheCentralSquare extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java
index a3dbb72cb9..80d7904685 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java
@@ -49,7 +49,7 @@ public class Q10321_QualificationsOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/Q10322_SearchingForTheMysteriousPower.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/Q10322_SearchingForTheMysteriousPower.java
index f119759a61..29df370feb 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/Q10322_SearchingForTheMysteriousPower.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/Q10322_SearchingForTheMysteriousPower.java
@@ -86,7 +86,7 @@ public class Q10322_SearchingForTheMysteriousPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/Q10323_TrainLikeItsReal.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/Q10323_TrainLikeItsReal.java
index 14eb605eb2..430904627f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/Q10323_TrainLikeItsReal.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/Q10323_TrainLikeItsReal.java
@@ -61,7 +61,7 @@ public class Q10323_TrainLikeItsReal extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/Q10324_FindingMagisterGallint.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/Q10324_FindingMagisterGallint.java
index 67d68d86c7..0036622855 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/Q10324_FindingMagisterGallint.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/Q10324_FindingMagisterGallint.java
@@ -47,7 +47,7 @@ public class Q10324_FindingMagisterGallint extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/Q10325_SearchingForNewPower.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/Q10325_SearchingForNewPower.java
index 980bfdb126..64ccbbb949 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/Q10325_SearchingForNewPower.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/Q10325_SearchingForNewPower.java
@@ -56,7 +56,7 @@ public class Q10325_SearchingForNewPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10326_RespectYourElders/Q10326_RespectYourElders.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10326_RespectYourElders/Q10326_RespectYourElders.java
index 38090b7545..af9d431814 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10326_RespectYourElders/Q10326_RespectYourElders.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10326_RespectYourElders/Q10326_RespectYourElders.java
@@ -68,7 +68,7 @@ public class Q10326_RespectYourElders extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/Q10327_IntruderWhoWantsTheBookOfGiants.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/Q10327_IntruderWhoWantsTheBookOfGiants.java
index ce7e3ae6ad..9e7d997f17 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/Q10327_IntruderWhoWantsTheBookOfGiants.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/Q10327_IntruderWhoWantsTheBookOfGiants.java
@@ -51,7 +51,7 @@ public class Q10327_IntruderWhoWantsTheBookOfGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10328_RequestToSealTheEvilFragment/Q10328_RequestToSealTheEvilFragment.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10328_RequestToSealTheEvilFragment/Q10328_RequestToSealTheEvilFragment.java
index 07763e049a..8ddb8c0d8c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10328_RequestToSealTheEvilFragment/Q10328_RequestToSealTheEvilFragment.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10328_RequestToSealTheEvilFragment/Q10328_RequestToSealTheEvilFragment.java
@@ -49,7 +49,7 @@ public class Q10328_RequestToSealTheEvilFragment extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10329_BackupSeekers/Q10329_BackupSeekers.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10329_BackupSeekers/Q10329_BackupSeekers.java
index 28f958e3fe..62810b5451 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10329_BackupSeekers/Q10329_BackupSeekers.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10329_BackupSeekers/Q10329_BackupSeekers.java
@@ -83,7 +83,7 @@ public class Q10329_BackupSeekers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java
index d87b14e791..c791f34718 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java
@@ -52,7 +52,7 @@ public class Q10330_ToTheRuinsOfYeSagira extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java
index afcf9d4622..8a5d9e447e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java
@@ -74,7 +74,7 @@ public class Q10331_StartOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10332_ToughRoad/Q10332_ToughRoad.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10332_ToughRoad/Q10332_ToughRoad.java
index 0ec104da2a..cafb348a86 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10332_ToughRoad/Q10332_ToughRoad.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10332_ToughRoad/Q10332_ToughRoad.java
@@ -57,7 +57,7 @@ public class Q10332_ToughRoad extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java
index 1f30d7ba2b..780273250e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java
@@ -65,7 +65,7 @@ public class Q10333_DisappearedSakum extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10334_ReportingTheStatusOfTheWindmillHill/Q10334_ReportingTheStatusOfTheWindmillHill.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10334_ReportingTheStatusOfTheWindmillHill/Q10334_ReportingTheStatusOfTheWindmillHill.java
index af92819fea..d6fa3cc296 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10334_ReportingTheStatusOfTheWindmillHill/Q10334_ReportingTheStatusOfTheWindmillHill.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10334_ReportingTheStatusOfTheWindmillHill/Q10334_ReportingTheStatusOfTheWindmillHill.java
@@ -49,7 +49,7 @@ public class Q10334_ReportingTheStatusOfTheWindmillHill extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java
index fd75a5574f..d0b51c1c17 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java
@@ -58,7 +58,7 @@ public class Q10335_RequestToFindSakum extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10336_DividedSakumKanilov/Q10336_DividedSakumKanilov.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10336_DividedSakumKanilov/Q10336_DividedSakumKanilov.java
index b0b1051d9f..8b0acf0de3 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10336_DividedSakumKanilov/Q10336_DividedSakumKanilov.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10336_DividedSakumKanilov/Q10336_DividedSakumKanilov.java
@@ -57,7 +57,7 @@ public class Q10336_DividedSakumKanilov extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java
index 8154285f16..4d3d655611 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java
@@ -58,7 +58,7 @@ public class Q10337_SakumsImpact extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
index edc0bdf638..b92033f3e6 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
@@ -66,7 +66,7 @@ public class Q10338_SeizeYourDestiny extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java
index a8277707fa..1d6eeab187 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java
@@ -66,7 +66,7 @@ public class Q10339_FightingTheForgotten extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java
index 9bb47bafb8..718b70bbcd 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java
@@ -48,7 +48,7 @@ public class Q10341_DayOfDestinyHumansFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10341_DayOfDestinyHumansFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java
index 715453f3bb..071deb3562 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java
@@ -48,7 +48,7 @@ public class Q10342_DayOfDestinyElvenFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10342_DayOfDestinyElvenFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java
index b958ae1683..5701012e2c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java
@@ -48,7 +48,7 @@ public class Q10343_DayOfDestinyDarkElfsFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10343_DayOfDestinyDarkElfsFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java
index 3a9540d6f0..ff5519a3f1 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java
@@ -48,7 +48,7 @@ public class Q10344_DayOfDestinyOrcsFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10344_DayOfDestinyOrcsFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java
index f0b38f0d8f..9ad485a695 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java
@@ -48,7 +48,7 @@ public class Q10345_DayOfDestinyDwarfsFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10345_DayOfDestinyDwarfsFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java
index 0f3195f574..5690e3622f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java
@@ -48,7 +48,7 @@ public class Q10346_DayOfDestinyKamaelsFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10346_DayOfDestinyKamaelsFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java
index 2874c31889..6a7bf0c265 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java
@@ -51,7 +51,7 @@ public class Q10351_OwnerOfHall extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java
index 1175e2cdd1..18cd204fc0 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java
@@ -94,7 +94,7 @@ public class Q10353_CertificationOfValue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java
index ea20f5fe52..c1723c3065 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java
@@ -51,7 +51,7 @@ public class Q10354_ResurrectedOwnerOfHall extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java
index 3a33d33da4..816efa29cd 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java
@@ -59,7 +59,7 @@ public class Q10358_DividedSakumPoslof extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10359_TracesOfEvil/Q10359_TracesOfEvil.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10359_TracesOfEvil/Q10359_TracesOfEvil.java
index e03bf7a6a2..f294b34dcb 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10359_TracesOfEvil/Q10359_TracesOfEvil.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10359_TracesOfEvil/Q10359_TracesOfEvil.java
@@ -69,7 +69,7 @@ public class Q10359_TracesOfEvil extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java
index 118dcc772c..6e00e7dec9 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java
@@ -83,7 +83,7 @@ public class Q10360_CertificationOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10361_RolesOfTheSeeker/Q10361_RolesOfTheSeeker.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10361_RolesOfTheSeeker/Q10361_RolesOfTheSeeker.java
index 4a359f1271..3274842be2 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10361_RolesOfTheSeeker/Q10361_RolesOfTheSeeker.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10361_RolesOfTheSeeker/Q10361_RolesOfTheSeeker.java
@@ -46,7 +46,7 @@ public class Q10361_RolesOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java
index b074359175..a96045b4a4 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java
@@ -60,7 +60,7 @@ public class Q10362_CertificationOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java
index c9063645d9..6f65769834 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java
@@ -70,7 +70,7 @@ public class Q10363_RequestOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java
index 0290c74bc2..e70159b207 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java
@@ -59,7 +59,7 @@ public class Q10364_ObligationsOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java
index 90233e009b..037eb3f7a3 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java
@@ -99,7 +99,7 @@ public class Q10365_SeekerEscort extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/Q10366_RuinsStatusUpdate.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/Q10366_RuinsStatusUpdate.java
index 7f659e666c..e3fc076ffe 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/Q10366_RuinsStatusUpdate.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/Q10366_RuinsStatusUpdate.java
@@ -55,7 +55,7 @@ public class Q10366_RuinsStatusUpdate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10368_RebellionOfMonsters/Q10368_RebellionOfMonsters.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10368_RebellionOfMonsters/Q10368_RebellionOfMonsters.java
index b9babf7571..c1ae7d8715 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10368_RebellionOfMonsters/Q10368_RebellionOfMonsters.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10368_RebellionOfMonsters/Q10368_RebellionOfMonsters.java
@@ -53,7 +53,7 @@ public class Q10368_RebellionOfMonsters extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10369_NoblesseSoulTesting/Q10369_NoblesseSoulTesting.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10369_NoblesseSoulTesting/Q10369_NoblesseSoulTesting.java
index 236fe0146e..511af97acc 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10369_NoblesseSoulTesting/Q10369_NoblesseSoulTesting.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10369_NoblesseSoulTesting/Q10369_NoblesseSoulTesting.java
@@ -122,11 +122,11 @@ public class Q10369_NoblesseSoulTesting extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player == null)
 		{
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
@@ -321,7 +321,7 @@ public class Q10369_NoblesseSoulTesting extends Quest
 									final Quest instance = QuestManager.getInstance().getQuest(EvasHiddenSpace.class.getSimpleName());
 									if (instance != null)
 									{
-										instance.onAdvEvent("enterInstance", npc, player);
+										instance.onEvent("enterInstance", npc, player);
 									}
 									htmltext = null;
 									break;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10370_MenacingTimes/Q10370_MenacingTimes.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10370_MenacingTimes/Q10370_MenacingTimes.java
index dc213da234..4763dba885 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10370_MenacingTimes/Q10370_MenacingTimes.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10370_MenacingTimes/Q10370_MenacingTimes.java
@@ -65,7 +65,7 @@ public class Q10370_MenacingTimes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10371_GraspThyPower/Q10371_GraspThyPower.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10371_GraspThyPower/Q10371_GraspThyPower.java
index a3a431ae90..f19d9a6240 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10371_GraspThyPower/Q10371_GraspThyPower.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10371_GraspThyPower/Q10371_GraspThyPower.java
@@ -61,7 +61,7 @@ public class Q10371_GraspThyPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10372_PurgatoryVolvere/Q10372_PurgatoryVolvere.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10372_PurgatoryVolvere/Q10372_PurgatoryVolvere.java
index 34e367af3f..73c9586552 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10372_PurgatoryVolvere/Q10372_PurgatoryVolvere.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10372_PurgatoryVolvere/Q10372_PurgatoryVolvere.java
@@ -58,7 +58,7 @@ public class Q10372_PurgatoryVolvere extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10374_ThatPlaceSuccubus/Q10374_ThatPlaceSuccubus.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10374_ThatPlaceSuccubus/Q10374_ThatPlaceSuccubus.java
index 8d91352295..44d4e50656 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10374_ThatPlaceSuccubus/Q10374_ThatPlaceSuccubus.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10374_ThatPlaceSuccubus/Q10374_ThatPlaceSuccubus.java
@@ -65,7 +65,7 @@ public class Q10374_ThatPlaceSuccubus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10375_SuccubusDisciples/Q10375_SuccubusDisciples.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10375_SuccubusDisciples/Q10375_SuccubusDisciples.java
index 2bbdfeff18..f14f026f93 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10375_SuccubusDisciples/Q10375_SuccubusDisciples.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10375_SuccubusDisciples/Q10375_SuccubusDisciples.java
@@ -64,7 +64,7 @@ public class Q10375_SuccubusDisciples extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java
index 965d1d06dd..8d6af4cb2d 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java
@@ -66,7 +66,7 @@ public class Q10376_BloodyGoodTime extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java
index 255a3ce354..6a38565c9f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java
@@ -59,7 +59,7 @@ public class Q10377_TheInvadedExecutionGrounds extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10378_WeedingWork/Q10378_WeedingWork.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10378_WeedingWork/Q10378_WeedingWork.java
index e55058d9a5..cc498e2821 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10378_WeedingWork/Q10378_WeedingWork.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10378_WeedingWork/Q10378_WeedingWork.java
@@ -57,7 +57,7 @@ public class Q10378_WeedingWork extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10379_AnUninvitedGuest/Q10379_AnUninvitedGuest.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10379_AnUninvitedGuest/Q10379_AnUninvitedGuest.java
index 8502410bee..e227de28c7 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10379_AnUninvitedGuest/Q10379_AnUninvitedGuest.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10379_AnUninvitedGuest/Q10379_AnUninvitedGuest.java
@@ -69,7 +69,7 @@ public class Q10379_AnUninvitedGuest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10380_TheExecutionersExecution/Q10380_TheExecutionersExecution.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10380_TheExecutionersExecution/Q10380_TheExecutionersExecution.java
index 7b59d40bcb..5b4910c43e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10380_TheExecutionersExecution/Q10380_TheExecutionersExecution.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10380_TheExecutionersExecution/Q10380_TheExecutionersExecution.java
@@ -67,7 +67,7 @@ public class Q10380_TheExecutionersExecution extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java
index 3fdb1d2625..1a0550ce7a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java
@@ -49,7 +49,7 @@ public class Q10381_ToTheSeedOfHellfire extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10382_DayOfLiberation/Q10382_DayOfLiberation.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10382_DayOfLiberation/Q10382_DayOfLiberation.java
index bd81dc237a..f0417eca8e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10382_DayOfLiberation/Q10382_DayOfLiberation.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10382_DayOfLiberation/Q10382_DayOfLiberation.java
@@ -48,7 +48,7 @@ public class Q10382_DayOfLiberation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java
index 2a535823ae..f818f19a58 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java
@@ -61,7 +61,7 @@ public class Q10383_FergasonsOffer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java
index ed9cb571ed..279d9baa06 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java
@@ -52,7 +52,7 @@ public class Q10384_AnAudienceWithTauti extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10385_RedThreadOfFate/Q10385_RedThreadOfFate.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10385_RedThreadOfFate/Q10385_RedThreadOfFate.java
index 31cfe72faa..e28f4d4bba 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10385_RedThreadOfFate/Q10385_RedThreadOfFate.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10385_RedThreadOfFate/Q10385_RedThreadOfFate.java
@@ -120,7 +120,7 @@ public class Q10385_RedThreadOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -755,7 +755,7 @@ public class Q10385_RedThreadOfFate extends Quest
 						final Quest instance = QuestManager.getInstance().getQuest(TalkingIslandPast.class.getSimpleName());
 						if (instance != null)
 						{
-							instance.onAdvEvent("enterInstance", npc, player);
+							instance.onEvent("enterInstance", npc, player);
 						}
 					}
 					break;
@@ -843,7 +843,7 @@ public class Q10385_RedThreadOfFate extends Quest
 							final Quest instance = QuestManager.getInstance().getQuest(TalkingIslandPast.class.getSimpleName());
 							if (instance != null)
 							{
-								instance.onAdvEvent("enterInstance", npc, player);
+								instance.onEvent("enterInstance", npc, player);
 							}
 							break;
 						}
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10386_MysteriousJourney/Q10386_MysteriousJourney.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10386_MysteriousJourney/Q10386_MysteriousJourney.java
index 6c704faa98..ef3cae06be 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10386_MysteriousJourney/Q10386_MysteriousJourney.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10386_MysteriousJourney/Q10386_MysteriousJourney.java
@@ -50,7 +50,7 @@ public class Q10386_MysteriousJourney extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10387_SoullessOne/Q10387_SoullessOne.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10387_SoullessOne/Q10387_SoullessOne.java
index f411d2f043..a602978f36 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10387_SoullessOne/Q10387_SoullessOne.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10387_SoullessOne/Q10387_SoullessOne.java
@@ -54,7 +54,7 @@ public class Q10387_SoullessOne extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java
index 174ea1a300..e5a8517a69 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java
@@ -46,7 +46,7 @@ public class Q10388_ConspiracyBehindDoor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java
index 6d60016a06..619cf89fa5 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java
@@ -66,7 +66,7 @@ public class Q10389_TheVoiceOfAuthority extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10390_KekropusLetter/Q10390_KekropusLetter.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10390_KekropusLetter/Q10390_KekropusLetter.java
index 5e59060743..501925f30e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10390_KekropusLetter/Q10390_KekropusLetter.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10390_KekropusLetter/Q10390_KekropusLetter.java
@@ -68,7 +68,7 @@ public class Q10390_KekropusLetter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10391_ASuspiciousHelper/Q10391_ASuspiciousHelper.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10391_ASuspiciousHelper/Q10391_ASuspiciousHelper.java
index 5c96feab38..915e3c1f84 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10391_ASuspiciousHelper/Q10391_ASuspiciousHelper.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10391_ASuspiciousHelper/Q10391_ASuspiciousHelper.java
@@ -52,7 +52,7 @@ public class Q10391_ASuspiciousHelper extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10392_FailureAndItsConsequences/Q10392_FailureAndItsConsequences.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10392_FailureAndItsConsequences/Q10392_FailureAndItsConsequences.java
index b228973062..b083f4154f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10392_FailureAndItsConsequences/Q10392_FailureAndItsConsequences.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10392_FailureAndItsConsequences/Q10392_FailureAndItsConsequences.java
@@ -60,7 +60,7 @@ public class Q10392_FailureAndItsConsequences extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10393_KekropusLetterAClueCompleted/Q10393_KekropusLetterAClueCompleted.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10393_KekropusLetterAClueCompleted/Q10393_KekropusLetterAClueCompleted.java
index 2333feba9a..5ad013083f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10393_KekropusLetterAClueCompleted/Q10393_KekropusLetterAClueCompleted.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10393_KekropusLetterAClueCompleted/Q10393_KekropusLetterAClueCompleted.java
@@ -59,7 +59,7 @@ public class Q10393_KekropusLetterAClueCompleted extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java
index 03cd8902d2..c7c76563db 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java
@@ -56,7 +56,7 @@ public class Q10394_MutualBenefit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java
index 11cba933b5..0dd1b301df 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java
@@ -65,7 +65,7 @@ public class Q10395_NotATraitor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10397_KekropusLetterASuspiciousBadge/Q10397_KekropusLetterASuspiciousBadge.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10397_KekropusLetterASuspiciousBadge/Q10397_KekropusLetterASuspiciousBadge.java
index 7af2523627..0f04ac68f7 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10397_KekropusLetterASuspiciousBadge/Q10397_KekropusLetterASuspiciousBadge.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10397_KekropusLetterASuspiciousBadge/Q10397_KekropusLetterASuspiciousBadge.java
@@ -59,7 +59,7 @@ public class Q10397_KekropusLetterASuspiciousBadge extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10398_ASuspiciousBadge/Q10398_ASuspiciousBadge.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10398_ASuspiciousBadge/Q10398_ASuspiciousBadge.java
index 9558f71ee8..5b67846fc7 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10398_ASuspiciousBadge/Q10398_ASuspiciousBadge.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10398_ASuspiciousBadge/Q10398_ASuspiciousBadge.java
@@ -60,7 +60,7 @@ public class Q10398_ASuspiciousBadge extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10399_TheAlphabetOfTheGiants/Q10399_TheAlphabetOfTheGiants.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10399_TheAlphabetOfTheGiants/Q10399_TheAlphabetOfTheGiants.java
index b8d0573c5e..30db3f6efe 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10399_TheAlphabetOfTheGiants/Q10399_TheAlphabetOfTheGiants.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10399_TheAlphabetOfTheGiants/Q10399_TheAlphabetOfTheGiants.java
@@ -58,7 +58,7 @@ public class Q10399_TheAlphabetOfTheGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10401_KekropusLetterDecodingTheBadge/Q10401_KekropusLetterDecodingTheBadge.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10401_KekropusLetterDecodingTheBadge/Q10401_KekropusLetterDecodingTheBadge.java
index 5920fad949..65887d6f03 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10401_KekropusLetterDecodingTheBadge/Q10401_KekropusLetterDecodingTheBadge.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10401_KekropusLetterDecodingTheBadge/Q10401_KekropusLetterDecodingTheBadge.java
@@ -59,7 +59,7 @@ public class Q10401_KekropusLetterDecodingTheBadge extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java
index 5e4d8b1482..4fd1ce9cab 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java
@@ -65,7 +65,7 @@ public class Q10402_NowhereToTurn extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10403_TheGuardianGiant/Q10403_TheGuardianGiant.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10403_TheGuardianGiant/Q10403_TheGuardianGiant.java
index 51b91a715d..72cf81d741 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10403_TheGuardianGiant/Q10403_TheGuardianGiant.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10403_TheGuardianGiant/Q10403_TheGuardianGiant.java
@@ -64,7 +64,7 @@ public class Q10403_TheGuardianGiant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10404_KekropusLetterAHiddenMeaning/Q10404_KekropusLetterAHiddenMeaning.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10404_KekropusLetterAHiddenMeaning/Q10404_KekropusLetterAHiddenMeaning.java
index b20d24d3cb..0d4cec46e4 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10404_KekropusLetterAHiddenMeaning/Q10404_KekropusLetterAHiddenMeaning.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10404_KekropusLetterAHiddenMeaning/Q10404_KekropusLetterAHiddenMeaning.java
@@ -59,7 +59,7 @@ public class Q10404_KekropusLetterAHiddenMeaning extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10405_KartiasSeed/Q10405_KartiasSeed.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10405_KartiasSeed/Q10405_KartiasSeed.java
index db6aedfb48..4d8063a514 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10405_KartiasSeed/Q10405_KartiasSeed.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10405_KartiasSeed/Q10405_KartiasSeed.java
@@ -67,7 +67,7 @@ public class Q10405_KartiasSeed extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java
index c8889e1fe1..78fb20d20a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java
@@ -57,7 +57,7 @@ public class Q10406_BeforeDarknessBearsFruit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10408_KekropusLetterTheSwampOfScreams/Q10408_KekropusLetterTheSwampOfScreams.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10408_KekropusLetterTheSwampOfScreams/Q10408_KekropusLetterTheSwampOfScreams.java
index 6e6ff67975..59d6ea191d 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10408_KekropusLetterTheSwampOfScreams/Q10408_KekropusLetterTheSwampOfScreams.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10408_KekropusLetterTheSwampOfScreams/Q10408_KekropusLetterTheSwampOfScreams.java
@@ -59,7 +59,7 @@ public class Q10408_KekropusLetterTheSwampOfScreams extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java
index 2098f70548..5b4eced23f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java
@@ -50,7 +50,7 @@ public class Q10409_ASuspiciousVagabondInTheSwamp extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java
index 9ab8e09794..361f62720b 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java
@@ -75,7 +75,7 @@ public class Q10410_EmbryoInTheSwampOfScreams extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10411_KekropusLetterTheForestOfTheDead/Q10411_KekropusLetterTheForestOfTheDead.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10411_KekropusLetterTheForestOfTheDead/Q10411_KekropusLetterTheForestOfTheDead.java
index 97b3c6b112..82bba6e8b3 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10411_KekropusLetterTheForestOfTheDead/Q10411_KekropusLetterTheForestOfTheDead.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10411_KekropusLetterTheForestOfTheDead/Q10411_KekropusLetterTheForestOfTheDead.java
@@ -59,7 +59,7 @@ public class Q10411_KekropusLetterTheForestOfTheDead extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java
index e81dd514b7..ae77b686d0 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java
@@ -50,7 +50,7 @@ public class Q10412_ASuspiciousVagabondInTheForest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java
index 981177a544..bfe5518086 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java
@@ -104,7 +104,7 @@ public class Q10413_EmbryoInTheForestOfTheDead extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10414_KekropusLetterWithCourage/Q10414_KekropusLetterWithCourage.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10414_KekropusLetterWithCourage/Q10414_KekropusLetterWithCourage.java
index 9ccfbd816a..d7087994d4 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10414_KekropusLetterWithCourage/Q10414_KekropusLetterWithCourage.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10414_KekropusLetterWithCourage/Q10414_KekropusLetterWithCourage.java
@@ -59,7 +59,7 @@ public class Q10414_KekropusLetterWithCourage extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10415_KekropusLetterWithWisdom/Q10415_KekropusLetterWithWisdom.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10415_KekropusLetterWithWisdom/Q10415_KekropusLetterWithWisdom.java
index 75e5d02fcd..9c59892974 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10415_KekropusLetterWithWisdom/Q10415_KekropusLetterWithWisdom.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10415_KekropusLetterWithWisdom/Q10415_KekropusLetterWithWisdom.java
@@ -60,7 +60,7 @@ public class Q10415_KekropusLetterWithWisdom extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java
index 4861df0eb2..96e7a785ae 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java
@@ -48,7 +48,7 @@ public class Q10416_InSearchOfTheEyeOfArgos extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java
index 420cdd5236..fbd6b69cb2 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java
@@ -53,7 +53,7 @@ public class Q10417_DaimonTheWhiteEyed extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10419_KekropusLetterKampfsWhereabouts/Q10419_KekropusLetterKampfsWhereabouts.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10419_KekropusLetterKampfsWhereabouts/Q10419_KekropusLetterKampfsWhereabouts.java
index 6549b92bf6..6475a8bb53 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10419_KekropusLetterKampfsWhereabouts/Q10419_KekropusLetterKampfsWhereabouts.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10419_KekropusLetterKampfsWhereabouts/Q10419_KekropusLetterKampfsWhereabouts.java
@@ -59,7 +59,7 @@ public class Q10419_KekropusLetterKampfsWhereabouts extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10420_TheVarkaSilenosSupporters/Q10420_TheVarkaSilenosSupporters.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10420_TheVarkaSilenosSupporters/Q10420_TheVarkaSilenosSupporters.java
index 698897c1c3..839f6f03d5 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10420_TheVarkaSilenosSupporters/Q10420_TheVarkaSilenosSupporters.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10420_TheVarkaSilenosSupporters/Q10420_TheVarkaSilenosSupporters.java
@@ -77,7 +77,7 @@ public class Q10420_TheVarkaSilenosSupporters extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10421_AssassinationOfTheVarkaSilenosCommander/Q10421_AssassinationOfTheVarkaSilenosCommander.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10421_AssassinationOfTheVarkaSilenosCommander/Q10421_AssassinationOfTheVarkaSilenosCommander.java
index 8b7feff241..c7629b3637 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10421_AssassinationOfTheVarkaSilenosCommander/Q10421_AssassinationOfTheVarkaSilenosCommander.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10421_AssassinationOfTheVarkaSilenosCommander/Q10421_AssassinationOfTheVarkaSilenosCommander.java
@@ -53,7 +53,7 @@ public class Q10421_AssassinationOfTheVarkaSilenosCommander extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java
index 7c9b29ca62..e4f5a2f5b7 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java
@@ -57,7 +57,7 @@ public class Q10422_AssassinationOfTheVarkaSilenosChief extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10424_KekropusLetterBelosWhereabouts/Q10424_KekropusLetterBelosWhereabouts.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10424_KekropusLetterBelosWhereabouts/Q10424_KekropusLetterBelosWhereabouts.java
index deb3c13012..6d21d04d40 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10424_KekropusLetterBelosWhereabouts/Q10424_KekropusLetterBelosWhereabouts.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10424_KekropusLetterBelosWhereabouts/Q10424_KekropusLetterBelosWhereabouts.java
@@ -59,7 +59,7 @@ public class Q10424_KekropusLetterBelosWhereabouts extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10425_TheKetraOrcSupporters/Q10425_TheKetraOrcSupporters.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10425_TheKetraOrcSupporters/Q10425_TheKetraOrcSupporters.java
index d7fc88c94c..39fc075b58 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10425_TheKetraOrcSupporters/Q10425_TheKetraOrcSupporters.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10425_TheKetraOrcSupporters/Q10425_TheKetraOrcSupporters.java
@@ -80,7 +80,7 @@ public class Q10425_TheKetraOrcSupporters extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10426_AssassinationOfTheKetraOrcCommander/Q10426_AssassinationOfTheKetraOrcCommander.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10426_AssassinationOfTheKetraOrcCommander/Q10426_AssassinationOfTheKetraOrcCommander.java
index e5b518988d..231e2242c2 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10426_AssassinationOfTheKetraOrcCommander/Q10426_AssassinationOfTheKetraOrcCommander.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10426_AssassinationOfTheKetraOrcCommander/Q10426_AssassinationOfTheKetraOrcCommander.java
@@ -55,7 +55,7 @@ public class Q10426_AssassinationOfTheKetraOrcCommander extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java
index 70922047ea..d277aca298 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java
@@ -57,7 +57,7 @@ public class Q10427_AssassinationOfTheKetraOrcChief extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10430_KekropusLetterTrackingTheEvil/Q10430_KekropusLetterTrackingTheEvil.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10430_KekropusLetterTrackingTheEvil/Q10430_KekropusLetterTrackingTheEvil.java
index 33a07f181d..d43771aea0 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10430_KekropusLetterTrackingTheEvil/Q10430_KekropusLetterTrackingTheEvil.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10430_KekropusLetterTrackingTheEvil/Q10430_KekropusLetterTrackingTheEvil.java
@@ -62,7 +62,7 @@ public class Q10430_KekropusLetterTrackingTheEvil extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10431_TheSealOfPunishmentDenOfEvil/Q10431_TheSealOfPunishmentDenOfEvil.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10431_TheSealOfPunishmentDenOfEvil/Q10431_TheSealOfPunishmentDenOfEvil.java
index 43d578d9ec..8c351470ba 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10431_TheSealOfPunishmentDenOfEvil/Q10431_TheSealOfPunishmentDenOfEvil.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10431_TheSealOfPunishmentDenOfEvil/Q10431_TheSealOfPunishmentDenOfEvil.java
@@ -67,7 +67,7 @@ public class Q10431_TheSealOfPunishmentDenOfEvil extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10432_ChasingVarangka/Q10432_ChasingVarangka.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10432_ChasingVarangka/Q10432_ChasingVarangka.java
index 6806985ecb..ce4a70d010 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10432_ChasingVarangka/Q10432_ChasingVarangka.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10432_ChasingVarangka/Q10432_ChasingVarangka.java
@@ -56,7 +56,7 @@ public class Q10432_ChasingVarangka extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10433_KekropusLetterRegardingASeal/Q10433_KekropusLetterRegardingASeal.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10433_KekropusLetterRegardingASeal/Q10433_KekropusLetterRegardingASeal.java
index e2a9dfba50..586db27a1e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10433_KekropusLetterRegardingASeal/Q10433_KekropusLetterRegardingASeal.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10433_KekropusLetterRegardingASeal/Q10433_KekropusLetterRegardingASeal.java
@@ -61,7 +61,7 @@ public class Q10433_KekropusLetterRegardingASeal extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10434_TheSealOfPunishmentSelMahumTrainingGrounds/Q10434_TheSealOfPunishmentSelMahumTrainingGrounds.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10434_TheSealOfPunishmentSelMahumTrainingGrounds/Q10434_TheSealOfPunishmentSelMahumTrainingGrounds.java
index 1ae56447b7..10e416c8e9 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10434_TheSealOfPunishmentSelMahumTrainingGrounds/Q10434_TheSealOfPunishmentSelMahumTrainingGrounds.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10434_TheSealOfPunishmentSelMahumTrainingGrounds/Q10434_TheSealOfPunishmentSelMahumTrainingGrounds.java
@@ -72,7 +72,7 @@ public class Q10434_TheSealOfPunishmentSelMahumTrainingGrounds extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10435_ChasingKeltron/Q10435_ChasingKeltron.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10435_ChasingKeltron/Q10435_ChasingKeltron.java
index abb4e76ece..d35f571f3f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10435_ChasingKeltron/Q10435_ChasingKeltron.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10435_ChasingKeltron/Q10435_ChasingKeltron.java
@@ -54,7 +54,7 @@ public class Q10435_ChasingKeltron extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10436_KekropusLetterTheSealOfPunishment/Q10436_KekropusLetterTheSealOfPunishment.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10436_KekropusLetterTheSealOfPunishment/Q10436_KekropusLetterTheSealOfPunishment.java
index 8a1a07e9aa..bbc276da63 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10436_KekropusLetterTheSealOfPunishment/Q10436_KekropusLetterTheSealOfPunishment.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10436_KekropusLetterTheSealOfPunishment/Q10436_KekropusLetterTheSealOfPunishment.java
@@ -61,7 +61,7 @@ public class Q10436_KekropusLetterTheSealOfPunishment extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10437_TheSealOfPunishmentPlainsOfTheLizardmen/Q10437_TheSealOfPunishmentPlainsOfTheLizardmen.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10437_TheSealOfPunishmentPlainsOfTheLizardmen/Q10437_TheSealOfPunishmentPlainsOfTheLizardmen.java
index 9776b90066..32874e15c9 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10437_TheSealOfPunishmentPlainsOfTheLizardmen/Q10437_TheSealOfPunishmentPlainsOfTheLizardmen.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10437_TheSealOfPunishmentPlainsOfTheLizardmen/Q10437_TheSealOfPunishmentPlainsOfTheLizardmen.java
@@ -64,7 +64,7 @@ public class Q10437_TheSealOfPunishmentPlainsOfTheLizardmen extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10438_ChasingLoygen/Q10438_ChasingLoygen.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10438_ChasingLoygen/Q10438_ChasingLoygen.java
index ec65ae6c14..73196c30d9 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10438_ChasingLoygen/Q10438_ChasingLoygen.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10438_ChasingLoygen/Q10438_ChasingLoygen.java
@@ -54,7 +54,7 @@ public class Q10438_ChasingLoygen extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10439_KekropusLetterTheOriginsOfARumor/Q10439_KekropusLetterTheOriginsOfARumor.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10439_KekropusLetterTheOriginsOfARumor/Q10439_KekropusLetterTheOriginsOfARumor.java
index 568549de98..8485ccd0d0 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10439_KekropusLetterTheOriginsOfARumor/Q10439_KekropusLetterTheOriginsOfARumor.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10439_KekropusLetterTheOriginsOfARumor/Q10439_KekropusLetterTheOriginsOfARumor.java
@@ -64,7 +64,7 @@ public class Q10439_KekropusLetterTheOriginsOfARumor extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10440_TheSealOfPunishmentTheFields/Q10440_TheSealOfPunishmentTheFields.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10440_TheSealOfPunishmentTheFields/Q10440_TheSealOfPunishmentTheFields.java
index 69ae9d48d8..0e67f792e2 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10440_TheSealOfPunishmentTheFields/Q10440_TheSealOfPunishmentTheFields.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10440_TheSealOfPunishmentTheFields/Q10440_TheSealOfPunishmentTheFields.java
@@ -63,7 +63,7 @@ public class Q10440_TheSealOfPunishmentTheFields extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10441_ChasingMeccadan/Q10441_ChasingMeccadan.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10441_ChasingMeccadan/Q10441_ChasingMeccadan.java
index 50ac964978..159e919eb2 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10441_ChasingMeccadan/Q10441_ChasingMeccadan.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10441_ChasingMeccadan/Q10441_ChasingMeccadan.java
@@ -58,7 +58,7 @@ public class Q10441_ChasingMeccadan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10442_TheAnnihilatedPlains1/Q10442_TheAnnihilatedPlains1.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10442_TheAnnihilatedPlains1/Q10442_TheAnnihilatedPlains1.java
index 5d9569f1bc..cfa2532708 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10442_TheAnnihilatedPlains1/Q10442_TheAnnihilatedPlains1.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10442_TheAnnihilatedPlains1/Q10442_TheAnnihilatedPlains1.java
@@ -43,7 +43,7 @@ public class Q10442_TheAnnihilatedPlains1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10443_TheAnnihilatedPlains2/Q10443_TheAnnihilatedPlains2.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10443_TheAnnihilatedPlains2/Q10443_TheAnnihilatedPlains2.java
index a17b25f237..4a8eacfbf6 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10443_TheAnnihilatedPlains2/Q10443_TheAnnihilatedPlains2.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10443_TheAnnihilatedPlains2/Q10443_TheAnnihilatedPlains2.java
@@ -52,7 +52,7 @@ public class Q10443_TheAnnihilatedPlains2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10444_TheOriginOfMonsters/Q10444_TheOriginOfMonsters.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10444_TheOriginOfMonsters/Q10444_TheOriginOfMonsters.java
index ad98ec175b..e52d6f6c4f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10444_TheOriginOfMonsters/Q10444_TheOriginOfMonsters.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10444_TheOriginOfMonsters/Q10444_TheOriginOfMonsters.java
@@ -57,7 +57,7 @@ public class Q10444_TheOriginOfMonsters extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10445_AnImpendingThreat/Q10445_AnImpendingThreat.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10445_AnImpendingThreat/Q10445_AnImpendingThreat.java
index c78d904936..dac215a5b1 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10445_AnImpendingThreat/Q10445_AnImpendingThreat.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10445_AnImpendingThreat/Q10445_AnImpendingThreat.java
@@ -53,7 +53,7 @@ public class Q10445_AnImpendingThreat extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java
index bb70f87faa..4649f7548e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java
@@ -58,7 +58,7 @@ public class Q10446_HitAndRun extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java
index c49b98c92d..c173bf24b6 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java
@@ -74,7 +74,7 @@ public class Q10447_TimingIsEverything extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10450_ADarkAmbition/Q10450_ADarkAmbition.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10450_ADarkAmbition/Q10450_ADarkAmbition.java
index c3f232b499..8f085a2197 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10450_ADarkAmbition/Q10450_ADarkAmbition.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10450_ADarkAmbition/Q10450_ADarkAmbition.java
@@ -49,7 +49,7 @@ public class Q10450_ADarkAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10452_IsItEdible/Q10452_IsItEdible.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10452_IsItEdible/Q10452_IsItEdible.java
index 921c507a44..751de64b84 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10452_IsItEdible/Q10452_IsItEdible.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10452_IsItEdible/Q10452_IsItEdible.java
@@ -53,7 +53,7 @@ public class Q10452_IsItEdible extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10453_StoppingTheWindDragon/Q10453_StoppingTheWindDragon.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10453_StoppingTheWindDragon/Q10453_StoppingTheWindDragon.java
index 3b567c5d04..6a74beb026 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10453_StoppingTheWindDragon/Q10453_StoppingTheWindDragon.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10453_StoppingTheWindDragon/Q10453_StoppingTheWindDragon.java
@@ -46,7 +46,7 @@ public class Q10453_StoppingTheWindDragon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java
index b6cec7570e..7268e0de45 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java
@@ -50,7 +50,7 @@ public class Q10455_ElikiasLetter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10457_KefensisIllusion/Q10457_KefensisIllusion.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10457_KefensisIllusion/Q10457_KefensisIllusion.java
index 671cad847e..ac05730f92 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10457_KefensisIllusion/Q10457_KefensisIllusion.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10457_KefensisIllusion/Q10457_KefensisIllusion.java
@@ -63,7 +63,7 @@ public class Q10457_KefensisIllusion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java
index fc5b941631..11718fe3dc 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java
@@ -54,7 +54,7 @@ public class Q10459_ASickAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10460_ReturnOfTheAlligatorHunter/Q10460_ReturnOfTheAlligatorHunter.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10460_ReturnOfTheAlligatorHunter/Q10460_ReturnOfTheAlligatorHunter.java
index d62452bd77..e5379d1f25 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10460_ReturnOfTheAlligatorHunter/Q10460_ReturnOfTheAlligatorHunter.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10460_ReturnOfTheAlligatorHunter/Q10460_ReturnOfTheAlligatorHunter.java
@@ -61,7 +61,7 @@ public class Q10460_ReturnOfTheAlligatorHunter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10461_TappingThePowerWithin/Q10461_TappingThePowerWithin.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10461_TappingThePowerWithin/Q10461_TappingThePowerWithin.java
index fba665d36a..c6682c66ea 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10461_TappingThePowerWithin/Q10461_TappingThePowerWithin.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10461_TappingThePowerWithin/Q10461_TappingThePowerWithin.java
@@ -46,7 +46,7 @@ public class Q10461_TappingThePowerWithin extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10462_TemperARustingBlade/Q10462_TemperARustingBlade.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10462_TemperARustingBlade/Q10462_TemperARustingBlade.java
index 5379818de9..1baa90cb8d 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10462_TemperARustingBlade/Q10462_TemperARustingBlade.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10462_TemperARustingBlade/Q10462_TemperARustingBlade.java
@@ -56,7 +56,7 @@ public class Q10462_TemperARustingBlade extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10464_BePreparedForAnything/Q10464_BePreparedForAnything.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10464_BePreparedForAnything/Q10464_BePreparedForAnything.java
index 2c9196dbd7..4533bb6597 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10464_BePreparedForAnything/Q10464_BePreparedForAnything.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10464_BePreparedForAnything/Q10464_BePreparedForAnything.java
@@ -51,7 +51,7 @@ public class Q10464_BePreparedForAnything extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10465_SoulFrostSword/Q10465_SoulFrostSword.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10465_SoulFrostSword/Q10465_SoulFrostSword.java
index d152979683..84a86d39dc 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10465_SoulFrostSword/Q10465_SoulFrostSword.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10465_SoulFrostSword/Q10465_SoulFrostSword.java
@@ -54,7 +54,7 @@ public class Q10465_SoulFrostSword extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10472_WindsOfFateEncroachingShadows/Q10472_WindsOfFateEncroachingShadows.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10472_WindsOfFateEncroachingShadows/Q10472_WindsOfFateEncroachingShadows.java
index 0ffb1623b8..eb5b37a492 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10472_WindsOfFateEncroachingShadows/Q10472_WindsOfFateEncroachingShadows.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10472_WindsOfFateEncroachingShadows/Q10472_WindsOfFateEncroachingShadows.java
@@ -91,7 +91,7 @@ public class Q10472_WindsOfFateEncroachingShadows extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
index bacbb7058b..ad79a5980b 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
@@ -73,7 +73,7 @@ public class Q10501_ZakenEmbroideredSoulCloak extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (player.getLevel() >= MIN_LEVEL) && event.equals("32612-04.html"))
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
index d1678a7601..38f4514197 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
@@ -73,7 +73,7 @@ public class Q10502_FreyaEmbroideredSoulCloak extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (player.getLevel() >= MIN_LEVEL) && event.equals("32612-04.html"))
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
index 224940ecd9..08aa62d532 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
@@ -74,7 +74,7 @@ public class Q10503_FrintezzaEmbroideredSoulCloak extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (player.getLevel() >= MIN_LEVEL) && event.equals("32612-04.html"))
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java
index dc59cfeb9d..c8cd4ccd15 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java
@@ -66,7 +66,7 @@ public class Q10504_JewelOfAntharas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java
index b587e54fe8..a67d6cf0d5 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java
@@ -66,7 +66,7 @@ public class Q10505_JewelOfValakas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java
index 593c0d4936..e2bb80f5e5 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java
@@ -46,7 +46,7 @@ public class Q10701_TheRoadToDestruction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java
index 1ede0c4ba5..ba1153cd88 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java
@@ -46,7 +46,7 @@ public class Q10702_TheRoadToInfinity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java
index 2ee25d6af7..253b12cda4 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java
@@ -48,7 +48,7 @@ public class Q10703_BottleOfIstinasSoul extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java
index 23bae467b4..9e799c2fcb 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java
@@ -48,7 +48,7 @@ public class Q10704_BottleOfOctavisSoul extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java
index 94c10b561b..4c8ae1432b 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java
@@ -48,7 +48,7 @@ public class Q10705_BottleOfTautisSoul extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java
index 16b4f7af81..680a69f7b3 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java
@@ -63,7 +63,7 @@ public class Q10707_FlamesOfSorrow extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java
index b017aff70d..8e3922d564 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java
@@ -53,7 +53,7 @@ public class Q10708_StrengthenTheBarrier extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (event.equals("activateKey"))
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10709_TheStolenSeed/Q10709_TheStolenSeed.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10709_TheStolenSeed/Q10709_TheStolenSeed.java
index aac4d6c526..203816dd05 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10709_TheStolenSeed/Q10709_TheStolenSeed.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10709_TheStolenSeed/Q10709_TheStolenSeed.java
@@ -58,7 +58,7 @@ public class Q10709_TheStolenSeed extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (event.equals("action"))
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10710_LifeEnergyRepository/Q10710_LifeEnergyRepository.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10710_LifeEnergyRepository/Q10710_LifeEnergyRepository.java
index d85b1154c8..d3ec85c20a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10710_LifeEnergyRepository/Q10710_LifeEnergyRepository.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10710_LifeEnergyRepository/Q10710_LifeEnergyRepository.java
@@ -64,7 +64,7 @@ public class Q10710_LifeEnergyRepository extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (event.equals("action"))
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java
index 6e5eb3cafd..7a20bc6711 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java
@@ -46,7 +46,7 @@ public class Q10732_AForeignLand extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java
index 72240e61bb..ab45ced198 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java
@@ -51,7 +51,7 @@ public class Q10733_TheTestForSurvival extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java
index f7fe13789b..59236f55a2 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java
@@ -68,7 +68,7 @@ public class Q10734_DoOrDie extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java
index 6d51149018..fa1ffbfa27 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java
@@ -64,7 +64,7 @@ public class Q10735_ASpecialPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("33942-02.htm"))
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java
index 195b92dea1..112039ce84 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java
@@ -63,7 +63,7 @@ public class Q10736_ASpecialPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("33943-02.htm"))
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java
index 350792eb17..94214632aa 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java
@@ -57,7 +57,7 @@ public class Q10737_GrakonsWarehouse extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java
index 063ad7d06c..8c1406aac3 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java
@@ -51,7 +51,7 @@ public class Q10738_AnInnerBeauty extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java
index d31c254fe7..80fb44427a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java
@@ -65,7 +65,7 @@ public class Q10739_SupplyAndDemand extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java
index 4b4379d023..0e0f8218fd 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java
@@ -66,7 +66,7 @@ public class Q10740_NeverForget extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java
index 897dc08246..14d56cb857 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java
@@ -57,7 +57,7 @@ public class Q10741_ADraughtForTheCold extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java
index 91747ce053..61518ac855 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java
@@ -62,7 +62,7 @@ public class Q10742_AFurryFriend extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java
index 62be95fe57..e57fe9584e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java
@@ -64,7 +64,7 @@ public class Q10743_StrangeFungus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java
index a30ff5fd9d..59e6700719 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java
@@ -53,7 +53,7 @@ public class Q10744_StrongerThanSteel extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java
index 6edc5ade14..085bc4830c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java
@@ -60,7 +60,7 @@ public class Q10745_TheSecretIngredients extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java
index e20bcad916..d6997b7d2a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java
@@ -56,7 +56,7 @@ public class Q10746_SeeTheWorld extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10748_MysteriousSuggestion1/Q10748_MysteriousSuggestion1.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10748_MysteriousSuggestion1/Q10748_MysteriousSuggestion1.java
index bf24739d4a..1db27a83de 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10748_MysteriousSuggestion1/Q10748_MysteriousSuggestion1.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10748_MysteriousSuggestion1/Q10748_MysteriousSuggestion1.java
@@ -54,7 +54,7 @@ public final class Q10748_MysteriousSuggestion1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10749_MysteriousSuggestion2/Q10749_MysteriousSuggestion2.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10749_MysteriousSuggestion2/Q10749_MysteriousSuggestion2.java
index 2e1b4f7932..fe683bb978 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10749_MysteriousSuggestion2/Q10749_MysteriousSuggestion2.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10749_MysteriousSuggestion2/Q10749_MysteriousSuggestion2.java
@@ -54,7 +54,7 @@ public final class Q10749_MysteriousSuggestion2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java
index fff89fae07..8a3fd4b331 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java
@@ -94,7 +94,7 @@ public class Q10751_WindsOfFateEncounters extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java
index 62e8365c2b..e6602bc163 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java
@@ -87,7 +87,7 @@ public class Q10752_WindsOfFateAPromise extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java
index 70f64ecbfc..d7a4d79eff 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java
@@ -135,7 +135,7 @@ public class Q10753_WindsOfFateChoices extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10755_LettersFromTheQueenWindyHill/Q10755_LettersFromTheQueenWindyHill.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10755_LettersFromTheQueenWindyHill/Q10755_LettersFromTheQueenWindyHill.java
index d5c4bced8d..979254f51d 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10755_LettersFromTheQueenWindyHill/Q10755_LettersFromTheQueenWindyHill.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10755_LettersFromTheQueenWindyHill/Q10755_LettersFromTheQueenWindyHill.java
@@ -55,7 +55,7 @@ public class Q10755_LettersFromTheQueenWindyHill extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java
index 88303627aa..f3d60b3ab9 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java
@@ -62,7 +62,7 @@ public class Q10756_AnInterdimensionalDraft extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java
index 827f52bf70..4971f73a3f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java
@@ -59,7 +59,7 @@ public class Q10757_QuietingTheStorm extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10758_TheOathOfTheWind/Q10758_TheOathOfTheWind.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10758_TheOathOfTheWind/Q10758_TheOathOfTheWind.java
index 4485888467..a6b19e4eb5 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10758_TheOathOfTheWind/Q10758_TheOathOfTheWind.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10758_TheOathOfTheWind/Q10758_TheOathOfTheWind.java
@@ -54,7 +54,7 @@ public class Q10758_TheOathOfTheWind extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10760_LettersFromTheQueenOrcBarracks/Q10760_LettersFromTheQueenOrcBarracks.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10760_LettersFromTheQueenOrcBarracks/Q10760_LettersFromTheQueenOrcBarracks.java
index 6f19d93f5b..728a4d8750 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10760_LettersFromTheQueenOrcBarracks/Q10760_LettersFromTheQueenOrcBarracks.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10760_LettersFromTheQueenOrcBarracks/Q10760_LettersFromTheQueenOrcBarracks.java
@@ -55,7 +55,7 @@ public class Q10760_LettersFromTheQueenOrcBarracks extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java
index cc57420b36..b19c945784 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java
@@ -65,7 +65,7 @@ public class Q10761_AnOrcInLove extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10762_MarionetteSpirit/Q10762_MarionetteSpirit.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10762_MarionetteSpirit/Q10762_MarionetteSpirit.java
index b4724c2b81..5b5d3dc231 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10762_MarionetteSpirit/Q10762_MarionetteSpirit.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10762_MarionetteSpirit/Q10762_MarionetteSpirit.java
@@ -55,7 +55,7 @@ public class Q10762_MarionetteSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java
index 1ae3f48a9b..cb7c39a7c0 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java
@@ -54,7 +54,7 @@ public class Q10763_TerrifyingChertuba extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java
index 7dd9c4ebae..8067e73cf3 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java
@@ -62,7 +62,7 @@ public class Q10764_FreeSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10766_ANewCraft/Q10766_ANewCraft.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10766_ANewCraft/Q10766_ANewCraft.java
index 1914dbf9c1..0b73dbcc98 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10766_ANewCraft/Q10766_ANewCraft.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10766_ANewCraft/Q10766_ANewCraft.java
@@ -63,7 +63,7 @@ public class Q10766_ANewCraft extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java
index 6fb43e4cd6..a82c8271e6 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java
@@ -60,7 +60,7 @@ public class Q10767_AWholeNewLevelOfAlchemy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10769_LettersFromTheQueenCrumaTowerPart1/Q10769_LettersFromTheQueenCrumaTowerPart1.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10769_LettersFromTheQueenCrumaTowerPart1/Q10769_LettersFromTheQueenCrumaTowerPart1.java
index dd3094b3e1..8d340700ac 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10769_LettersFromTheQueenCrumaTowerPart1/Q10769_LettersFromTheQueenCrumaTowerPart1.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10769_LettersFromTheQueenCrumaTowerPart1/Q10769_LettersFromTheQueenCrumaTowerPart1.java
@@ -57,7 +57,7 @@ public class Q10769_LettersFromTheQueenCrumaTowerPart1 extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java
index 54e0a0f389..2acfad68bd 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java
@@ -62,7 +62,7 @@ public class Q10770_InSearchOfTheGrail extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java
index 78b1a969d8..f744ad750f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java
@@ -60,7 +60,7 @@ public class Q10771_VolatilePower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java
index 6e5545e8f4..78a1c7ec03 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java
@@ -60,7 +60,7 @@ public class Q10772_ReportsFromCrumaTowerPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java
index ddd688d95a..c29029eed7 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java
@@ -56,7 +56,7 @@ public class Q10774_LettersFromTheQueenCrumaTowerPart2 extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java
index 461bb753c7..a6e48a1216 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java
@@ -64,7 +64,7 @@ public class Q10775_InSearchOfAnAncientGiant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java
index 16c146334a..f9e797dc7f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java
@@ -70,7 +70,7 @@ public class Q10776_TheWrathOfTheGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java
index d8030e4eee..0fd3f2e737 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java
@@ -60,7 +60,7 @@ public class Q10777_ReportsFromCrumaTowerPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10779_LettersFromTheQueenSeaOfSpores/Q10779_LettersFromTheQueenSeaOfSpores.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10779_LettersFromTheQueenSeaOfSpores/Q10779_LettersFromTheQueenSeaOfSpores.java
index 20e9699738..1743f54b84 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10779_LettersFromTheQueenSeaOfSpores/Q10779_LettersFromTheQueenSeaOfSpores.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10779_LettersFromTheQueenSeaOfSpores/Q10779_LettersFromTheQueenSeaOfSpores.java
@@ -56,7 +56,7 @@ public class Q10779_LettersFromTheQueenSeaOfSpores extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java
index c6cf778a6d..bca75549d5 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java
@@ -66,7 +66,7 @@ public class Q10780_AWeakenedBarrier extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10781_IngredientsToEnforcements/Q10781_IngredientsToEnforcements.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10781_IngredientsToEnforcements/Q10781_IngredientsToEnforcements.java
index 5c290d968c..11ed3d2ae0 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10781_IngredientsToEnforcements/Q10781_IngredientsToEnforcements.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10781_IngredientsToEnforcements/Q10781_IngredientsToEnforcements.java
@@ -61,7 +61,7 @@ public class Q10781_IngredientsToEnforcements extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java
index 6c11c32381..ba9cdbe126 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java
@@ -56,7 +56,7 @@ public class Q10782_LettersFromTheQueenForsakenPlains extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java
index bf536b64e4..dfbaa8ddc2 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java
@@ -79,7 +79,7 @@ public class Q10783_TracesOfAnAmbush extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java
index 9558be2c38..a8d28a2891 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java
@@ -63,7 +63,7 @@ public class Q10784_TheBrokenDevice extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java
index c688e09ef8..1edfa79000 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java
@@ -56,7 +56,7 @@ public class Q10785_LettersFromTheQueenFieldsOfMassacre extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java
index 8234edf8b1..b64830bfcd 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java
@@ -74,7 +74,7 @@ public class Q10786_ResidentProblemSolver extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java
index 09bd9760de..8aa64b279c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java
@@ -58,7 +58,7 @@ public class Q10787_ASpyMission extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java
index 8f151450ce..602b67c92f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java
@@ -56,7 +56,7 @@ public class Q10789_LettersFromTheQueenSwampOfScreams extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java
index 6c7cb90aec..ad66ca1d28 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java
@@ -75,7 +75,7 @@ public class Q10790_AMercenaryHelper extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java
index 06e621609d..ce55607210 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java
@@ -66,7 +66,7 @@ public class Q10791_TheManOfMystery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java
index 199a233254..82e3335ab0 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java
@@ -56,7 +56,7 @@ public class Q10792_LettersFromTheQueenForestOfTheDead extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java
index c1d1d998d8..e1d0307f88 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java
@@ -72,7 +72,7 @@ public class Q10793_SaveTheSouls extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java
index a6755ce1c7..55fc667c4a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java
@@ -95,7 +95,7 @@ public class Q10794_InvestigateTheForest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java
index 41036407f6..2fde8e412d 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java
@@ -41,7 +41,7 @@ public class Q10795_LettersFromTheQueenWallOfAgros extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java
index 143abbad30..e83fbb835a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java
@@ -48,7 +48,7 @@ public class Q10796_TheEyeThatDefiedTheGods extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
index 7d89984145..46893db27c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
@@ -53,7 +53,7 @@ public class Q10797_CrossingFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java
index a4388db16a..2cc223805a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java
@@ -57,7 +57,7 @@ public class Q10798_LettersFromTheQueenDragonValley extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java
index 71d7d125c0..5b2a84886c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java
@@ -72,7 +72,7 @@ public class Q10799_StrangeThingsAfootInTheValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java
index 6bf9ad2e94..2395ed2625 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java
@@ -72,7 +72,7 @@ public class Q10800_ReconnaissanceAtDragonValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
index b1dca4d5b3..15fc371c1a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
@@ -55,7 +55,7 @@ public class Q10801_TheDimensionalWarpPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
index 1339720830..1b0c8d74d0 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
@@ -56,7 +56,7 @@ public class Q10802_TheDimensionalWarpPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
index 117f5cc53e..4cae513e93 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
@@ -57,7 +57,7 @@ public class Q10803_TheDimensionalWarpPart3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
index 124823783a..f16e276a8f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
@@ -57,7 +57,7 @@ public class Q10804_TheDimensionalWarpPart4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
index a6796e0c63..b80b2b6ae5 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
@@ -57,7 +57,7 @@ public class Q10805_TheDimensionalWarpPart5 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
index d6ecba6b8e..5a8d67d930 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
@@ -56,7 +56,7 @@ public class Q10806_TheDimensionalWarpPart6 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
index 12462309a1..393bbe074c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
@@ -56,7 +56,7 @@ public class Q10807_TheDimensionalWarpPart7 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
index 8073ec2f06..22a2ff228a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
@@ -56,7 +56,7 @@ public class Q10811_ExaltedOneWhoFacesTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java
index 7ec8f800a0..fedb8e39bb 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java
@@ -93,7 +93,7 @@ public class Q10812_FacingSadness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10813_ForGlory/Q10813_ForGlory.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10813_ForGlory/Q10813_ForGlory.java
index 76fd620dde..89b572a2cc 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10813_ForGlory/Q10813_ForGlory.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10813_ForGlory/Q10813_ForGlory.java
@@ -58,7 +58,7 @@ public class Q10813_ForGlory extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java
index e487e06324..f583c8098b 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java
@@ -75,7 +75,7 @@ public class Q10814_BefittingOfTheStatus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java
index 7972a03dab..fa919c506c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java
@@ -66,7 +66,7 @@ public class Q10815_StepUp extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
index d508360581..d7790a8516 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
@@ -57,7 +57,7 @@ public class Q10817_ExaltedOneWhoOvercomesTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java
index 22cbb61194..0f898acae0 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java
@@ -64,7 +64,7 @@ public class Q10818_ConfrontingAGiantMonster extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10819_ForHonor/Q10819_ForHonor.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10819_ForHonor/Q10819_ForHonor.java
index d3d25867b9..250f860227 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10819_ForHonor/Q10819_ForHonor.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10819_ForHonor/Q10819_ForHonor.java
@@ -62,7 +62,7 @@ public class Q10819_ForHonor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10820_RelationshipsBefittingOfTheStatus/Q10820_RelationshipsBefittingOfTheStatus.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10820_RelationshipsBefittingOfTheStatus/Q10820_RelationshipsBefittingOfTheStatus.java
index d23b38f64a..126444e4a6 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10820_RelationshipsBefittingOfTheStatus/Q10820_RelationshipsBefittingOfTheStatus.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10820_RelationshipsBefittingOfTheStatus/Q10820_RelationshipsBefittingOfTheStatus.java
@@ -58,7 +58,7 @@ public class Q10820_RelationshipsBefittingOfTheStatus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10821_HelpingOthers/Q10821_HelpingOthers.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10821_HelpingOthers/Q10821_HelpingOthers.java
index 0ad084443b..bdbb8b5edb 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10821_HelpingOthers/Q10821_HelpingOthers.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10821_HelpingOthers/Q10821_HelpingOthers.java
@@ -55,7 +55,7 @@ public class Q10821_HelpingOthers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
index 783687b68a..068d0313dd 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
@@ -59,7 +59,7 @@ public class Q10823_ExaltedOneWhoShattersTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java
index 68dd1f489a..b9d8b3ecb3 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java
@@ -55,7 +55,7 @@ public class Q10824_ConfrontingTheGreatestDanger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java
index d9982218ab..f62d1ec44d 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java
@@ -61,7 +61,7 @@ public class Q10825_ForVictory extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10826_LuckBefittingOfTheStatus/Q10826_LuckBefittingOfTheStatus.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10826_LuckBefittingOfTheStatus/Q10826_LuckBefittingOfTheStatus.java
index 5a01415cd2..9a969561c5 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10826_LuckBefittingOfTheStatus/Q10826_LuckBefittingOfTheStatus.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10826_LuckBefittingOfTheStatus/Q10826_LuckBefittingOfTheStatus.java
@@ -76,7 +76,7 @@ public class Q10826_LuckBefittingOfTheStatus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10827_StepUpToLead/Q10827_StepUpToLead.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10827_StepUpToLead/Q10827_StepUpToLead.java
index 35fcab2537..73a3168454 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10827_StepUpToLead/Q10827_StepUpToLead.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10827_StepUpToLead/Q10827_StepUpToLead.java
@@ -58,7 +58,7 @@ public class Q10827_StepUpToLead extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10829_InSearchOfTheCause/Q10829_InSearchOfTheCause.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10829_InSearchOfTheCause/Q10829_InSearchOfTheCause.java
index 8f4b8ea015..8d961007e0 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10829_InSearchOfTheCause/Q10829_InSearchOfTheCause.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10829_InSearchOfTheCause/Q10829_InSearchOfTheCause.java
@@ -49,7 +49,7 @@ public class Q10829_InSearchOfTheCause extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/Q10830_TheLostGardenOfSpirits.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/Q10830_TheLostGardenOfSpirits.java
index d30455bf06..7305795c0d 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/Q10830_TheLostGardenOfSpirits.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/Q10830_TheLostGardenOfSpirits.java
@@ -63,7 +63,7 @@ public class Q10830_TheLostGardenOfSpirits extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10831_UnbelievableSight/Q10831_UnbelievableSight.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10831_UnbelievableSight/Q10831_UnbelievableSight.java
index c264493cfb..240c0fcb86 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10831_UnbelievableSight/Q10831_UnbelievableSight.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10831_UnbelievableSight/Q10831_UnbelievableSight.java
@@ -64,7 +64,7 @@ public class Q10831_UnbelievableSight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10832_EnergyOfSadnessAndAnger/Q10832_EnergyOfSadnessAndAnger.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10832_EnergyOfSadnessAndAnger/Q10832_EnergyOfSadnessAndAnger.java
index c3ba629f61..69125c3c8e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10832_EnergyOfSadnessAndAnger/Q10832_EnergyOfSadnessAndAnger.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10832_EnergyOfSadnessAndAnger/Q10832_EnergyOfSadnessAndAnger.java
@@ -79,7 +79,7 @@ public class Q10832_EnergyOfSadnessAndAnger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10833_PutTheQueenOfSpiritsToSleep/Q10833_PutTheQueenOfSpiritsToSleep.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10833_PutTheQueenOfSpiritsToSleep/Q10833_PutTheQueenOfSpiritsToSleep.java
index db582bd197..292e567423 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10833_PutTheQueenOfSpiritsToSleep/Q10833_PutTheQueenOfSpiritsToSleep.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10833_PutTheQueenOfSpiritsToSleep/Q10833_PutTheQueenOfSpiritsToSleep.java
@@ -55,7 +55,7 @@ public class Q10833_PutTheQueenOfSpiritsToSleep extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10836_DisappearedClanMember/Q10836_DisappearedClanMember.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10836_DisappearedClanMember/Q10836_DisappearedClanMember.java
index 3b3f852c70..3230d13891 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10836_DisappearedClanMember/Q10836_DisappearedClanMember.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10836_DisappearedClanMember/Q10836_DisappearedClanMember.java
@@ -59,7 +59,7 @@ public class Q10836_DisappearedClanMember extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10837_LookingForTheBlackbirdClanMember/Q10837_LookingForTheBlackbirdClanMember.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10837_LookingForTheBlackbirdClanMember/Q10837_LookingForTheBlackbirdClanMember.java
index 217cabf9fb..a83cf4e3fa 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10837_LookingForTheBlackbirdClanMember/Q10837_LookingForTheBlackbirdClanMember.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10837_LookingForTheBlackbirdClanMember/Q10837_LookingForTheBlackbirdClanMember.java
@@ -54,7 +54,7 @@ public class Q10837_LookingForTheBlackbirdClanMember extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java
index 2ef2a3e32e..6b0de70720 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java
@@ -64,7 +64,7 @@ public class Q10838_TheReasonForNotBeingAbleToGetOut extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java
index 248d9275e5..c4ba15bb8f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java
@@ -61,7 +61,7 @@ public class Q10839_BlackbirdsNameValue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java
index 218f86f996..1a12c524a9 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java
@@ -63,7 +63,7 @@ public class Q10840_TimeToRecover extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java
index 8cf3b7506e..cae50c4972 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java
@@ -53,7 +53,7 @@ public class Q10841_DeepInsideAteliaFortress extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10843_AnomalyInTheEnchantedValley/Q10843_AnomalyInTheEnchantedValley.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10843_AnomalyInTheEnchantedValley/Q10843_AnomalyInTheEnchantedValley.java
index e1712c2ba9..ae707e925f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10843_AnomalyInTheEnchantedValley/Q10843_AnomalyInTheEnchantedValley.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10843_AnomalyInTheEnchantedValley/Q10843_AnomalyInTheEnchantedValley.java
@@ -48,7 +48,7 @@ public class Q10843_AnomalyInTheEnchantedValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10844_BloodyBattleSeizingSupplies/Q10844_BloodyBattleSeizingSupplies.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10844_BloodyBattleSeizingSupplies/Q10844_BloodyBattleSeizingSupplies.java
index a1525ffb5b..dad2f29f95 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10844_BloodyBattleSeizingSupplies/Q10844_BloodyBattleSeizingSupplies.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10844_BloodyBattleSeizingSupplies/Q10844_BloodyBattleSeizingSupplies.java
@@ -54,7 +54,7 @@ public class Q10844_BloodyBattleSeizingSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10846_BloodyBattleMeetingTheCommander/Q10846_BloodyBattleMeetingTheCommander.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10846_BloodyBattleMeetingTheCommander/Q10846_BloodyBattleMeetingTheCommander.java
index 1907adb6b3..45b54344dd 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10846_BloodyBattleMeetingTheCommander/Q10846_BloodyBattleMeetingTheCommander.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10846_BloodyBattleMeetingTheCommander/Q10846_BloodyBattleMeetingTheCommander.java
@@ -51,7 +51,7 @@ public class Q10846_BloodyBattleMeetingTheCommander extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/ThirdClassTransferQuest.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
index 9cb14382cb..89146d7a27 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
@@ -131,7 +131,7 @@ public abstract class ThirdClassTransferQuest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/vehicles/AirShipController.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/vehicles/AirShipController.java
index 682f3b238b..ee534c5f04 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/vehicles/AirShipController.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/vehicles/AirShipController.java
@@ -117,7 +117,7 @@ public abstract class AirShipController extends AbstractNpcAI
 	private static final SystemMessage SM_NEED_MORE = new SystemMessage(SystemMessageId.AN_AIRSHIP_CANNOT_BE_SUMMONED_BECAUSE_YOU_DON_T_HAVE_ENOUGH_S1).addItemName(STARSTONE);
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("summon".equalsIgnoreCase(event))
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
index f3974aa349..c748e1c2cd 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
@@ -162,7 +162,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player.isTransformed())
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
index 7ff39fb0c0..8675a7ec2c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
@@ -51,7 +51,7 @@ public class AllianceMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!"9001-01.htm".equals(event) && (player.getClan() == null))
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
index 58c0e304f2..20648ef643 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
@@ -80,7 +80,7 @@ public class ClanMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LEADER_REQUIRED.containsKey(event) && !player.isClanLeader())
 		{
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/quest/Quest.java
index d07a0ebd68..a146c07f81 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/quest/Quest.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/quest/Quest.java
@@ -246,7 +246,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -268,7 +268,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -559,7 +559,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 			{
 				player.setSimulatedTalking(false);
 			}
-			res = onAdvEvent(event, npc, player);
+			res = onEvent(event, npc, player);
 		}
 		catch (Exception e)
 		{
@@ -1037,12 +1037,11 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 */
 	public String onDeath(Creature killer, Creature victim, QuestState qs)
 	{
-		return onAdvEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
+		return onEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
 	}
 	
 	/**
 	 * This function is called whenever a player clicks on a link in a quest dialog and whenever a timer fires.<br>
-	 * If is not overridden by a subclass, then default to the returned value of the simpler (and older) {@link #onEvent(String, QuestState)} override.<br>
 	 * If the player has a quest state, use it as parameter in the next call, otherwise return null.
 	 * @param event this parameter contains a string identifier for the event.<br>
 	 *            Generally, this string is passed directly via the link.<br>
@@ -1061,35 +1060,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 *            This parameter may be {@code null} in certain circumstances.
 	 * @return the text returned by the event (may be {@code null}, a filename or just text)
 	 */
-	public String onAdvEvent(String event, Npc npc, Player player)
-	{
-		if (player != null)
-		{
-			final QuestState qs = player.getQuestState(getName());
-			if (qs != null)
-			{
-				return onEvent(event, qs);
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * This function is called in place of {@link #onAdvEvent(String, Npc, Player)} if the former is not implemented.<br>
-	 * If a script contains both {@link #onAdvEvent(String, Npc, Player)} and this implementation, then this method will never be called unless the script's {@link #onAdvEvent(String, Npc, Player)} explicitly calls this method.
-	 * @param event this parameter contains a string identifier for the event.<br>
-	 *            Generally, this string is passed directly via the link.<br>
-	 *            For example:<br>
-	 *            <code>
-	 *            &lt;a action="bypass -h Quest 626_ADarkTwilight 31517-01.htm"&gt;hello&lt;/a&gt;
-	 *            </code><br>
-	 *            The above link sets the event variable to "31517-01.htm" for the quest 626_ADarkTwilight.<br>
-	 *            In the case of timers, this will be the name of the timer.<br>
-	 *            This parameter serves as a sort of identifier.
-	 * @param qs this parameter contains a reference to the quest state of the player who used the link or started the timer.
-	 * @return the text returned by the event (may be {@code null}, a filename or just text)
-	 */
-	public String onEvent(String event, QuestState qs)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return null;
 	}
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java
index 2ab35f83dc..6740fe6383 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java
@@ -46,7 +46,7 @@ public class Ruine extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
index e85df039b0..0ebae68471 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
@@ -73,7 +73,7 @@ public class AncientArcanCity extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CHANGE_STATE"))
 		{
@@ -107,7 +107,7 @@ public class AncientArcanCity extends AbstractNpcAI
 				cat.broadcastSocialAction(2);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
index d76c158f9e..d38ceb917e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
@@ -42,7 +42,7 @@ public class Lykus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
index 4fd3e87bb7..92979a713e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
@@ -39,7 +39,7 @@ public class Mumu extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
index 56ceed0cda..34c3cc9100 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
@@ -329,7 +329,7 @@ public class AteliaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
index c87c4e9224..a2a2891b57 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
@@ -56,7 +56,7 @@ public class BabyPets extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("HEAL") && (player != null))
 		{
@@ -78,7 +78,7 @@ public class BabyPets extends AbstractNpcAI
 				cancelQuestTimer("HEAL", null, player);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGOUT)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
index b0153ef5da..f0f610c8b9 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
@@ -56,7 +56,7 @@ public class ImprovedBabyPets extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player != null)
 		{
@@ -108,7 +108,7 @@ public class ImprovedBabyPets extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
index 6b4a147550..301899a76f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
@@ -42,7 +42,7 @@ public class Tunatun extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java
index f6485e07b4..2693ef7a00 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java
@@ -48,7 +48,7 @@ public class Alarm extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Player player0 = npc.getVariables().getObject("player0", Player.class);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
index a2b4810dfa..ad01bdba4a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
@@ -46,14 +46,14 @@ public class CrumaTower extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("MESSAGE") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_GO_TO_UNDERGROUND_LV_3_USING_THE_ELEVATOR_IN_THE_BACK);
 			startQuestTimer(event, 15000, npc, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
index 7cab0d9caf..9ac87f3024 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
@@ -77,7 +77,7 @@ public class FrightenedRagnaOrc extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
index ee5d44d59e..db9d7838fc 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
@@ -53,7 +53,7 @@ public class DragonVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("Spawn".equals(event))
 		{
@@ -104,7 +104,7 @@ public class DragonVortex extends AbstractNpcAI
 		{
 			npc.setScriptValue(0);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
index de54d68cf6..ce248d3f8f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
@@ -53,7 +53,7 @@ public class LairOfAntharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CHECK_HOME") && (npc != null) && !npc.isDead())
 		{
@@ -67,7 +67,7 @@ public class LairOfAntharas extends AbstractNpcAI
 				npc.broadcastPacket(new ValidateLocation(npc));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
index bf46d16542..c4e625c565 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
@@ -55,7 +55,7 @@ public class LeopardDragonHachling extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && event.equals("MOVE_TO_TRANSFORM"))
 		{
@@ -77,7 +77,7 @@ public class LeopardDragonHachling extends AbstractNpcAI
 				npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, nearestLocation(npc));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
index 04396d3683..6f794f4008 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
@@ -40,13 +40,13 @@ public class MercenaryCaptain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THE_EASTERN_PART_OF_DRAGON_VALLEY_IS_MUCH_MORE_DANGEROUS_THAN_THE_WEST_BE_CAREFUL));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
index 13dfbd313b..324120327b 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
@@ -61,10 +61,10 @@ public class MercenaryTeleport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		player.teleToLocation(LOCATIONS.get(event), true);
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DragonValley/Namo.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
index 99057c816c..f21c497157 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
@@ -40,13 +40,13 @@ public class Namo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THIS_PLACE_SWARMS_WITH_DRAGONS_BY_DAY_AND_UNDEAD_BY_NIGHT));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
index 32c7beb400..c02404f76a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
@@ -40,13 +40,13 @@ public class Rakun extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THIS_PLACE_SWARMS_WITH_DRAGONS_BY_DAY_AND_UNDEAD_BY_NIGHT));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
index 349976c56b..cc5487971c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
@@ -72,7 +72,7 @@ public class SeparatedSoul extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LOCATIONS.containsKey(event))
 		{
@@ -98,7 +98,7 @@ public class SeparatedSoul extends AbstractNpcAI
 				return "no-items.htm";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java
index 2125fca0d8..870b8a5820 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java
@@ -50,7 +50,7 @@ public class Celestiel extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java
index 4cb6303606..8d927f12d2 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java
@@ -48,7 +48,7 @@ public class FlowerBud extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("spawn") && npc.isDead())
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
index 8ca5f0c7d4..a3b3d2da62 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
@@ -49,7 +49,7 @@ public class AltarOfSouls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -96,7 +96,7 @@ public class AltarOfSouls extends AbstractNpcAI
 				return "33920-9.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
index 47beace94a..c82e8969f1 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
@@ -41,7 +41,7 @@ public class RemembranceTower extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("action") && npc.isScriptValue(0))
 		{
@@ -54,7 +54,7 @@ public class RemembranceTower extends AbstractNpcAI
 			npc.setScriptValue(0);
 			npc.broadcastPacket(new OnEventTrigger(EMMITER_ID, false));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
index 39625630cd..0d3824cd68 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
@@ -60,7 +60,7 @@ public class LargeCocoon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -138,7 +138,7 @@ public class LargeCocoon extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
index d4a9137f8d..20aad104b0 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
@@ -41,7 +41,7 @@ public class KrateisCube extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
index 54f813c829..c1de7e5630 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
@@ -365,7 +365,7 @@ public class TalentShow extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((event == null) || event.isEmpty())
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
index 099500e9bb..8dea4780a1 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
@@ -41,7 +41,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -54,7 +54,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 				npc.deleteMe();
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_DAY_NIGHT_CHANGE)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
index 8029a17703..20dfae5ccf 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
@@ -88,7 +88,7 @@ public class ForgeOfTheGods extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
index ba045bd19c..39fcc5a8d7 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
@@ -84,7 +84,7 @@ public class Rooney extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport") && !npc.isDecayed())
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
index a3bc5828d9..40c8ad2e0d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
@@ -87,7 +87,7 @@ public class GainakSiege extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("GAINAK_WAR"))
 		{
@@ -129,7 +129,7 @@ public class GainakSiege extends AbstractNpcAI
 				ZoneManager.getInstance().getZoneById(GAINAK_TOWN_ZONE.getId(), PeaceZone.class).setEnabled(false);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
index 27e969e0c9..955c7ddd25 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
@@ -46,7 +46,7 @@ public class Lailly extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
index 35274b2de7..ca8919593a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
@@ -128,7 +128,7 @@ public class TavernEmployee extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
index c99c7cdf42..0ff79c4f5d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
@@ -76,7 +76,7 @@ public class Apherus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("buff"))
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
index 06a75493ac..d7944dd6f3 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
@@ -40,7 +40,7 @@ public class ApherusLookout extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		if (event.equals("open_bag"))
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
index e984558e2c..0d30623e93 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
@@ -48,7 +48,7 @@ public class GardenWatchman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -78,7 +78,7 @@ public class GardenWatchman extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
index 02b6a47091..42752aea0c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
@@ -42,7 +42,7 @@ public class GenesisVines extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CAST_SKILL") && npc.isScriptValue(1))
 		{
@@ -58,7 +58,7 @@ public class GenesisVines extends AbstractNpcAI
 			npc.setScriptValue(0);
 			npc.deleteMe();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
index 3216884d13..ab0d91e3cd 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
@@ -53,7 +53,7 @@ public class Statues extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("fight"))
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
index 29ccfb6308..64246fbb51 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
@@ -46,7 +46,7 @@ public class FuryKiku extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -76,7 +76,7 @@ public class FuryKiku extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
index 84b5b0c214..08ba28f0fd 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
@@ -50,7 +50,7 @@ public class Isabella extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAWN"))
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
index dc07df1c2f..a7ab45ea5e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
@@ -42,7 +42,7 @@ public class GiantsCave extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
index 50c14b79bb..20f3adf32d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
@@ -57,7 +57,7 @@ public class Kekropus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
index d4c54fcddd..9e41be2b4a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
@@ -82,7 +82,7 @@ public class Spirit extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -102,7 +102,7 @@ public class Spirit extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Heine/WrapGate.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
index eb934ee4dc..bd1d86a743 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
@@ -43,7 +43,7 @@ public class WrapGate extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("enter_hellbound".equals(event))
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java
index 515fc7df94..9ee6847840 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java
@@ -82,7 +82,7 @@ public class EnchantedMegaliths extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
index e49050b695..c4486b2670 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
@@ -39,7 +39,7 @@ public class LeonaBlackbird extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/HellboundIsland/QuarryRebel/QuarryRebel.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/HellboundIsland/QuarryRebel/QuarryRebel.java
index 248f2be6e0..7d2ec669ef 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/HellboundIsland/QuarryRebel/QuarryRebel.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/HellboundIsland/QuarryRebel/QuarryRebel.java
@@ -59,7 +59,7 @@ public class QuarryRebel extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAWN"))
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
index 888a2980ef..5923d188eb 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
@@ -60,7 +60,7 @@ public class Theorn extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
index e026f3cd57..5ef95aed5e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
@@ -47,7 +47,7 @@ public class Merlot extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/ImperialTomb/BloodySuccubus.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/ImperialTomb/BloodySuccubus.java
index 1f56178ded..2ab48d235a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/ImperialTomb/BloodySuccubus.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/ImperialTomb/BloodySuccubus.java
@@ -118,7 +118,7 @@ public class BloodySuccubus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
index 1879ece1c7..a69a2810f4 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
@@ -218,7 +218,7 @@ public class FourSepulchers extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
index 6ea0a0760f..14c4560f16 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
@@ -43,7 +43,7 @@ public class Zenya extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
index 2b048463f8..99e8fa6078 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
@@ -63,7 +63,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -135,7 +135,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 				npc.reduceCurrentHp(500, npc, null); // poison kills Fafurion if he is not healed
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
index 2a0a8014f8..d4dc25aab8 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
@@ -47,7 +47,7 @@ public class Rignos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -90,7 +90,7 @@ public class Rignos extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
index 43e2c64226..af4b116516 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
@@ -57,7 +57,7 @@ public class HillsOfGold extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -75,7 +75,7 @@ public class HillsOfGold extends AbstractNpcAI
 			});
 			startQuestTimer("SPICULA_AGGRO", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
index edf9416113..efaf6d6bf8 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
@@ -61,7 +61,7 @@ public class AvantGarde extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
index 37f35f00f8..ac8772d975 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
@@ -108,7 +108,7 @@ public class KetraOrcSupport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
index 6c1085f7d0..f253eadcb6 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
@@ -38,13 +38,13 @@ public class El extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_USE_THE_JUMP_BOARD_TO_GET_STRAIGHT_TO_THE_2ND_FLOOR, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
index 282d7a6326..debef79252 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
@@ -58,7 +58,7 @@ public class GeneralDilios extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("command_"))
 		{
@@ -87,7 +87,7 @@ public class GeneralDilios extends AbstractNpcAI
 				startQuestTimer("guard_animation_" + (value + 1), 1500, null, null);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
index 0a84cf47a0..b4dbbc74ae 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
@@ -47,7 +47,7 @@ public class Lekon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
index 89bccaaa2e..d1ee34cd79 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
@@ -54,7 +54,7 @@ public class LindviorScene extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -107,7 +107,7 @@ public class LindviorScene extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public void scheduleNextLindviorVisit()
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
index 79aaecd2f1..9d38ce28a4 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
@@ -59,7 +59,7 @@ public class Nottingale extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
index 975e4a2614..b0ded82d61 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
@@ -38,13 +38,13 @@ public class Plenos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_BE_TELEPORTED_TO_EACH_SEED_IF_YOU_VOLUNTEER_WHY_NOT_TRY, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
index 6b54823416..f19b854050 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
@@ -46,7 +46,7 @@ public class SeedTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -75,7 +75,7 @@ public class SeedTeleportDevice extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
index 23b5c50033..c8498cbee5 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
@@ -49,7 +49,7 @@ public class MithrilMinesTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int index = Integer.parseInt(event) - 1;
 		if (LOCS.length > index)
@@ -57,7 +57,7 @@ public class MithrilMinesTeleporter extends AbstractNpcAI
 			final Location loc = LOCS[index];
 			player.teleToLocation(loc, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
index d398cfc3b8..2901995fbe 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
@@ -82,7 +82,7 @@ public class MonasteryOfSilence extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -130,7 +130,7 @@ public class MonasteryOfSilence extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
index 9a2ee10f60..434807bd9e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
@@ -62,7 +62,7 @@ public class PaganTeleporters extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
index 7eed58ebec..1c6e6ba756 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
@@ -60,7 +60,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -90,7 +90,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI
 				instanceScript.notifyEvent(event, npc, player);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
index 9d4b3bde33..781bfa3af3 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
@@ -39,13 +39,13 @@ public class Fioren extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("startMovie"))
 		{
 			playMovie(player, Movie.SI_BARLOG_STORY);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java
index 9c52a15e19..2d6d808bad 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java
@@ -93,7 +93,7 @@ public class PlainsOfLizardman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("fantasy_mushroom") && (npc != null) && (player != null))
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
index 21ff72d2e7..c8747c6857 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
@@ -179,7 +179,7 @@ public class PrimevalIsle extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -239,7 +239,7 @@ public class PrimevalIsle extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
index 5ffc401682..6a166ec683 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
@@ -74,7 +74,7 @@ public class Kaysen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
index 619d9e57f4..ceb8d8a7b9 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
@@ -63,7 +63,7 @@ public class NervasTemporaryPrison extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
index b8b803e57f..43691cef06 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
@@ -38,14 +38,14 @@ public class RoAGuard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THIS_IS_RUINS_OF_AGONY_WHERE_KANILOV_IS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
index f3af67aba7..dd2a52bdc5 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
@@ -38,14 +38,14 @@ public class RoDGuard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THIS_IS_THE_RUINS_OF_AGONY_WHERE_POSLOF_IS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
index 5e57a9fb94..a19c1d4085 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
@@ -48,7 +48,7 @@ public class AltarOfSacrifice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("msg_text"))
 		{
@@ -68,7 +68,7 @@ public class AltarOfSacrifice extends AbstractNpcAI
 			startQuestTimer("msg_text", 135000, npc, null);
 			_jenas_guard.setScriptValue(0);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
index a025e62542..b50f530164 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
@@ -147,7 +147,7 @@ public class Venom extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
index ed4ce2d782..cd89ebcb9e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
@@ -43,7 +43,7 @@ public class Klemis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("portInside"))
 		{
@@ -56,7 +56,7 @@ public class Klemis extends AbstractNpcAI
 				return "32734-01.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
index d66782538a..c1db3c8180 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
@@ -80,7 +80,7 @@ public class Maguen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || (player == null))
 		{
@@ -163,7 +163,7 @@ public class Maguen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
index 344d65a44f..d5ab73ff74 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
@@ -48,7 +48,7 @@ public class Nemo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
index 251458ea98..ae26a6c701 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
@@ -297,7 +297,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("ChangeSeedsStatus"))
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
index d6f644fa86..765deb4a7d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
@@ -51,7 +51,7 @@ public class Seyo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (npc == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
index f213bbec6c..f62aa835e8 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
@@ -132,7 +132,7 @@ public class SelMahumDrill extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -188,7 +188,7 @@ public class SelMahumDrill extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
index 4d3891946f..4e0a01cea2 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
@@ -83,7 +83,7 @@ public class SelMahumSquad extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -189,7 +189,7 @@ public class SelMahumSquad extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java
index 1c47135e60..a38df65796 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java
@@ -70,7 +70,7 @@ public class SilentValley extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
index ebf70cc5ae..6ba58ffc8e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
@@ -197,7 +197,7 @@ public class StakatoNest extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || (player == null) || npc.isDead())
 		{
@@ -225,7 +225,7 @@ public class StakatoNest extends AbstractNpcAI
 			addAttackPlayerDesire(spawned, player);
 			npc.deleteMe();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private static Monster checkMinion(Npc npc)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
index 611b134c70..2469300cb4 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
@@ -49,7 +49,7 @@ public class StakatoNestTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int index = Integer.parseInt(event) - 1;
 		if (LOCS.length > index)
@@ -67,7 +67,7 @@ public class StakatoNestTeleporter extends AbstractNpcAI
 			}
 			player.teleToLocation(loc, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
index 4a64afbd00..ba580c2dad 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
@@ -44,7 +44,7 @@ public class Apprentice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("rideKukuru"))
 		{
@@ -61,7 +61,7 @@ public class Apprentice extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TRY_RIDING_A_KUKURI, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
index e09ab8270d..8c1824fe61 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
@@ -97,7 +97,7 @@ public class AwakeningMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
index cd6185a888..8ed7701c68 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
@@ -38,7 +38,7 @@ public class Banette extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
@@ -62,7 +62,7 @@ public class Banette extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
index 87e0629227..858331ae3e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
@@ -38,13 +38,13 @@ public class Bink extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TALKING_ISLAND_VILLAGE_IS_REALLY_BEAUTIFUL, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
index e439d986ad..5d231aa00d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
@@ -45,7 +45,7 @@ public class BoyAndGirl extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_CHANGEWEAP"))
 		{
@@ -66,7 +66,7 @@ public class BoyAndGirl extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, npc.getId() == BOY ? NpcStringId.WEEE : NpcStringId.BOYS_ARE_SO_ANNOYING);
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
index ff53080809..22d19b3496 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
@@ -41,7 +41,7 @@ public class Devno extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -74,7 +74,7 @@ public class Devno extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
index a4f08b8c99..18c04b2e7e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
@@ -42,7 +42,7 @@ public class DrillSergeant extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SOCIAL_SHOW"))
 		{
@@ -66,7 +66,7 @@ public class DrillSergeant extends AbstractNpcAI
 				npc.broadcastSocialAction(socialActionId);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
index 8e3f9e5943..83363ef157 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
@@ -41,7 +41,7 @@ public class Eleve extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Eleve extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
index b8863b9963..114728632b 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
@@ -44,13 +44,13 @@ public class Gagabu extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, GAGABU_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
index 44dab7df42..d490504792 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
@@ -38,14 +38,14 @@ public class Galad extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSocialAction(3);
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.OCCASIONALLY_RARE_JEWELS_OF_GIANTS_ARE_DISCOVERED_IN_THE_BEACH, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
index a0c7f71816..3a56943e20 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
@@ -52,7 +52,7 @@ public class GiantSoldiers extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
index a703c40323..b94d2f9624 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
@@ -38,7 +38,7 @@ public class GuardSoldier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -49,7 +49,7 @@ public class GuardSoldier extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(2);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
index b26d9fd748..1b0dd65c82 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
@@ -43,7 +43,7 @@ public class Hadel extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
index bdb70d1f2d..d7ff70d9a0 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
@@ -38,7 +38,7 @@ public class Handermonkey extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE") && (npc != null))
 		{
@@ -54,7 +54,7 @@ public class Handermonkey extends AbstractNpcAI
 				npc.broadcastSocialAction(9);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
index b8370bffe7..5ea0569424 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
@@ -60,7 +60,7 @@ public class Hardin extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = getHtmlMessage(player);
 		if (htmltext != null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
index a8bded51f1..536ee7f5cd 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
@@ -58,7 +58,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("HARNAK_SPAWN"))
 		{
@@ -70,7 +70,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
 				_templates.forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName), null));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private static class zoneInfo
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
index 3c2080e85a..03dca71bb5 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
@@ -55,13 +55,13 @@ public class HurnakMobMsg extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("ATTACK"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomEntry(ON_ATTACK_MSG));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
index 81f6617329..7055381eab 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
@@ -38,14 +38,14 @@ public class Hera extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomBoolean() ? NpcStringId.DOES_THE_GODDESS_SEE_WHAT_SHE_HAS_DONE : NpcStringId.WHY_HAVE_THE_HEROES_ABANDONED_US);
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
index 7003ad014d..2b6a1a1e51 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
@@ -38,7 +38,7 @@ public class Heymond extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
@@ -62,7 +62,7 @@ public class Heymond extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
index 52ce99be7f..8033f3c1ec 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
@@ -38,7 +38,7 @@ public class Holly extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -48,7 +48,7 @@ public class Holly extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(6);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
index 3f9141b931..e11490debc 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
@@ -41,7 +41,7 @@ public class Karonf extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Karonf extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
index 597cfd80f2..c102b0cc4c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
@@ -44,7 +44,7 @@ public class Luderic extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -54,7 +54,7 @@ public class Luderic extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(1);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
index 0c07720a0a..08de6143f0 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
@@ -45,13 +45,13 @@ public class Lumi extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, LUMI_SHOUT[getRandom(3)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
index 68b2789416..3bdb8de60b 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
@@ -38,13 +38,13 @@ public class Mahram extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.ALCHEMY_IS_A_SCIENCE_AND_AN_ART, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
index e00fd6c98c..85117713a0 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
@@ -38,13 +38,13 @@ public class Mai extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EVERY_RACE_BUILT_A_PIECE_OF_THIS_VILLAGE, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
index dcd47a9822..2d44f1568a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
@@ -38,13 +38,13 @@ public class MarinSmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.HMM_IS_THIS_STILL_A_DECENT_WEAPON, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
index d5e5496e16..0d4e8f79e3 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
@@ -41,7 +41,7 @@ public class Marsha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Marsha extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
index aa9eb0eb87..81bc246742 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
@@ -43,7 +43,7 @@ public class Milia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("gludioAirship"))
 		{
@@ -53,7 +53,7 @@ public class Milia extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SPEAK_WITH_ME_ABOUT_TRAVELING_AROUND_ADEN, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
index b1e037eb5a..933c139b8c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
@@ -64,7 +64,7 @@ public class MonkOfChaos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
index f6cd83883a..0bedb09eb6 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
@@ -41,7 +41,7 @@ public class Morgan extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Morgan extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
index e7ce45a4e5..fd5e025cd2 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
@@ -40,7 +40,7 @@ public class Oris extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SOCIAL_ACTION_1"))
 		{
@@ -55,7 +55,7 @@ public class Oris extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_HAVEN_T_FELT_THIS_GOOD_IN_AGES, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
index 328de6a4df..34ae4f55b6 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
@@ -49,7 +49,7 @@ public class Pantheon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
index 869ebf3119..e44fe2e373 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
@@ -152,7 +152,7 @@ public class Raina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
index 4c8862c733..8d66a71766 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
@@ -41,7 +41,7 @@ public class Rubentis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Rubentis extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
index d5c86cee97..87e1df4a6b 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
@@ -38,14 +38,14 @@ public class Ruks extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomBoolean() ? NpcStringId.THE_SEVEN_SIGNS_ENDED : NpcStringId.WE_NEED_TO_FIND_HER_WEAKNESS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
index cc9a63c666..880532e52c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
@@ -38,13 +38,13 @@ public class Sebion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TIS_A_SCRATCH, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
index fa3cc06633..4b05120bde 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
@@ -38,13 +38,13 @@ public class Shannon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.LOOK_AT_ALL_THE_NEWBIES_HA_HA_HA, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
index 219ac48515..7fd067c374 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
@@ -44,13 +44,13 @@ public class Sodian extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, SODIAN_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
index e11dfb9aaf..8413c93bc8 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
@@ -44,13 +44,13 @@ public class Stiller extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, STILLER_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
index b10f044196..d196091a8e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
@@ -38,13 +38,13 @@ public class Theodore extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.AND_NOW_YOUR_JOURNEY_BEGINS, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
index 4290aa8fc6..8e4f8ed738 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
@@ -38,7 +38,7 @@ public class TomaJunior extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -49,7 +49,7 @@ public class TomaJunior extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(6);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java
index 219f1f4879..1e4bdb3ff1 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java
@@ -48,7 +48,7 @@ public class Toyron extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true);
 		if (event.equals("museum_teleport"))
@@ -62,7 +62,7 @@ public class Toyron extends AbstractNpcAI
 				player.teleToLocation(MUSEUM_OUT);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
index c3aa031317..78ce6f2c8c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
@@ -38,7 +38,7 @@ public class TrainningSoldier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -55,7 +55,7 @@ public class TrainningSoldier extends AbstractNpcAI
 			}
 			startQuestTimer("START_ATTACK", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
index 219dbdca43..2e18e168e1 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
@@ -63,7 +63,7 @@ public class Trandon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String[] substrings = event.split(" ");
 		if (substrings.length < 1)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
index 8cd3cd965d..b65bd9a7ad 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
@@ -42,7 +42,7 @@ public class YeSagiraGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -56,7 +56,7 @@ public class YeSagiraGuards extends AbstractNpcAI
 			}
 			startQuestTimer("GUARD_AGGRO", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
index 007d0e13d3..a4e0c941bd 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
@@ -88,7 +88,7 @@ public class YeSegiraTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LOCATIONS.containsKey(event))
 		{
@@ -111,7 +111,7 @@ public class YeSegiraTeleportDevice extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_PLAYER_CREATE)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java
index e546cbc086..be903e83d2 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java
@@ -87,7 +87,7 @@ public class ToIVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int npcId = npc.getId();
 		
@@ -133,7 +133,7 @@ public class ToIVortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TownOfGiran/Alexandria/Alexandria.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TownOfGiran/Alexandria/Alexandria.java
index 1a0064cbcd..8091ac70e6 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TownOfGiran/Alexandria/Alexandria.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TownOfGiran/Alexandria/Alexandria.java
@@ -82,7 +82,7 @@ public class Alexandria extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("30098-02.html"))
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
index 2c8e967539..4bb6be2086 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
@@ -40,7 +40,7 @@ public class Acateo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("give_circlet"))
 		{
@@ -51,7 +51,7 @@ public class Acateo extends AbstractNpcAI
 			giveItems(player, ACADEMY_CIRCLET, 1);
 			return "33905-2.html";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TownOfGoddard/Cerenas/Cerenas.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TownOfGoddard/Cerenas/Cerenas.java
index 4b87f5ec09..f2df150f21 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TownOfGoddard/Cerenas/Cerenas.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TownOfGoddard/Cerenas/Cerenas.java
@@ -41,7 +41,7 @@ public class Cerenas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(Q10369_NoblesseSoulTesting.class.getSimpleName());
 		String htmltext = null;
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
index 949fb8f279..48ca778074 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
@@ -108,7 +108,7 @@ public class VarkaSilenosSupport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
index b7fb571500..3a94d3d378 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
@@ -43,7 +43,7 @@ public class ElmoredenServantsGhost extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("teleport1") || event.equals("teleport2"))
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
index 427084ea7a..150fee7dfb 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
@@ -83,7 +83,7 @@ public class Wastelands extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || !npc.isSpawned())
 		{
@@ -184,7 +184,7 @@ public class Wastelands extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
index 61678a5cb2..5e24c8040c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
@@ -47,7 +47,7 @@ public class ZealotOfShilen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -75,7 +75,7 @@ public class ZealotOfShilen extends AbstractNpcAI
 			}
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
index 2da266ca0e..ab6a6ebc3e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
@@ -38,14 +38,14 @@ public class Commando extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.WE_RE_COLLECTING_SEEKER_OF_ADEN);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Anais/Anais.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Anais/Anais.java
index 74fe879672..823d08142f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Anais/Anais.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Anais/Anais.java
@@ -75,7 +75,7 @@ public class Anais extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -134,7 +134,7 @@ public class Anais extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
index 00ebb5f34f..6f04200e6f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
@@ -361,7 +361,7 @@ public class Anakim extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -475,7 +475,7 @@ public class Anakim extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index d236e19d43..a5157acfc7 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -193,7 +193,7 @@ public class Antharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -605,7 +605,7 @@ public class Antharas extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 3051d87c77..3d8308a45c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -164,7 +164,7 @@ public class Baium extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -478,7 +478,7 @@ public class Baium extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
index 992eae3c7c..7bea095520 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
@@ -105,7 +105,7 @@ public class BalokWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -115,7 +115,7 @@ public class BalokWarzone extends AbstractInstance
 				takeItems(player, PRISON_KEY, -1);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
index 6684b9b04c..ce39ed9b22 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
@@ -72,7 +72,7 @@ public class BaylorWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -124,7 +124,7 @@ public class BaylorWarzone extends AbstractInstance
 				player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index b5a24845bb..3748875859 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -126,7 +126,7 @@ public class Beleth extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -536,7 +536,7 @@ public class Beleth extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
index e2770b5bec..b768e563e9 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
@@ -49,7 +49,7 @@ public class Wormhole extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Core/Core.java
index 344ad52a0a..34584c31c3 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -143,7 +143,7 @@ public class Core extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
@@ -162,7 +162,7 @@ public class Core extends AbstractNpcAI
 			_minions.forEach(Attackable::decayMe);
 			_minions.clear();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
index 859e6fc695..ed664b4197 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
@@ -65,7 +65,7 @@ public class IceQueensCastle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class IceQueensCastle extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
index a07501ed22..9f3772a47d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
@@ -160,7 +160,7 @@ public class IceQueensCastleBattle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterEasy"))
 		{
@@ -700,7 +700,7 @@ public class IceQueensCastleBattle extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
index 7fa44d08d6..21e250c482 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
@@ -45,7 +45,7 @@ public class Jinia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
index 62de6736d0..3a3ddc74e7 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
@@ -165,7 +165,7 @@ public class LastImperialTomb extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
index 282b9f8fbc..254c891bc5 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
@@ -62,7 +62,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Helios/Helios.java
index d6de973ec6..8288e0626c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Helios/Helios.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Helios/Helios.java
@@ -320,7 +320,7 @@ public class Helios extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Helios/Helios1.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Helios/Helios1.java
index 7eb394719d..5d2364fbc0 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Helios/Helios1.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Helios/Helios1.java
@@ -45,7 +45,7 @@ public class Helios1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -58,7 +58,7 @@ public class Helios1 extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Helios/Helios2.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Helios/Helios2.java
index 2147bd52c0..abe0cc400e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Helios/Helios2.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Helios/Helios2.java
@@ -45,7 +45,7 @@ public class Helios2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -58,7 +58,7 @@ public class Helios2 extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Helios/Helios3.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Helios/Helios3.java
index 364dce85de..8e293ad2a4 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Helios/Helios3.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Helios/Helios3.java
@@ -46,7 +46,7 @@ public class Helios3 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -59,7 +59,7 @@ public class Helios3 extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java
index 404237e0fa..29b64fa20b 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java
@@ -44,7 +44,7 @@ public class RoyalArchmageMinion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class RoyalArchmageMinion extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
index e4260628ce..d61884c91b 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
@@ -92,7 +92,7 @@ public class IstinaCavern extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance instance = npc.getInstanceWorld();
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
index 27728f34c1..f1945e2def 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
@@ -40,7 +40,7 @@ public class Rumiese extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
index b94d17f47b..ae0e6aaef9 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
@@ -141,7 +141,7 @@ public class Kelbim extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -281,7 +281,7 @@ public class Kelbim extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
index 9f677053b2..c3e066a466 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
@@ -137,7 +137,7 @@ public class KimerianCommon extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance instance = npc.getInstanceWorld();
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
index 8d618ecd4f..f0d8652322 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
@@ -387,7 +387,7 @@ public class Lilith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -501,7 +501,7 @@ public class Lilith extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
index 5b16c333e2..ced833a889 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
@@ -49,7 +49,7 @@ public class KatoSicanus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
index 2bd8aeb2c6..7dacdd2c16 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
@@ -674,7 +674,7 @@ public class Lindvior extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
index 73d5d88407..f676f620a3 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
@@ -49,7 +49,7 @@ public class Vortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -110,7 +110,7 @@ public class Vortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java
index 190f1ce9ea..02f57b1bd5 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java
@@ -59,7 +59,7 @@ public class Lydia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
index 49a224c8bc..8c7d0eb77d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
@@ -122,7 +122,7 @@ public class OctavisWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -146,7 +146,7 @@ public class OctavisWarzone extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index e74bc817e6..11c8477773 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -180,7 +180,7 @@ public class Orfen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -263,7 +263,7 @@ public class Orfen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 93735c996b..72e174bb65 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -155,7 +155,7 @@ public class QueenAnt extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -239,7 +239,7 @@ public class QueenAnt extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
index 7a3322b68a..297948d172 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
@@ -53,7 +53,7 @@ public class QueenShyeed extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java
index 2f0966fa1d..7b29e5a344 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java
@@ -149,7 +149,7 @@ public class Ramona extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -377,7 +377,7 @@ public class Ramona extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
index ad87d93fe0..20e1572d8a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
@@ -80,7 +80,7 @@ public class Sailren extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -249,7 +249,7 @@ public class Sailren extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
index 02f0987432..ee16f1920f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
@@ -74,7 +74,7 @@ public class Cannon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
index f754206b22..45b4c89ee7 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
@@ -62,7 +62,7 @@ public class TautiWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -170,7 +170,7 @@ public class TautiWarzone extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
index 50da94c8b2..f973bf0e12 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
@@ -182,7 +182,7 @@ public class TeredorWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
index 7b07413999..63b2c0589a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
@@ -507,7 +507,7 @@ public class Stage1 extends AbstractInstance implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
index 70d36f9c61..d2abf63365 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
@@ -50,7 +50,7 @@ public class Daichir extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterEarthWyrnCave"))
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
index e69a688d77..2c365d7f61 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
@@ -570,7 +570,7 @@ public class Trasken extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -694,7 +694,7 @@ public class Trasken extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index 74f7b64063..4eaf667f0a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -191,7 +191,7 @@ public class Valakas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -380,7 +380,7 @@ public class Valakas extends AbstractNpcAI
 		{
 			BOSS_ZONE.oustAllPlayers();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
index a211f7bfc0..bae4d63898 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
@@ -172,7 +172,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter60"))
 		{
@@ -254,7 +254,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/AdenReconstructorManager.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
index efa4bfa6ca..65a08050b6 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
@@ -42,7 +42,7 @@ public class AdenReconstructorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -67,7 +67,7 @@ public class AdenReconstructorManager extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
index 44c53756e4..8ccc667fd0 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
@@ -143,7 +143,7 @@ public class AdventureGuildsman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
index 3c31c32b91..ee742bab33 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
@@ -65,7 +65,7 @@ public class AdventurersGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
index 8bb8061495..3428520002 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
@@ -53,7 +53,7 @@ public class AlchemistManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index b939ece983..849ed827d3 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -63,7 +63,7 @@ public class ArenaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -128,7 +128,7 @@ public class ArenaManager extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
index 1c51b94358..352c31c8fc 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
@@ -38,7 +38,7 @@ public class BlackJudge extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("weakenBreath"))
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
index d35adf8706..e203aecd5e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
@@ -42,7 +42,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equals("31092-01.html"))
@@ -79,7 +79,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 			giveAdena(player, count, false);
 			return "31092-04.html";
 		}
-		return super.onAdvEvent(htmltext, npc, player);
+		return super.onEvent(htmltext, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
index 6a44d63e0b..81e90f2d67 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
@@ -56,7 +56,7 @@ public class CastleAmbassador extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
index b07792cd2d..11b8786523 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
@@ -57,7 +57,7 @@ public class CastleBlacksmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return (event.equalsIgnoreCase(npc.getId() + "-02.html") && hasRights(player, npc)) ? event : null;
 	}
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
index 355012ffea..5385531356 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
@@ -393,7 +393,7 @@ public class CastleChamberlain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Castle castle = npc.getCastle();
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
index 3e2cd16930..4a8fac8c0e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
@@ -140,7 +140,7 @@ public class CastleCourtMagician extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player.getClan() == null) && (player.getClanId() != npc.getCastle().getOwnerId()))
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
index b9c1f3faf5..70bae86615 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
@@ -72,7 +72,7 @@ public class CastleDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
index bb32dde319..a319e3977f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
@@ -56,7 +56,7 @@ public class CastleMercenaryManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index ac71c1afad..0e8137bb1d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -78,7 +78,7 @@ public class CastleTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
@@ -168,7 +168,7 @@ public class CastleTeleporter extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
index bffed40bcc..ea1b40c41c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
@@ -52,7 +52,7 @@ public class CastleWarehouse extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final boolean isMyLord = player.isClanLeader() && (player.getClan().getCastleId() == (npc.getCastle() != null ? npc.getCastle().getResidenceId() : -1));
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index f1c43a8aaa..f5f4d8caa7 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -64,7 +64,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
index a86581206e..afd7250ca4 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
@@ -57,7 +57,7 @@ public class ClanHallDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 51ff62c312..4da19f2400 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -107,7 +107,7 @@ public class ClanHallManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
index 1d8e114daa..77845525b2 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
@@ -68,7 +68,7 @@ public class ClanTrader extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index ca48b6b231..551a1bd767 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -235,7 +235,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		if (!_isEnabled)
 		{
@@ -936,7 +936,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	{
 		if (event.getCommand().startsWith("Quest ClassMaster "))
 		{
-			final String html = onAdvEvent(event.getCommand().substring(18), null, event.getPlayer());
+			final String html = onEvent(event.getCommand().substring(18), null, event.getPlayer());
 			event.getPlayer().sendPacket(TutorialCloseHtml.STATIC_PACKET);
 			showResult(event.getPlayer(), html);
 		}
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
index 21aafa7e87..7b61214c91 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
@@ -43,7 +43,7 @@ public class CrimsonHatuOtis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -69,7 +69,7 @@ public class CrimsonHatuOtis extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java
index e1f6de3c80..c66ba04bfe 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java
@@ -73,7 +73,7 @@ public class DimensionalMerchant extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/DivineBeast.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/DivineBeast.java
index 1f247a7b35..3f3a076992 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/DivineBeast.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/DivineBeast.java
@@ -44,7 +44,7 @@ public class DivineBeast extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player == null) || !player.hasServitors())
 		{
@@ -55,7 +55,7 @@ public class DivineBeast extends AbstractNpcAI
 			cancelQuestTimer(event, npc, player);
 			player.getServitors().values().forEach(summon -> summon.unSummon(player));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/EnergySeeds.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/EnergySeeds.java
index 509c12bbeb..befbad7bff 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/EnergySeeds.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/EnergySeeds.java
@@ -196,7 +196,7 @@ public class EnergySeeds extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("StartSoDAi"))
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/FameManager/FameManager.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/FameManager/FameManager.java
index d4f16a9b96..b0a7bc0a20 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/FameManager/FameManager.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/FameManager/FameManager.java
@@ -49,7 +49,7 @@ public class FameManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
index 79742f7171..c5a075fbcf 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
@@ -69,7 +69,7 @@ public class FortressSiegeManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
index 344d4c5547..db32dd6f2b 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
@@ -67,7 +67,7 @@ public class HealerTrainer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
index 94b2f5f16d..2b2e0d3c40 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
@@ -89,7 +89,7 @@ public class HermuncusMinion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(eventValue, " ");
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
index 2928fbd023..abe98a50e5 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
@@ -47,7 +47,7 @@ public class LaVieEnRose extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/Mammons/Mammons.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/Mammons/Mammons.java
index 3ff005b72b..f58c7b8b86 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/Mammons/Mammons.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/Mammons/Mammons.java
@@ -79,12 +79,12 @@ public class Mammons extends AbstractNpcAI
 		addTalkId(MAMMONS);
 		addFirstTalkId(MAMMONS);
 		
-		onAdvEvent("RESPAWN_MAMMONS", null, null);
+		onEvent("RESPAWN_MAMMONS", null, null);
 		startQuestTimer("RESPAWN_MAMMONS", TELEPORT_DELAY, null, null, true);
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
index 8d38a27541..6763b0367c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
@@ -71,7 +71,7 @@ public class ManorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
index 0ef47a4ae0..efd307540c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
@@ -145,7 +145,7 @@ public class MentorGuide extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("exchange"))
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/Minigame/Minigame.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/Minigame/Minigame.java
index 14e3f84dbd..3971049085 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/Minigame/Minigame.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/Minigame/Minigame.java
@@ -68,7 +68,7 @@ public class Minigame extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final MinigameRoom room = getRoomByManager(npc);
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
index fe59e53b0b..a020799422 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
@@ -79,7 +79,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/MysteriousWizard/MysteriousWizard.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/MysteriousWizard/MysteriousWizard.java
index 2c423c6490..667463de4d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/MysteriousWizard/MysteriousWizard.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/MysteriousWizard/MysteriousWizard.java
@@ -41,7 +41,7 @@ public class MysteriousWizard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return event.equals("33980-01.html") ? event : null;
 	}
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
index 4ad7e0a2fc..d3576b9fff 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
@@ -48,14 +48,14 @@ public class NornilTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("teleport_"))
 		{
 			final int locId = Integer.parseInt(event.replace("teleport_", ""));
 			player.teleToLocation(LOCATIONS[locId - 1]);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
index d3feff3b2f..42cfbf60d0 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
@@ -69,7 +69,7 @@ public class OlyBuffer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index 16d309eed4..a6fed0f973 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -88,7 +88,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/PrisonGuards.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/PrisonGuards.java
index 4084beddca..c79356a1f0 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/PrisonGuards.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/PrisonGuards.java
@@ -53,7 +53,7 @@ public class PrisonGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CLEAR_STATUS"))
 		{
@@ -67,7 +67,7 @@ public class PrisonGuards extends AbstractNpcAI
 			}
 			startQuestTimer("CHECK_HOME", 30000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
index 21d281c6c9..435f293345 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
@@ -84,7 +84,7 @@ public class Proclaimer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("giveBuff"))
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
index 8b3515e12b..83098c1eaf 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
@@ -79,7 +79,7 @@ public class ProvisionalHalls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/Servitors/SinEater.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/Servitors/SinEater.java
index 1ed8d645a5..d7536614e8 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/Servitors/SinEater.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/Servitors/SinEater.java
@@ -48,7 +48,7 @@ public class SinEater extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TALK") && (player != null) && (player.getPet() != null))
 		{
@@ -79,7 +79,7 @@ public class SinEater extends AbstractNpcAI
 			}
 			startQuestTimer("TALK", 60000, null, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_CREATURE_DEATH)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
index ec177e537e..373c64200b 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
@@ -128,7 +128,7 @@ public class SupportUnitCaptain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int fortOwner = npc.getFort().getOwnerClan() == null ? 0 : npc.getFort().getOwnerClan().getId();
 		if ((player.getClan() == null) || (player.getClanId() != fortOwner))
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
index f6d1e74529..a733b87dad 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
@@ -53,7 +53,7 @@ public class SymbolMaker extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
index f9cd32a0dd..82ec9274c2 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
@@ -94,7 +94,7 @@ public class TeleportToUndergroundColiseum extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.endsWith(".htm"))
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
index dbe26ae6a3..7052b10367 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
@@ -75,7 +75,7 @@ public class TersisHerald extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("giveBuff"))
 		{
@@ -87,7 +87,7 @@ public class TersisHerald extends AbstractNpcAI
 			npc.setTarget(player);
 			npc.doCast(DRAGON_BUFF.getSkill());
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java
index 3c46f755ca..c2f0970ccc 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java
@@ -58,7 +58,7 @@ public class TrainingCamp extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (!Config.TRAINING_CAMP_ENABLE || !checkConditions(player))
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
index 8e94950d76..520a057481 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
@@ -62,7 +62,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = "";
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
index 9924fb4ace..0a6b873028 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
@@ -85,7 +85,7 @@ public class ClassTransferTalk extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/WarriorFishingBlock.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
index 56b29fee5b..78e3d1c99e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
@@ -75,7 +75,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -104,7 +104,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
index b9439eb0ec..a1878b037b 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
@@ -156,7 +156,7 @@ public class WeaverOlf extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.contains("_grade_"))
 		{
@@ -185,7 +185,7 @@ public class WeaverOlf extends AbstractNpcAI
 			}
 			else
 			{
-				return super.onAdvEvent(event, npc, player);
+				return super.onEvent(event, npc, player);
 			}
 			
 			if (hasQuestItems(player, itemIds[0]))
@@ -225,7 +225,7 @@ public class WeaverOlf extends AbstractNpcAI
 			{
 				return npc.getId() + "-no.htm";
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		return event;
 	}
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index 777998cde4..48bf41ab6d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -210,7 +210,7 @@ public class WyvernManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
index 0c2e7586c9..c49be5297b 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
@@ -36,7 +36,7 @@ public class DelevelManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.DELEVEL_MANAGER_ENABLED)
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
index 5eaddb78ba..76b7f1e559 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
@@ -54,7 +54,7 @@ public class FactionSystem extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class FactionSystem extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
index 8b9c676ad5..771c8a9058 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
@@ -34,7 +34,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -77,7 +77,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 				npc.broadcastInfo(); // update flag status
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
index e6fdc75e16..7423521604 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
@@ -70,7 +70,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("AUTOBUFF") && (npc != null) && !npc.isDead())
 		{
@@ -98,7 +98,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
 			}
 			startQuestTimer("AUTOBUFF", 30000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
index f19aa0cb6f..447c512987 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
@@ -39,7 +39,7 @@ public class NoblessMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.NOBLESS_MASTER_ENABLED)
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
index 370e9a1ced..3488295c5a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
@@ -163,7 +163,7 @@ public class Deathmatch extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
index 1eb84eca93..b92bbe7f77 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
@@ -213,7 +213,7 @@ public class Rabbits extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/events/Race/Race.java
index ff9fc462f6..6ac325ca6f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/events/Race/Race.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/events/Race/Race.java
@@ -320,7 +320,7 @@ public class Race extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 68f87b19cb..e38ed4d256 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -182,7 +182,7 @@ public class TvT extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
index 77c055cc79..84a2d7763d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
@@ -45,7 +45,7 @@ public class BirthOfDraco extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
index 9bc0ff9c55..87ac868dc7 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
@@ -64,7 +64,7 @@ public class CharacterBirthday extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("despawn_npc"))
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index a966bdff3e..4648d78f95 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -56,7 +56,7 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
index a8f534ca97..76c5aa611f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
@@ -73,7 +73,7 @@ public class FreyaCelebration extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("give_potion"))
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
index b45e872a60..2570ef061a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
@@ -86,7 +86,7 @@ public class GiftOfVitality extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
index aa5419e179..76aaa4ab09 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
@@ -59,7 +59,7 @@ public class HeavyMedal extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		int level = checkLevel(player);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/HungryHorse/HungryHorse.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
index 5232662a42..44000b61a0 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
@@ -60,7 +60,7 @@ public class HungryHorse extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
index 6107af7f71..502fce9a30 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
@@ -55,7 +55,7 @@ public class HuntForSanta extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/LetterCollector/LetterCollector.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
index 744b1f2ae4..d87bd82b02 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
@@ -123,7 +123,7 @@ public class LetterCollector extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
index b71176a555..a42e986ee4 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
@@ -49,7 +49,7 @@ public class LoveYourGatekeeper extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
index c868fad2b3..6460eb4ab0 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
@@ -61,7 +61,7 @@ public class LoversJubilee extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmtext = event;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
index dd6b8696a7..b73bce80f1 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
@@ -68,7 +68,7 @@ public class MasterOfEnchanting extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("buy_staff"))
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/RedLibra/RedLibra.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/RedLibra/RedLibra.java
index 69414f20c6..693f2efd18 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/RedLibra/RedLibra.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/RedLibra/RedLibra.java
@@ -42,7 +42,7 @@ public class RedLibra extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
index f6c714eddc..7d3462224b 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
@@ -58,7 +58,7 @@ public class RudolphsBlessing extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("rudolph_eat") && (player != null) && player.isOnline())
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
index 3f076fc92b..17ff961002 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
@@ -297,7 +297,7 @@ public class SavingSanta extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!isEventPeriod())
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
index 5c00677d25..862a8df578 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
@@ -51,7 +51,7 @@ public class ThePowerOfLove extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
index 53e011000c..e87126ed19 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
@@ -129,7 +129,7 @@ public class AltarOfShilen extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (event.equals("enterInstance"))
@@ -265,7 +265,7 @@ public class AltarOfShilen extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
index 4fcc21b412..56b8393b3a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
@@ -154,7 +154,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -269,7 +269,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
index d804da8ba1..1d83951eff 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
@@ -467,7 +467,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
index 1100b43aee..80911f4423 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
@@ -72,7 +72,7 @@ public class ChamberOfProphecies extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
index 4f0f2f7a19..b815b5bae7 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
@@ -177,7 +177,7 @@ public class ChamberOfDelusion extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CommandPost/CommandPost.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CommandPost/CommandPost.java
index 23da57e021..4a68caa376 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CommandPost/CommandPost.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CommandPost/CommandPost.java
@@ -105,7 +105,7 @@ public class CommandPost extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
index ff860c70bb..c8bed455cc 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
@@ -114,13 +114,13 @@ public class CrystalCavernsCoralGarden extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
index 6db8525e11..46f3d2fdf6 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
@@ -79,13 +79,13 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
index c51b5d7887..121e3a89f4 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
@@ -135,13 +135,13 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
index 72d2fe0f6f..58eec2329b 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
@@ -122,7 +122,7 @@ public class DarkCloudMansion extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
index 00241b7b77..4f4fade41e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
@@ -45,7 +45,7 @@ public class DimensionMakkum extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = getPlayerInstance(player);
 		switch (event)
@@ -69,7 +69,7 @@ public class DimensionMakkum extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
index 605b8ebdf8..981a91d4a7 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
@@ -53,13 +53,13 @@ public class DimensionalArchon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), getRandomEntry(ARCHON_MSG)));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
index 176ee5b803..9243451cde 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
@@ -53,7 +53,7 @@ public class DimensionalTrap extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || npc.isAlikeDead())
 		{
@@ -102,7 +102,7 @@ public class DimensionalTrap extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
index 4da8316b88..5b922b7ecd 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
@@ -115,7 +115,7 @@ public class DimensionalWrap extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
index 8211e90098..4d937103a7 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
@@ -45,7 +45,7 @@ public class EvasHiddenSpace extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = player.getQuestState(Q10369_NoblesseSoulTesting.class.getSimpleName());
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
index 98e2ac0c8b..a40e7e3c88 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
@@ -195,12 +195,12 @@ public class EvilIncubator extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player);
 		if ((st == null) || !st.isStarted())
 		{
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java
index d0098998c9..429e0ddd64 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java
@@ -69,7 +69,7 @@ public class FaeronTrainingGrounds1 extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(Q10735_ASpecialPower.class.getSimpleName());
 		String htmltext = null;
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java
index 299468b58f..485d2168fc 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java
@@ -68,7 +68,7 @@ public class FaeronTrainingGrounds2 extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(Q10736_ASpecialPower.class.getSimpleName());
 		String htmltext = null;
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
index 6d58bd6eb4..1477e297c5 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
@@ -59,7 +59,7 @@ public class FortressOfTheDead extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/Fortuna/Fortuna.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/Fortuna/Fortuna.java
index 339328eea4..ef7b65659f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/Fortuna/Fortuna.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/Fortuna/Fortuna.java
@@ -51,7 +51,7 @@ public class Fortuna extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -472,7 +472,7 @@ public class Fortuna extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
index ef73cf3920..a205145189 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
@@ -119,7 +119,7 @@ public class HarnakUndergroundRuins extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
index 598a7460c7..c7180064eb 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
@@ -642,7 +642,7 @@ public class Kamaloka extends AbstractInstance
 	 * Handles only player's enter, single parameter - integer kamaloka index
 	 */
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java
index 7a8f1aa4b3..ef3b1ae1ba 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java
@@ -48,7 +48,7 @@ public class KaraphonHabitat extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(Q10745_TheSecretIngredients.class.getSimpleName());
 		if (qs != null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
index cccdf5d51f..4db13d5b98 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
@@ -195,7 +195,7 @@ public class KartiasLabyrinth extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -268,7 +268,7 @@ public class KartiasLabyrinth extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java
index defddc2e63..4a871ec80d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java
@@ -95,7 +95,7 @@ public class LabyrinthOfBelis extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter_instance"))
 		{
@@ -209,7 +209,7 @@ public class LabyrinthOfBelis extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java
index 0284ac988f..7f88562bc4 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java
@@ -61,7 +61,7 @@ public class MithrilMine extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -108,7 +108,7 @@ public class MithrilMine extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java
index 8477e30897..7a34ab8b3c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java
@@ -127,13 +127,13 @@ public class MuseumDungeon extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter_instance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
index f83f2fcec1..024065f4e9 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
@@ -83,7 +83,7 @@ public class MysticTavern extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
index 48ee563ff5..56d62a42d1 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
@@ -81,7 +81,7 @@ public class StoryOfFreya extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance world = npc.getInstanceWorld();
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
index e21d937eb6..d1d82fe8d7 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
@@ -107,7 +107,7 @@ public class StoryOfTauti extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		switch (event)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
index 150d8f3496..acd2b4b1f7 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
@@ -67,7 +67,7 @@ public class NightmareKamaloka extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -132,7 +132,7 @@ public class NightmareKamaloka extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
index 68ff2fba1b..d91167b4bb 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
@@ -93,7 +93,7 @@ public class NornilsGarden extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (isInInstance(world))
@@ -157,7 +157,7 @@ public class NornilsGarden extends AbstractInstance
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/Nursery/Nursery.java
index 2e394a7446..9042632611 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/Nursery/Nursery.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/Nursery/Nursery.java
@@ -192,7 +192,7 @@ public class Nursery extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance instance = npc.getInstanceWorld();
 		if (isInInstance(instance))
@@ -269,7 +269,7 @@ public class Nursery extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
index 8ddaa9cd0f..f78f43a9dc 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
@@ -101,7 +101,7 @@ public class PailakaDevilsLegacy extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter"))
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java
index b9b2064a77..07fcb7c67b 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java
@@ -139,7 +139,7 @@ public class PailakaInjuredDragon extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = player.getQuestState(Q00144_PailakaInjuredDragon.class.getSimpleName());
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
index 5f1d771719..64f2155310 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
@@ -105,7 +105,7 @@ public class PailakaRuneCastle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
index 00fb1c9096..7b25c61e9d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
@@ -63,7 +63,7 @@ public class PailakaSongOfIceAndFire extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -102,7 +102,7 @@ public class PailakaSongOfIceAndFire extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
index 422cbc96a0..48039ff29e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
@@ -173,7 +173,7 @@ public class PrisonOfDarkness extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -313,7 +313,7 @@ public class PrisonOfDarkness extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java
index c72d9b8646..da8c6e785c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java
@@ -162,7 +162,7 @@ public class SSQDisciplesNecropolisPast extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = player.getInstanceWorld();
 		if (world != null)
@@ -264,7 +264,7 @@ public class SSQDisciplesNecropolisPast extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java
index be0450dd2e..b4d398e7d9 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java
@@ -63,7 +63,7 @@ public class SSQLibraryOfSages extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = player.getInstanceWorld();
 		if (world != null)
@@ -103,7 +103,7 @@ public class SSQLibraryOfSages extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java
index e378631253..4b2f28016a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java
@@ -126,7 +126,7 @@ public class SSQMonasteryOfSilence extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = player.getInstanceWorld();
 		if (world != null)
@@ -218,7 +218,7 @@ public class SSQMonasteryOfSilence extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/SSQSanctumOftheLordsOfDawn/SSQSanctumOftheLordsOfDawn.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/SSQSanctumOftheLordsOfDawn/SSQSanctumOftheLordsOfDawn.java
index 9a84142109..863594e558 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/SSQSanctumOftheLordsOfDawn/SSQSanctumOftheLordsOfDawn.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/SSQSanctumOftheLordsOfDawn/SSQSanctumOftheLordsOfDawn.java
@@ -89,7 +89,7 @@ public class SSQSanctumOftheLordsOfDawn extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -126,7 +126,7 @@ public class SSQSanctumOftheLordsOfDawn extends AbstractInstance
 				player.teleToLocation(SAVE_POINT[npc.getScriptValue()]);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java
index dfb00caae2..d5bece244e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java
@@ -196,13 +196,13 @@ public class TaintedDimension extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java
index b0f641adfe..1c74f89fdf 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java
@@ -60,7 +60,7 @@ public class TalkingIslandPast extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -74,7 +74,7 @@ public class TalkingIslandPast extends AbstractInstance
 				teleportPlayerOut(player, world);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
index e4f0fea409..0aa8f7b0be 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
@@ -46,7 +46,7 @@ public class Q00013_ParcelDelivery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
index a9332344fe..5772a2064d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
@@ -44,7 +44,7 @@ public class Q00015_SweetWhispers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
index d825925804..37d92fabd2 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
@@ -53,7 +53,7 @@ public class Q00016_TheComingDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
index 4a1a62c19a..0e0ef5512d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
@@ -52,7 +52,7 @@ public class Q00017_LightAndDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
index c8de373b1f..cb246e0b70 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
@@ -47,7 +47,7 @@ public class Q00019_GoToThePastureland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
index 8467c0a18f..b161006570 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
@@ -44,7 +44,7 @@ public class Q00020_BringUpWithLove extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
index c1ede03985..b885fa960d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
@@ -56,7 +56,7 @@ public class Q00031_SecretBuriedInTheSwamp extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
index ab85113705..02fd7814dd 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
@@ -64,7 +64,7 @@ public class Q00032_AnObviousLie extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
index 346e21ba51..3e17f3d69c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
@@ -53,7 +53,7 @@ public class Q00033_MakeAPairOfDressShoes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
index 30988810b7..32c4a3f461 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
@@ -61,7 +61,7 @@ public class Q00034_InSearchOfCloth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
index c9b8b6e19c..c2d6566765 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
@@ -57,7 +57,7 @@ public class Q00035_FindGlitteringJewelry extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
index e3bd0e5753..73ae6c433d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
@@ -53,7 +53,7 @@ public class Q00036_MakeASewingKit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
index 78660c7498..29c1bd2863 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
@@ -54,7 +54,7 @@ public class Q00037_MakeFormalWear extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
index 5c4d3d5074..c4274aa035 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
@@ -50,7 +50,7 @@ public class Q00040_ASpecialOrder extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
index 100213b849..fe31a6ab4e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
@@ -54,7 +54,7 @@ public class Q00042_HelpTheUncle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
index 9d5f9265df..a5d1225fca 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
@@ -60,7 +60,7 @@ public class Q00043_HelpTheSister extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
index 7cc6c0f337..a13197fc21 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
@@ -55,7 +55,7 @@ public class Q00044_HelpTheSon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java
index 40f94bc778..f5e2c90ed0 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java
@@ -43,7 +43,7 @@ public class Q00061_LawEnforcement extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
index 497ede1a1b..2f336b06fd 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
@@ -44,7 +44,7 @@ public class Q00109_InSearchOfTheNest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
index 15340bee9a..14c25c7237 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
@@ -43,7 +43,7 @@ public class Q00110_ToThePrimevalIsle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java
index 107f5789b6..f03064394b 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java
@@ -85,7 +85,7 @@ public class Q00111_ElrokianHuntersProof extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
index 61b544f2f0..6d23e5039b 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
@@ -54,7 +54,7 @@ public class Q00115_TheOtherSideOfTruth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
index 720f90157c..7701c4bef7 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
@@ -44,7 +44,7 @@ public class Q00119_LastImperialPrince extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
index 84e03ee2a4..cdaa5c33f0 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
@@ -46,7 +46,7 @@ public class Q00124_MeetingTheElroki extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
index 0f59ea74d7..34b0e7404d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
@@ -77,7 +77,7 @@ public class Q00125_TheNameOfEvil1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
index c880bfcd78..2cdaa0aa91 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
@@ -55,7 +55,7 @@ public class Q00126_TheNameOfEvil2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
index 452b42393c..e923610ac9 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
@@ -82,7 +82,7 @@ public class Q00128_PailakaSongOfIceAndFire extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java
index 8afec644ae..f60ce01f79 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java
@@ -68,7 +68,7 @@ public class Q00129_PailakaDevilsLegacy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
index 3b340ac633..7d7eeb1bf5 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
@@ -72,7 +72,7 @@ public class Q00134_TempleMissionary extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
index b16e0481cc..c9771f6f78 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
@@ -70,7 +70,7 @@ public class Q00135_TempleExecutor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
index 62a45e847c..7e8051404a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
@@ -82,7 +82,7 @@ public class Q00136_MoreThanMeetsTheEye extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
index ffd1206433..f9ecfc2056 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
@@ -56,7 +56,7 @@ public class Q00137_TempleChampionPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
index 25dc2dc925..6a75d8880b 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
@@ -58,7 +58,7 @@ public class Q00138_TempleChampionPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
index df1521d00e..ff220cfb81 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
@@ -59,7 +59,7 @@ public class Q00139_ShadowFoxPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
index 2a37d17413..a168e639b0 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
@@ -68,7 +68,7 @@ public class Q00140_ShadowFoxPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
index c9b1f579f9..0df4d73fda 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
@@ -63,7 +63,7 @@ public class Q00141_ShadowFoxPart3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player, false);
 		if (st == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
index 0c1af718d5..78fb0e0b32 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
@@ -73,7 +73,7 @@ public class Q00142_FallenAngelRequestOfDawn extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
index 78a954764d..9d44b1bc42 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
@@ -52,7 +52,7 @@ public class Q00143_FallenAngelRequestOfDusk extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java
index 8f024cd03b..686696b998 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java
@@ -99,7 +99,7 @@ public class Q00144_PailakaInjuredDragon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java
index e22a0075dd..856ecd88b0 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java
@@ -53,7 +53,7 @@ public class Q00146_TheZeroHour extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java
index f197dee99a..44145d4eed 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java
@@ -50,7 +50,7 @@ public class Q00149_PrimalMotherIstina extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java
index 04ab71a2eb..2d50cdf25e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java
@@ -49,7 +49,7 @@ public class Q00150_ExtremeChallengePrimalMotherResurrected extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
index 22ae037b8c..55261fadf8 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
@@ -69,7 +69,7 @@ public class Q00177_SplitDestiny extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00180_InfernalFlamesBurningInCrystalPrison/Q00180_InfernalFlamesBurningInCrystalPrison.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00180_InfernalFlamesBurningInCrystalPrison/Q00180_InfernalFlamesBurningInCrystalPrison.java
index 3aadc906fe..7a005c6b00 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00180_InfernalFlamesBurningInCrystalPrison/Q00180_InfernalFlamesBurningInCrystalPrison.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00180_InfernalFlamesBurningInCrystalPrison/Q00180_InfernalFlamesBurningInCrystalPrison.java
@@ -53,7 +53,7 @@ public class Q00180_InfernalFlamesBurningInCrystalPrison extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java
index a325fcb987..d44207205c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java
@@ -54,7 +54,7 @@ public class Q00181_DevilsStrikeBackAdventOfBalok extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java
index 2c9337e950..cf6321781b 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java
@@ -47,7 +47,7 @@ public class Q00183_RelicExploration extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java
index 56fa89ac7f..416ef1fbd8 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java
@@ -54,7 +54,7 @@ public class Q00184_ArtOfPersuasion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java
index f98dd20667..5a3e22a29c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java
@@ -54,7 +54,7 @@ public class Q00185_NikolasCooperation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java
index e02899fc82..bc04a591e4 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java
@@ -68,7 +68,7 @@ public class Q00186_ContractExecution extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java
index 9c540f6338..a2460cb6c8 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java
@@ -49,7 +49,7 @@ public class Q00187_NikolasHeart extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java
index 1c1777caec..47b0cf65fc 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java
@@ -52,7 +52,7 @@ public class Q00188_SealRemoval extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java
index 5af9afe0fd..68da52d09c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java
@@ -49,7 +49,7 @@ public class Q00189_ContractCompletion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java
index 898d20eee3..45237f5fde 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java
@@ -46,7 +46,7 @@ public class Q00190_LostDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java
index ebc1748aa6..5fcd0f8944 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java
@@ -49,7 +49,7 @@ public class Q00191_VainConclusion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java
index 07c28bdb93..88b7048a5f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java
@@ -52,7 +52,7 @@ public class Q00192_SevenSignsSeriesOfDoubt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
index f81be2e67f..78a292d3d9 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
@@ -66,7 +66,7 @@ public class Q00193_SevenSignsDyingMessage extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == SHILENS_EVIL_THOUGHTS) && "despawn".equals(event))
 		{
@@ -76,7 +76,7 @@ public class Q00193_SevenSignsDyingMessage extends Quest
 				npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.NEXT_TIME_YOU_WILL_NOT_ESCAPE);
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
index 63ec681f3e..1420f8b7af 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
@@ -63,7 +63,7 @@ public class Q00194_SevenSignsMammonsContract extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java
index 4c400a55b1..122ede966b 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java
@@ -62,7 +62,7 @@ public class Q00195_SevenSignsSecretRitualOfThePriests extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java
index 5320deacab..129c02898e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java
@@ -60,14 +60,14 @@ public class Q00196_SevenSignsSealOfTheEmperor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == MERCHANT_OF_MAMMON) && "DESPAWN".equals(event))
 		{
 			isBusy = false;
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THE_ANCIENT_PROMISE_TO_THE_EMPEROR_HAS_BEEN_FULFILLED);
 			npc.deleteMe();
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
index 5dab25e1e5..092819fee0 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
@@ -62,7 +62,7 @@ public class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == SHILENS_EVIL_THOUGHTS) && "despawn".equals(event))
 		{
@@ -72,7 +72,7 @@ public class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
 				npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.NEXT_TIME_YOU_WILL_NOT_ESCAPE);
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
index c026781542..c1400b2fe9 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
@@ -65,7 +65,7 @@ public class Q00198_SevenSignsEmbryo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == SHILENS_EVIL_THOUGHTS) && "despawn".equals(event))
 		{
@@ -75,7 +75,7 @@ public class Q00198_SevenSignsEmbryo extends Quest
 				npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.NEXT_TIME_YOU_WILL_NOT_ESCAPE);
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java
index aaf98cd2ae..3495505fb2 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java
@@ -47,7 +47,7 @@ public class Q00210_ObtainAWolfPet extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java
index d0ea67a785..87a060a1c1 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java
@@ -56,7 +56,7 @@ public class Q00237_WindsOfChange extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java
index 31a6cd6c0f..006525cd6f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java
@@ -58,7 +58,7 @@ public class Q00238_SuccessFailureOfBusiness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java
index 1318b53727..e31a6f3e4f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java
@@ -58,7 +58,7 @@ public class Q00239_WontYouJoinUs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
index b8e21a687e..631714d268 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
@@ -65,7 +65,7 @@ public class Q00240_ImTheOnlyOneYouCanTrust extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java
index cef8901dd4..aec784b926 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java
@@ -77,7 +77,7 @@ public class Q00245_ComeToMe extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player.isMentor() && event.equals("30847-13.html"))
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java
index d563a46c8c..282ad1a84b 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java
@@ -135,7 +135,7 @@ public class Q00254_LegendaryTales extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java
index 5ff293f59c..69d9549a06 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java
@@ -61,7 +61,7 @@ public class Q00270_TheOneWhoEndsSilence extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java
index 74b891182a..812619fff6 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java
@@ -50,7 +50,7 @@ public class Q00278_HomeSecurity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
index 0680c8e1ac..8002b57df8 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
@@ -73,7 +73,7 @@ public class Q00310_OnlyWhatRemains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
index a5a6fafea2..edae9395ac 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
@@ -113,7 +113,7 @@ public class Q00337_AudienceWithTheLandDragon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
index c8a74d6b71..0bbbc76a1c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
@@ -87,7 +87,7 @@ public class Q00344_1000YearsTheEndOfLamentation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java
index ffe42d334e..be857602fe 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java
@@ -86,7 +86,7 @@ public class Q00371_ShrieksOfGhosts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
index e61f3448e2..d5d9f396a3 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
@@ -124,7 +124,7 @@ public class Q00386_StolenDignity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (npc.getId() == WAREHOUSE_KEEPER_ROMP))
@@ -259,7 +259,7 @@ public class Q00386_StolenDignity extends Quest
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private String takeHtml(Player player, QuestState qs, int num)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
index e17419a71e..447c1a9bc0 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
@@ -127,7 +127,7 @@ public class Q00420_LittleWing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
index 6390601ce2..14cbad6537 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
@@ -86,7 +86,7 @@ public class Q00421_LittleWingsBigAdventure extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
index 47fc9d7da4..ee9504f119 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
@@ -54,7 +54,7 @@ public class Q00450_GraveRobberRescue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
index 47e03b544f..e38e415a0a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
@@ -61,7 +61,7 @@ public class Q00451_LuciensAltar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
index 946e2fb51d..be55660c3e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
@@ -50,7 +50,7 @@ public class Q00452_FindingtheLostSoldiers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
index 76ba1205f5..18e37daee3 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
@@ -174,7 +174,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java
index 507820dc6a..0fd000078b 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java
@@ -63,7 +63,7 @@ public class Q00454_CompletelyLost extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
index 6daf2a37e3..f67b20750b 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
@@ -91,7 +91,7 @@ public class Q00455_WingsOfSand extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
index 10f2f47f73..cabd56f883 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
@@ -230,7 +230,7 @@ public class Q00456_DontKnowDontCare extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java
index 524655a0ae..3aa766a77b 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java
@@ -65,7 +65,7 @@ public class Q00457_LostAndFound extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java
index 05ac4029e1..baf20da08a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java
@@ -83,7 +83,7 @@ public class Q00458_PerfectForm extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String noQuest = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00459_TheVillainOfTheUndergroundMineTeredor/Q00459_TheVillainOfTheUndergroundMineTeredor.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00459_TheVillainOfTheUndergroundMineTeredor/Q00459_TheVillainOfTheUndergroundMineTeredor.java
index bcec6a35af..0cf6ea0dcb 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00459_TheVillainOfTheUndergroundMineTeredor/Q00459_TheVillainOfTheUndergroundMineTeredor.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00459_TheVillainOfTheUndergroundMineTeredor/Q00459_TheVillainOfTheUndergroundMineTeredor.java
@@ -51,7 +51,7 @@ public class Q00459_TheVillainOfTheUndergroundMineTeredor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00460_PreciousResearchMaterial/Q00460_PreciousResearchMaterial.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00460_PreciousResearchMaterial/Q00460_PreciousResearchMaterial.java
index fb020c3040..981ff3c14e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00460_PreciousResearchMaterial/Q00460_PreciousResearchMaterial.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00460_PreciousResearchMaterial/Q00460_PreciousResearchMaterial.java
@@ -52,7 +52,7 @@ public class Q00460_PreciousResearchMaterial extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java
index bdda5c0ff1..2092e40879 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java
@@ -71,7 +71,7 @@ public class Q00462_StuffedAncientHeroes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java
index f7dbd2b655..4b978752e6 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java
@@ -87,7 +87,7 @@ public class Q00464_Oath extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00465_WeAreFriends/Q00465_WeAreFriends.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00465_WeAreFriends/Q00465_WeAreFriends.java
index 52d86f67f3..af30a59f5d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00465_WeAreFriends/Q00465_WeAreFriends.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00465_WeAreFriends/Q00465_WeAreFriends.java
@@ -51,7 +51,7 @@ public class Q00465_WeAreFriends extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java
index c350641b85..3eb4b71954 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java
@@ -83,7 +83,7 @@ public class Q00466_PlacingMySmallPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00468_BeLostInTheMysteriousScent/Q00468_BeLostInTheMysteriousScent.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00468_BeLostInTheMysteriousScent/Q00468_BeLostInTheMysteriousScent.java
index d880c919e2..5b347e1276 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00468_BeLostInTheMysteriousScent/Q00468_BeLostInTheMysteriousScent.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00468_BeLostInTheMysteriousScent/Q00468_BeLostInTheMysteriousScent.java
@@ -53,7 +53,7 @@ public class Q00468_BeLostInTheMysteriousScent extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00469_SuspiciousGardener/Q00469_SuspiciousGardener.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00469_SuspiciousGardener/Q00469_SuspiciousGardener.java
index 77e00cc205..c739186b4d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00469_SuspiciousGardener/Q00469_SuspiciousGardener.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00469_SuspiciousGardener/Q00469_SuspiciousGardener.java
@@ -52,7 +52,7 @@ public class Q00469_SuspiciousGardener extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00470_DivinityProtector/Q00470_DivinityProtector.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00470_DivinityProtector/Q00470_DivinityProtector.java
index 73c7cefac0..4948dcf1ee 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00470_DivinityProtector/Q00470_DivinityProtector.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00470_DivinityProtector/Q00470_DivinityProtector.java
@@ -72,7 +72,7 @@ public class Q00470_DivinityProtector extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00471_BreakingThroughTheEmeraldSquare/Q00471_BreakingThroughTheEmeraldSquare.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00471_BreakingThroughTheEmeraldSquare/Q00471_BreakingThroughTheEmeraldSquare.java
index 78f677a640..c563bbad31 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00471_BreakingThroughTheEmeraldSquare/Q00471_BreakingThroughTheEmeraldSquare.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00471_BreakingThroughTheEmeraldSquare/Q00471_BreakingThroughTheEmeraldSquare.java
@@ -50,7 +50,7 @@ public class Q00471_BreakingThroughTheEmeraldSquare extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00472_ChallengeSteamCorridor/Q00472_ChallengeSteamCorridor.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00472_ChallengeSteamCorridor/Q00472_ChallengeSteamCorridor.java
index 69f96d292c..0d36fed463 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00472_ChallengeSteamCorridor/Q00472_ChallengeSteamCorridor.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00472_ChallengeSteamCorridor/Q00472_ChallengeSteamCorridor.java
@@ -50,7 +50,7 @@ public class Q00472_ChallengeSteamCorridor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00473_InTheCoralGarden/Q00473_InTheCoralGarden.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00473_InTheCoralGarden/Q00473_InTheCoralGarden.java
index 3331b4528f..7489bd9a3f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00473_InTheCoralGarden/Q00473_InTheCoralGarden.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00473_InTheCoralGarden/Q00473_InTheCoralGarden.java
@@ -50,7 +50,7 @@ public class Q00473_InTheCoralGarden extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00474_WaitingForTheSummer/Q00474_WaitingForTheSummer.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00474_WaitingForTheSummer/Q00474_WaitingForTheSummer.java
index 51691cc5ff..7d5a64da50 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00474_WaitingForTheSummer/Q00474_WaitingForTheSummer.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00474_WaitingForTheSummer/Q00474_WaitingForTheSummer.java
@@ -59,7 +59,7 @@ public class Q00474_WaitingForTheSummer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java
index 3890d7cd62..d98e0f6ace 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java
@@ -79,7 +79,7 @@ public class Q00476_PlainMission extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00482_RecertificationOfValue/Q00482_RecertificationOfValue.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00482_RecertificationOfValue/Q00482_RecertificationOfValue.java
index 62d524dfd3..35d3fa4406 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00482_RecertificationOfValue/Q00482_RecertificationOfValue.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00482_RecertificationOfValue/Q00482_RecertificationOfValue.java
@@ -131,7 +131,7 @@ public class Q00482_RecertificationOfValue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java
index e15e32b144..c10c564ffb 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java
@@ -68,7 +68,7 @@ public class Q00483_IntendedTactic extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00485_HotSpringWater/Q00485_HotSpringWater.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00485_HotSpringWater/Q00485_HotSpringWater.java
index a35badf96b..6b75b6753e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00485_HotSpringWater/Q00485_HotSpringWater.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00485_HotSpringWater/Q00485_HotSpringWater.java
@@ -62,7 +62,7 @@ public class Q00485_HotSpringWater extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00488_WondersOfCaring/Q00488_WondersOfCaring.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00488_WondersOfCaring/Q00488_WondersOfCaring.java
index a310d9ea60..7f6097ddf1 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00488_WondersOfCaring/Q00488_WondersOfCaring.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00488_WondersOfCaring/Q00488_WondersOfCaring.java
@@ -61,7 +61,7 @@ public class Q00488_WondersOfCaring extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00489_InThisQuietPlace/Q00489_InThisQuietPlace.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00489_InThisQuietPlace/Q00489_InThisQuietPlace.java
index 6da9fd75c7..12cf169210 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00489_InThisQuietPlace/Q00489_InThisQuietPlace.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00489_InThisQuietPlace/Q00489_InThisQuietPlace.java
@@ -58,7 +58,7 @@ public class Q00489_InThisQuietPlace extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java
index 4c6f1e68d7..19f3e9b8c6 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java
@@ -74,7 +74,7 @@ public class Q00490_DutyOfTheSurvivor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00491_InNominePatris/Q00491_InNominePatris.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00491_InNominePatris/Q00491_InNominePatris.java
index 3090a9cabe..915b628983 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00491_InNominePatris/Q00491_InNominePatris.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00491_InNominePatris/Q00491_InNominePatris.java
@@ -63,7 +63,7 @@ public class Q00491_InNominePatris extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00492_TombRaiders/Q00492_TombRaiders.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00492_TombRaiders/Q00492_TombRaiders.java
index e45ffa88ae..78553efafa 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00492_TombRaiders/Q00492_TombRaiders.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00492_TombRaiders/Q00492_TombRaiders.java
@@ -59,7 +59,7 @@ public class Q00492_TombRaiders extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java
index 0ccf941b24..9519660a54 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java
@@ -53,7 +53,7 @@ public class Q00493_KickingOutUnwelcomeGuests extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java
index 0f9eb53194..4084aa0142 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java
@@ -49,7 +49,7 @@ public class Q00494_IncarnationOfGreedZellakaGroup extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java
index ccf3cd1614..e3fe44aa0f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java
@@ -49,7 +49,7 @@ public class Q00495_IncarnationOfJealousyPellineGroup extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java
index 366e0d572d..94df5d6174 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java
@@ -49,7 +49,7 @@ public class Q00496_IncarnationOfGluttonyKaliosGroup extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java
index 008f69dd2f..d1580e694f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java
@@ -49,7 +49,7 @@ public class Q00497_IncarnationOfGreedZellakaSolo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java
index fe6d1060e8..9585452d7d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java
@@ -49,7 +49,7 @@ public class Q00498_IncarnationOfJealousyPellineSolo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java
index 3023aa50c3..3c2e128522 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java
@@ -49,7 +49,7 @@ public class Q00499_IncarnationOfGluttonyKaliosSolo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
index 0bfb256a66..176b40ad56 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
@@ -69,7 +69,7 @@ public class Q00500_BrothersBoundInChains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java
index ffc938563f..9004f3f63d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java
@@ -106,7 +106,7 @@ public class Q00501_ProofOfClanAlliance extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java
index 1496baa0e7..fa050bef5e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java
@@ -85,7 +85,7 @@ public class Q00503_PursuitOfClanAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
index 1badd9d119..840fe1eb90 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
@@ -74,7 +74,7 @@ public class Q00508_AClansReputation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
index 41dec6a58c..dbc9ddda44 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
@@ -68,7 +68,7 @@ public class Q00509_AClansFame extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
index 4a03ad47de..5a3658c28d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
@@ -56,7 +56,7 @@ public class Q00510_AClansPrestige extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
index 8facc4a8cd..6476fcc9c3 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
@@ -71,7 +71,7 @@ public class Q00511_AwlUnderFoot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
index eab4647ba2..31444f8866 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
@@ -58,7 +58,7 @@ public class Q00512_BladeUnderFoot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
index 0348f88e9b..f97ce90a8e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
@@ -50,7 +50,7 @@ public class Q00551_OlympiadStarter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
index 1a59edd6b7..b06358dc78 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
@@ -50,7 +50,7 @@ public class Q00553_OlympiadUndefeated extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
index 295b613316..d362ed8b48 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
@@ -84,7 +84,7 @@ public class Q00617_GatherTheFlames extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
index 22d8a3f362..481380c065 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
@@ -65,7 +65,7 @@ public class Q00618_IntoTheFlame extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
index 24dc552a09..554a65b448 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
@@ -108,7 +108,7 @@ public class Q00620_FourGoblets extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = player.getQuestState(getName());
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
index effc3c81e3..e473202bfa 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
@@ -62,7 +62,7 @@ public class Q00621_EggDelivery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
index 8a857ca301..0aa311db9e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
@@ -62,7 +62,7 @@ public class Q00622_SpecialtyLiquorDelivery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
index a464df7f99..a0ed4ec2a8 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
@@ -66,7 +66,7 @@ public class Q00623_TheFinestFood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
index 335ef36527..882e4a1ad1 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
@@ -78,7 +78,7 @@ public class Q00627_HeartInSearchOfPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
index 79d69e4221..d4e6a5b7a8 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
@@ -88,7 +88,7 @@ public class Q00631_DeliciousTopChoiceMeat extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
index 6ab1e34b5a..f7548f5322 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
@@ -57,7 +57,7 @@ public class Q00641_AttackSailren extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
index 3ad4eb9269..f4030b7e1d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
@@ -66,7 +66,7 @@ public class Q00642_APowerfulPrimevalCreature extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
index 41c5a83b2a..48d241ef82 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
@@ -103,7 +103,7 @@ public class Q00643_RiseAndFallOfTheElrokiTribe extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
index dec61c1331..ac5cb7ff52 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
@@ -59,7 +59,7 @@ public class Q00645_GhostsOfBatur extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
index 6f6013cac1..ff2f3a5bfe 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
@@ -99,7 +99,7 @@ public class Q00648_AnIceMerchantsDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		final QuestState q115 = player.getQuestState(Q00115_TheOtherSideOfTruth.class.getSimpleName());
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
index e012de30f8..b36fd12f72 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
@@ -90,7 +90,7 @@ public class Q00662_AGameOfCards extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
index 3b05df07a2..51e520cc09 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
@@ -153,7 +153,7 @@ public class Q00663_SeductiveWhispers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
index 1dfdc81b32..e1e41ba51e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
@@ -49,7 +49,7 @@ public class Q00688_DefeatTheElrokianRaiders extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
index 0278e46ec2..17895d5c45 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
@@ -69,7 +69,7 @@ public class Q00726_LightWithinTheDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
index da19640964..bd744f7aaa 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
@@ -57,7 +57,7 @@ public class Q00727_HopeWithinTheDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00744_TheAlligatorHunterReturns/Q00744_TheAlligatorHunterReturns.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00744_TheAlligatorHunterReturns/Q00744_TheAlligatorHunterReturns.java
index 4230ffc9be..ec5091f5ff 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00744_TheAlligatorHunterReturns/Q00744_TheAlligatorHunterReturns.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00744_TheAlligatorHunterReturns/Q00744_TheAlligatorHunterReturns.java
@@ -65,7 +65,7 @@ public final class Q00744_TheAlligatorHunterReturns extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00745_TheOutlawsAreIncoming/Q00745_TheOutlawsAreIncoming.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00745_TheOutlawsAreIncoming/Q00745_TheOutlawsAreIncoming.java
index a78b4b775a..2e896b781d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00745_TheOutlawsAreIncoming/Q00745_TheOutlawsAreIncoming.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00745_TheOutlawsAreIncoming/Q00745_TheOutlawsAreIncoming.java
@@ -74,7 +74,7 @@ public class Q00745_TheOutlawsAreIncoming extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00747_DefendingTheForsakenPlains/Q00747_DefendingTheForsakenPlains.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00747_DefendingTheForsakenPlains/Q00747_DefendingTheForsakenPlains.java
index 2bf41c5de2..2ce7479e4a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00747_DefendingTheForsakenPlains/Q00747_DefendingTheForsakenPlains.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00747_DefendingTheForsakenPlains/Q00747_DefendingTheForsakenPlains.java
@@ -69,7 +69,7 @@ public final class Q00747_DefendingTheForsakenPlains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00748_EndlessRevenge/Q00748_EndlessRevenge.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00748_EndlessRevenge/Q00748_EndlessRevenge.java
index b7a4d1bf37..c5186f1275 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00748_EndlessRevenge/Q00748_EndlessRevenge.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00748_EndlessRevenge/Q00748_EndlessRevenge.java
@@ -70,7 +70,7 @@ public final class Q00748_EndlessRevenge extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java
index 9161bfd4b9..31eace47ba 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java
@@ -72,7 +72,7 @@ public class Q00751_LiberatingTheSpirits extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java
index 3c5f3d9861..e22b624bc5 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java
@@ -70,7 +70,7 @@ public class Q00752_UncoverTheSecret extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java
index 6f5853054b..935c3a7c37 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java
@@ -78,7 +78,7 @@ public class Q00753_ReactingToACrisis extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00754_AssistingTheRebelForces/Q00754_AssistingTheRebelForces.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00754_AssistingTheRebelForces/Q00754_AssistingTheRebelForces.java
index efd21fd055..fbbb9eb5c6 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00754_AssistingTheRebelForces/Q00754_AssistingTheRebelForces.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00754_AssistingTheRebelForces/Q00754_AssistingTheRebelForces.java
@@ -54,7 +54,7 @@ public class Q00754_AssistingTheRebelForces extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00755_InNeedOfPetras/Q00755_InNeedOfPetras.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00755_InNeedOfPetras/Q00755_InNeedOfPetras.java
index 20aa2199c8..09d9216654 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00755_InNeedOfPetras/Q00755_InNeedOfPetras.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00755_InNeedOfPetras/Q00755_InNeedOfPetras.java
@@ -67,7 +67,7 @@ public class Q00755_InNeedOfPetras extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java
index 40e84f4dd0..9038173a19 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java
@@ -48,7 +48,7 @@ public class Q00756_TopQualityPetra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java
index 1927ac253f..0b6815a166 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java
@@ -71,7 +71,7 @@ public class Q00757_TriolsMovement extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java
index 0578c5952a..c777c72641 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java
@@ -70,7 +70,7 @@ public class Q00758_TheFallenKingsMen extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00759_TheDwarvenNightmareContinues/Q00759_TheDwarvenNightmareContinues.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00759_TheDwarvenNightmareContinues/Q00759_TheDwarvenNightmareContinues.java
index e0db615674..4715b055c5 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00759_TheDwarvenNightmareContinues/Q00759_TheDwarvenNightmareContinues.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00759_TheDwarvenNightmareContinues/Q00759_TheDwarvenNightmareContinues.java
@@ -68,7 +68,7 @@ public class Q00759_TheDwarvenNightmareContinues extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java
index e163658293..33169c48a7 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java
@@ -47,7 +47,7 @@ public class Q00760_BlockTheExit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java
index bbe8918eef..42b3fd1c01 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java
@@ -87,7 +87,7 @@ public class Q00761_AssistingTheGoldenRamArmy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java
index 709817b6a5..ac13b91b3e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java
@@ -116,7 +116,7 @@ public class Q00762_AnOminousRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java
index ddad40b600..dd5413d73a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java
@@ -93,7 +93,7 @@ public class Q00763_ADauntingTask extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00764_WeakeningTheVarkaSilenosForces/Q00764_WeakeningTheVarkaSilenosForces.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00764_WeakeningTheVarkaSilenosForces/Q00764_WeakeningTheVarkaSilenosForces.java
index 5e10448397..fe404d0596 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00764_WeakeningTheVarkaSilenosForces/Q00764_WeakeningTheVarkaSilenosForces.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00764_WeakeningTheVarkaSilenosForces/Q00764_WeakeningTheVarkaSilenosForces.java
@@ -73,7 +73,7 @@ public class Q00764_WeakeningTheVarkaSilenosForces extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00765_WeakeningTheKetraOrcForces/Q00765_WeakeningTheKetraOrcForces.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00765_WeakeningTheKetraOrcForces/Q00765_WeakeningTheKetraOrcForces.java
index c700da56d0..84017857a4 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00765_WeakeningTheKetraOrcForces/Q00765_WeakeningTheKetraOrcForces.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00765_WeakeningTheKetraOrcForces/Q00765_WeakeningTheKetraOrcForces.java
@@ -73,7 +73,7 @@ public class Q00765_WeakeningTheKetraOrcForces extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00772_PurifyingSouls/Q00772_PurifyingSouls.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00772_PurifyingSouls/Q00772_PurifyingSouls.java
index e0ef1a907d..7da7d40be7 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00772_PurifyingSouls/Q00772_PurifyingSouls.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00772_PurifyingSouls/Q00772_PurifyingSouls.java
@@ -69,7 +69,7 @@ public class Q00772_PurifyingSouls extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00773_ToCalmTheFlood/Q00773_ToCalmTheFlood.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00773_ToCalmTheFlood/Q00773_ToCalmTheFlood.java
index 85752c60d6..6cca3d7ec1 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00773_ToCalmTheFlood/Q00773_ToCalmTheFlood.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00773_ToCalmTheFlood/Q00773_ToCalmTheFlood.java
@@ -87,7 +87,7 @@ public class Q00773_ToCalmTheFlood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00774_DreamingOfPeace/Q00774_DreamingOfPeace.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00774_DreamingOfPeace/Q00774_DreamingOfPeace.java
index 1fe7ced146..117fe4d843 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00774_DreamingOfPeace/Q00774_DreamingOfPeace.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00774_DreamingOfPeace/Q00774_DreamingOfPeace.java
@@ -82,7 +82,7 @@ public class Q00774_DreamingOfPeace extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java
index e33b22d08f..c93e137b2c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java
@@ -82,7 +82,7 @@ public class Q00775_RetrievingTheChaosFragment extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java
index ac2f54fa8d..18b9f67179 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java
@@ -49,7 +49,7 @@ public class Q00776_SlayDarkLordEkimus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java
index dad6a31213..ff385c026f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java
@@ -50,7 +50,7 @@ public class Q00777_SlayDarkLordTiat extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java
index c2266256c4..9cf140a913 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java
@@ -76,7 +76,7 @@ public class Q00778_OperationRoaringFlame extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00779_UtilizeTheDarknessSeedOfDestruction/Q00779_UtilizeTheDarknessSeedOfDestruction.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00779_UtilizeTheDarknessSeedOfDestruction/Q00779_UtilizeTheDarknessSeedOfDestruction.java
index 15fa0b1e53..c6fac96851 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00779_UtilizeTheDarknessSeedOfDestruction/Q00779_UtilizeTheDarknessSeedOfDestruction.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00779_UtilizeTheDarknessSeedOfDestruction/Q00779_UtilizeTheDarknessSeedOfDestruction.java
@@ -72,7 +72,7 @@ public class Q00779_UtilizeTheDarknessSeedOfDestruction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00780_UtilizeTheDarknessSeedOfInfinity/Q00780_UtilizeTheDarknessSeedOfInfinity.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00780_UtilizeTheDarknessSeedOfInfinity/Q00780_UtilizeTheDarknessSeedOfInfinity.java
index a71bdf61dc..3820918c63 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00780_UtilizeTheDarknessSeedOfInfinity/Q00780_UtilizeTheDarknessSeedOfInfinity.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00780_UtilizeTheDarknessSeedOfInfinity/Q00780_UtilizeTheDarknessSeedOfInfinity.java
@@ -61,7 +61,7 @@ public class Q00780_UtilizeTheDarknessSeedOfInfinity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00781_UtilizeTheDarknessSeedOfAnnihilation/Q00781_UtilizeTheDarknessSeedOfAnnihilation.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00781_UtilizeTheDarknessSeedOfAnnihilation/Q00781_UtilizeTheDarknessSeedOfAnnihilation.java
index 190b971f36..d662d9fc6d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00781_UtilizeTheDarknessSeedOfAnnihilation/Q00781_UtilizeTheDarknessSeedOfAnnihilation.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00781_UtilizeTheDarknessSeedOfAnnihilation/Q00781_UtilizeTheDarknessSeedOfAnnihilation.java
@@ -78,7 +78,7 @@ public class Q00781_UtilizeTheDarknessSeedOfAnnihilation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00782_UtilizeTheDarknessSeedOfHellfire/Q00782_UtilizeTheDarknessSeedOfHellfire.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00782_UtilizeTheDarknessSeedOfHellfire/Q00782_UtilizeTheDarknessSeedOfHellfire.java
index 7feaaf443e..3b181f5417 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00782_UtilizeTheDarknessSeedOfHellfire/Q00782_UtilizeTheDarknessSeedOfHellfire.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00782_UtilizeTheDarknessSeedOfHellfire/Q00782_UtilizeTheDarknessSeedOfHellfire.java
@@ -79,7 +79,7 @@ public class Q00782_UtilizeTheDarknessSeedOfHellfire extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java
index f72f39a08d..0f9c11b687 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java
@@ -71,7 +71,7 @@ public class Q00783_VestigeOfTheMagicPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
@@ -175,17 +175,17 @@ public class Q00783_VestigeOfTheMagicPower extends Quest
 					else if (qs.isCond(5))
 					{
 						htmltext = "31595-05b.htm";
-						onAdvEvent(htmltext, npc, player);
+						onEvent(htmltext, npc, player);
 					}
 					else if (qs.isCond(6))
 					{
 						htmltext = "31595-06b.htm";
-						onAdvEvent(htmltext, npc, player);
+						onEvent(htmltext, npc, player);
 					}
 					else if (qs.isCond(7))
 					{
 						htmltext = "31595-07b.htm";
-						onAdvEvent(htmltext, npc, player);
+						onEvent(htmltext, npc, player);
 					}
 					else if (qs.isCond(2) || qs.isCond(3) || qs.isCond(4))
 					{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java
index 5f840ead5d..449c163fad 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java
@@ -77,7 +77,7 @@ public class Q00787_TheRoleOfAWatcher extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00789_WaitingForPaagrio/Q00789_WaitingForPaagrio.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00789_WaitingForPaagrio/Q00789_WaitingForPaagrio.java
index ab35b9c767..ea6997ed3a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00789_WaitingForPaagrio/Q00789_WaitingForPaagrio.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00789_WaitingForPaagrio/Q00789_WaitingForPaagrio.java
@@ -75,7 +75,7 @@ public final class Q00789_WaitingForPaagrio extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00790_ObtainingFerinsTrust/Q00790_ObtainingFerinsTrust.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00790_ObtainingFerinsTrust/Q00790_ObtainingFerinsTrust.java
index 77cd7ade02..2dd964610f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00790_ObtainingFerinsTrust/Q00790_ObtainingFerinsTrust.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00790_ObtainingFerinsTrust/Q00790_ObtainingFerinsTrust.java
@@ -71,7 +71,7 @@ public class Q00790_ObtainingFerinsTrust extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00792_TheSuperionGiants/Q00792_TheSuperionGiants.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00792_TheSuperionGiants/Q00792_TheSuperionGiants.java
index a494fa2d3a..1f8af8f813 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00792_TheSuperionGiants/Q00792_TheSuperionGiants.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00792_TheSuperionGiants/Q00792_TheSuperionGiants.java
@@ -70,7 +70,7 @@ public class Q00792_TheSuperionGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00816_PlansToRepairTheStronghold/Q00816_PlansToRepairTheStronghold.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00816_PlansToRepairTheStronghold/Q00816_PlansToRepairTheStronghold.java
index 0507702506..2427136f91 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00816_PlansToRepairTheStronghold/Q00816_PlansToRepairTheStronghold.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00816_PlansToRepairTheStronghold/Q00816_PlansToRepairTheStronghold.java
@@ -65,7 +65,7 @@ public class Q00816_PlansToRepairTheStronghold extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00817_BlackAteliaResearch/Q00817_BlackAteliaResearch.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00817_BlackAteliaResearch/Q00817_BlackAteliaResearch.java
index 7296ee314b..e4de6eff53 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00817_BlackAteliaResearch/Q00817_BlackAteliaResearch.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00817_BlackAteliaResearch/Q00817_BlackAteliaResearch.java
@@ -58,7 +58,7 @@ public class Q00817_BlackAteliaResearch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00823_DisappearedRaceNewFairy/Q00823_DisappearedRaceNewFairy.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00823_DisappearedRaceNewFairy/Q00823_DisappearedRaceNewFairy.java
index 1dafa40e61..5a608f86a7 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00823_DisappearedRaceNewFairy/Q00823_DisappearedRaceNewFairy.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00823_DisappearedRaceNewFairy/Q00823_DisappearedRaceNewFairy.java
@@ -66,7 +66,7 @@ public class Q00823_DisappearedRaceNewFairy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00824_AttackTheCommandPost/Q00824_AttackTheCommandPost.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00824_AttackTheCommandPost/Q00824_AttackTheCommandPost.java
index db25590de0..c89f2abb8a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00824_AttackTheCommandPost/Q00824_AttackTheCommandPost.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00824_AttackTheCommandPost/Q00824_AttackTheCommandPost.java
@@ -51,7 +51,7 @@ public class Q00824_AttackTheCommandPost extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java
index 33c9979b4a..4f6a1dd284 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java
@@ -68,7 +68,7 @@ public class Q00826_InSearchOfTheSecretWeapon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java
index 8b7399c41e..739655c72f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java
@@ -89,7 +89,7 @@ public class Q00827_EinhasadsOrder extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00828_EvasBlessing/Q00828_EvasBlessing.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00828_EvasBlessing/Q00828_EvasBlessing.java
index 202e0fc3ca..72b34bd5f9 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00828_EvasBlessing/Q00828_EvasBlessing.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00828_EvasBlessing/Q00828_EvasBlessing.java
@@ -95,7 +95,7 @@ public class Q00828_EvasBlessing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00829_MaphrsSalvation/Q00829_MaphrsSalvation.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00829_MaphrsSalvation/Q00829_MaphrsSalvation.java
index 977c610974..457faaa28c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00829_MaphrsSalvation/Q00829_MaphrsSalvation.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00829_MaphrsSalvation/Q00829_MaphrsSalvation.java
@@ -54,7 +54,7 @@ public class Q00829_MaphrsSalvation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00830_TheWayOfTheGiantsPawn/Q00830_TheWayOfTheGiantsPawn.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00830_TheWayOfTheGiantsPawn/Q00830_TheWayOfTheGiantsPawn.java
index 1bac202074..64715ee4c7 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00830_TheWayOfTheGiantsPawn/Q00830_TheWayOfTheGiantsPawn.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00830_TheWayOfTheGiantsPawn/Q00830_TheWayOfTheGiantsPawn.java
@@ -89,7 +89,7 @@ public class Q00830_TheWayOfTheGiantsPawn extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java
index 9584d686bc..cb7bae51ab 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java
@@ -55,7 +55,7 @@ public class Q00831_SayhasScheme extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
index 755ff509f8..42c14d342e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
@@ -65,7 +65,7 @@ public class Q00833_DevilsTreasureTauti extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
index 6448125f2f..d2db3dae19 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
@@ -61,7 +61,7 @@ public class Q00835_PitiableMelisa extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00841_ContaminationContainment/Q00841_ContaminationContainment.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00841_ContaminationContainment/Q00841_ContaminationContainment.java
index d2e0a5f339..f11476f789 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00841_ContaminationContainment/Q00841_ContaminationContainment.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00841_ContaminationContainment/Q00841_ContaminationContainment.java
@@ -86,7 +86,7 @@ public final class Q00841_ContaminationContainment extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00842_CaptiveDemons/Q00842_CaptiveDemons.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00842_CaptiveDemons/Q00842_CaptiveDemons.java
index 6a3f793adb..7c93c26cf7 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00842_CaptiveDemons/Q00842_CaptiveDemons.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00842_CaptiveDemons/Q00842_CaptiveDemons.java
@@ -67,7 +67,7 @@ public class Q00842_CaptiveDemons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00843_GiantEvolutionControl/Q00843_GiantEvolutionControl.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00843_GiantEvolutionControl/Q00843_GiantEvolutionControl.java
index 17fbceb090..f66b6c4eec 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00843_GiantEvolutionControl/Q00843_GiantEvolutionControl.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00843_GiantEvolutionControl/Q00843_GiantEvolutionControl.java
@@ -80,7 +80,7 @@ public final class Q00843_GiantEvolutionControl extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00844_GiantsTreasure/Q00844_GiantsTreasure.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00844_GiantsTreasure/Q00844_GiantsTreasure.java
index ea0d277f7d..06827de98e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00844_GiantsTreasure/Q00844_GiantsTreasure.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00844_GiantsTreasure/Q00844_GiantsTreasure.java
@@ -63,7 +63,7 @@ public class Q00844_GiantsTreasure extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00845_SabotageTheEmbryoSupplies/Q00845_SabotageTheEmbryoSupplies.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00845_SabotageTheEmbryoSupplies/Q00845_SabotageTheEmbryoSupplies.java
index e4a2ecd1e9..c81c7e73bf 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00845_SabotageTheEmbryoSupplies/Q00845_SabotageTheEmbryoSupplies.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00845_SabotageTheEmbryoSupplies/Q00845_SabotageTheEmbryoSupplies.java
@@ -72,7 +72,7 @@ public class Q00845_SabotageTheEmbryoSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00846_BuildingUpStrength/Q00846_BuildingUpStrength.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00846_BuildingUpStrength/Q00846_BuildingUpStrength.java
index c003dafa91..69c93caa37 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00846_BuildingUpStrength/Q00846_BuildingUpStrength.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00846_BuildingUpStrength/Q00846_BuildingUpStrength.java
@@ -75,7 +75,7 @@ public final class Q00846_BuildingUpStrength extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
index 1140fc7490..2a6c62bb48 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
@@ -58,7 +58,7 @@ public class Q00901_HowLavasaurusesAreMade extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java
index b16bc679ac..d9d162c9f1 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java
@@ -77,7 +77,7 @@ public class Q00902_ReclaimOurEra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
index 8587c2f741..d15889aad7 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
@@ -55,7 +55,7 @@ public class Q00903_TheCallOfAntharas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00904_DragonTrophyAntharas/Q00904_DragonTrophyAntharas.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00904_DragonTrophyAntharas/Q00904_DragonTrophyAntharas.java
index fbad36e7f1..796c0bd9ae 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00904_DragonTrophyAntharas/Q00904_DragonTrophyAntharas.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00904_DragonTrophyAntharas/Q00904_DragonTrophyAntharas.java
@@ -60,7 +60,7 @@ public class Q00904_DragonTrophyAntharas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
index 79522f8309..73589e1dbb 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
@@ -103,7 +103,7 @@ public class Q00905_RefinedDragonBlood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
index 3f6c9f9a30..4494d2a115 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
@@ -65,7 +65,7 @@ public class Q00906_TheCallOfValakas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java
index 9eb91b8264..f0b988c098 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java
@@ -60,7 +60,7 @@ public class Q00907_DragonTrophyValakas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00923_ShinedustExtraction/Q00923_ShinedustExtraction.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00923_ShinedustExtraction/Q00923_ShinedustExtraction.java
index 23a188fedb..a68c027b2a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00923_ShinedustExtraction/Q00923_ShinedustExtraction.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00923_ShinedustExtraction/Q00923_ShinedustExtraction.java
@@ -69,7 +69,7 @@ public class Q00923_ShinedustExtraction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00924_GiantOfTheRestorationRoom/Q00924_GiantOfTheRestorationRoom.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00924_GiantOfTheRestorationRoom/Q00924_GiantOfTheRestorationRoom.java
index de9e6695cc..5fe6d77b8b 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00924_GiantOfTheRestorationRoom/Q00924_GiantOfTheRestorationRoom.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00924_GiantOfTheRestorationRoom/Q00924_GiantOfTheRestorationRoom.java
@@ -66,7 +66,7 @@ public class Q00924_GiantOfTheRestorationRoom extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java
index 0c68f67f34..9c53c37390 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java
@@ -58,7 +58,7 @@ public class Q00926_30DaySearchOperation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java
index 18391c86e3..a162ef4426 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java
@@ -65,7 +65,7 @@ public class Q00928_100DaySubjugationOperation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00930_DisparagingThePhantoms/Q00930_DisparagingThePhantoms.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00930_DisparagingThePhantoms/Q00930_DisparagingThePhantoms.java
index 28bb494903..755b411c57 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00930_DisparagingThePhantoms/Q00930_DisparagingThePhantoms.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00930_DisparagingThePhantoms/Q00930_DisparagingThePhantoms.java
@@ -80,7 +80,7 @@ public class Q00930_DisparagingThePhantoms extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00931_MemoriesOfTheWind/Q00931_MemoriesOfTheWind.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00931_MemoriesOfTheWind/Q00931_MemoriesOfTheWind.java
index bbc452acef..95cf8663d7 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00931_MemoriesOfTheWind/Q00931_MemoriesOfTheWind.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00931_MemoriesOfTheWind/Q00931_MemoriesOfTheWind.java
@@ -77,7 +77,7 @@ public class Q00931_MemoriesOfTheWind extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00932_SayhasEnergy/Q00932_SayhasEnergy.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00932_SayhasEnergy/Q00932_SayhasEnergy.java
index 374f7566ba..2682626efb 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00932_SayhasEnergy/Q00932_SayhasEnergy.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00932_SayhasEnergy/Q00932_SayhasEnergy.java
@@ -68,7 +68,7 @@ public class Q00932_SayhasEnergy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java
index 7e36a436ae..ceb13a9c48 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java
@@ -78,7 +78,7 @@ public class Q00937_ToReviveTheFishingGuild extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java
index fcaea628f2..14766f9216 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java
@@ -73,7 +73,7 @@ public class Q00938_TheFishermansOtherHobby extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
index 2fbbe388b7..f5e61c063c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
@@ -54,7 +54,7 @@ public class Q10273_GoodDayToFly extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
index 92298a9598..c5cf9c1ed5 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
@@ -64,7 +64,7 @@ public class Q10274_CollectingInTheAir extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
index 80b9cdef66..f0eae3e565 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
@@ -60,7 +60,7 @@ public class Q10275_ContainingTheAttributePower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
index aea1e23329..adb2982ac1 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
@@ -48,7 +48,7 @@ public class Q10282_ToTheSeedOfAnnihilation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
index e5310632bd..dc9e9a1de4 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
@@ -51,7 +51,7 @@ public class Q10283_RequestOfIceMerchant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java
index c8822c8a8a..fb0cefa677 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java
@@ -54,7 +54,7 @@ public class Q10284_AcquisitionOfDivineSword extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
index a5a7eaace6..d0294d0369 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
@@ -55,7 +55,7 @@ public class Q10285_MeetingSirra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
index b9a00e8388..94f82457bd 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
@@ -56,7 +56,7 @@ public class Q10286_ReunionWithSirra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
index c072297d38..d98cd117bd 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
@@ -50,7 +50,7 @@ public class Q10287_StoryOfThoseLeft extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
index 6603c62c8f..88a4a9ebb4 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
@@ -48,7 +48,7 @@ public class Q10288_SecretMission extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java
index ebc3b15a3a..19e9c7f984 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java
@@ -48,7 +48,7 @@ public class Q10289_FadeToBlack extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
index 8ae5f96306..fe0e24dfe8 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
@@ -54,7 +54,7 @@ public class Q10290_LandDragonConqueror extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
index 093062bde0..554a7ac150 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
@@ -52,7 +52,7 @@ public class Q10291_FireDragonDestroyer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
index 4f42181d0b..38e346b1cd 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
@@ -65,7 +65,7 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java
index 9578509dc1..f80fbdc02b 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java
@@ -57,7 +57,7 @@ public class Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java
index 72d0ca7ed5..0ddc585beb 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java
@@ -95,7 +95,7 @@ public class Q10294_SevenSignsToTheMonasteryOfSilence extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java
index 747a9b8e55..fff91fc378 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java
@@ -105,7 +105,7 @@ public class Q10295_SevenSignsSolinasTomb extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java
index e4cf9dbdf6..f350112a68 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java
@@ -60,7 +60,7 @@ public class Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java
index fbcd6311a7..990366217f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java
@@ -50,7 +50,7 @@ public class Q10297_GrandOpeningComeToOurPub extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java
index c7a0f3a27b..44f2de8a14 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java
@@ -71,7 +71,7 @@ public class Q10301_ShadowOfTerrorBlackishRedFog extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10302_UnsettlingShadowAndRumors/Q10302_UnsettlingShadowAndRumors.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10302_UnsettlingShadowAndRumors/Q10302_UnsettlingShadowAndRumors.java
index 35634b2208..0ef255822a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10302_UnsettlingShadowAndRumors/Q10302_UnsettlingShadowAndRumors.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10302_UnsettlingShadowAndRumors/Q10302_UnsettlingShadowAndRumors.java
@@ -51,7 +51,7 @@ public class Q10302_UnsettlingShadowAndRumors extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java
index 075ada8600..77e10de1fd 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java
@@ -75,7 +75,7 @@ public class Q10303_CrossroadsBetweenLightAndDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java
index 66cd2f1407..331fdb471c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java
@@ -75,7 +75,7 @@ public class Q10304_ForForgottenHeroes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java
index 679a617f05..f1df52055e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java
@@ -53,7 +53,7 @@ public class Q10305_UnstoppableFutileEfforts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10306_TheCorruptedLeader/Q10306_TheCorruptedLeader.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10306_TheCorruptedLeader/Q10306_TheCorruptedLeader.java
index 6c34bbf0ec..e400458693 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10306_TheCorruptedLeader/Q10306_TheCorruptedLeader.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10306_TheCorruptedLeader/Q10306_TheCorruptedLeader.java
@@ -59,7 +59,7 @@ public class Q10306_TheCorruptedLeader extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java
index 836ba2610b..b557c0b277 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java
@@ -56,7 +56,7 @@ public class Q10307_TheCorruptedLeaderHisTruth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10310_TwistedCreationTree/Q10310_TwistedCreationTree.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10310_TwistedCreationTree/Q10310_TwistedCreationTree.java
index 9a5f3e93df..6eb9953cdc 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10310_TwistedCreationTree/Q10310_TwistedCreationTree.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10310_TwistedCreationTree/Q10310_TwistedCreationTree.java
@@ -56,7 +56,7 @@ public class Q10310_TwistedCreationTree extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java
index 9e2c35dd09..8971512507 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java
@@ -46,7 +46,7 @@ public class Q10311_PeacefulDaysAreOver extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java
index c7dc807cdf..40c76b9e2f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java
@@ -55,7 +55,7 @@ public class Q10312_AbandonedGodsCreature extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java
index 8f25603bcc..a17c3ebaf6 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java
@@ -49,7 +49,7 @@ public class Q10315_ToThePrisonOfDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java
index 9c05b1f86e..eed57ef8dc 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java
@@ -56,7 +56,7 @@ public class Q10316_UndecayingMemoryOfThePast extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java
index a92657082e..cb331da1d7 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java
@@ -46,7 +46,7 @@ public class Q10317_OrbisWitch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java
index b92fa5339e..d79519ea24 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java
@@ -68,7 +68,7 @@ public class Q10318_DecayingDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java
index 5e6823a49b..f95519bbd3 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java
@@ -58,7 +58,7 @@ public class Q10320_LetsGoToTheCentralSquare extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java
index 47ecc55def..8934685d09 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java
@@ -47,7 +47,7 @@ public class Q10321_QualificationsOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java
index 4f48c0b900..b374578bd5 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java
@@ -58,7 +58,7 @@ public class Q10330_ToTheRuinsOfYeSagira extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java
index 17126992f8..0d0adff030 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java
@@ -71,7 +71,7 @@ public class Q10331_StartOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10332_ToughRoad/Q10332_ToughRoad.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10332_ToughRoad/Q10332_ToughRoad.java
index 0ec104da2a..cafb348a86 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10332_ToughRoad/Q10332_ToughRoad.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10332_ToughRoad/Q10332_ToughRoad.java
@@ -57,7 +57,7 @@ public class Q10332_ToughRoad extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java
index 1f30d7ba2b..780273250e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java
@@ -65,7 +65,7 @@ public class Q10333_DisappearedSakum extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10334_ReportingTheStatusOfTheWindmillHill/Q10334_ReportingTheStatusOfTheWindmillHill.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10334_ReportingTheStatusOfTheWindmillHill/Q10334_ReportingTheStatusOfTheWindmillHill.java
index af92819fea..d6fa3cc296 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10334_ReportingTheStatusOfTheWindmillHill/Q10334_ReportingTheStatusOfTheWindmillHill.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10334_ReportingTheStatusOfTheWindmillHill/Q10334_ReportingTheStatusOfTheWindmillHill.java
@@ -49,7 +49,7 @@ public class Q10334_ReportingTheStatusOfTheWindmillHill extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java
index fd75a5574f..d0b51c1c17 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java
@@ -58,7 +58,7 @@ public class Q10335_RequestToFindSakum extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10336_DividedSakumKanilov/Q10336_DividedSakumKanilov.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10336_DividedSakumKanilov/Q10336_DividedSakumKanilov.java
index b0b1051d9f..8b0acf0de3 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10336_DividedSakumKanilov/Q10336_DividedSakumKanilov.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10336_DividedSakumKanilov/Q10336_DividedSakumKanilov.java
@@ -57,7 +57,7 @@ public class Q10336_DividedSakumKanilov extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java
index 8154285f16..4d3d655611 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java
@@ -58,7 +58,7 @@ public class Q10337_SakumsImpact extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
index edc0bdf638..b92033f3e6 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
@@ -66,7 +66,7 @@ public class Q10338_SeizeYourDestiny extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java
index a8277707fa..1d6eeab187 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java
@@ -66,7 +66,7 @@ public class Q10339_FightingTheForgotten extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java
index 9bb47bafb8..718b70bbcd 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java
@@ -48,7 +48,7 @@ public class Q10341_DayOfDestinyHumansFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10341_DayOfDestinyHumansFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java
index 715453f3bb..071deb3562 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java
@@ -48,7 +48,7 @@ public class Q10342_DayOfDestinyElvenFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10342_DayOfDestinyElvenFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java
index b958ae1683..5701012e2c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java
@@ -48,7 +48,7 @@ public class Q10343_DayOfDestinyDarkElfsFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10343_DayOfDestinyDarkElfsFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java
index 3a9540d6f0..ff5519a3f1 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java
@@ -48,7 +48,7 @@ public class Q10344_DayOfDestinyOrcsFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10344_DayOfDestinyOrcsFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java
index f0b38f0d8f..9ad485a695 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java
@@ -48,7 +48,7 @@ public class Q10345_DayOfDestinyDwarfsFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10345_DayOfDestinyDwarfsFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java
index 0f3195f574..5690e3622f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java
@@ -48,7 +48,7 @@ public class Q10346_DayOfDestinyKamaelsFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10346_DayOfDestinyKamaelsFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java
index 2874c31889..6a7bf0c265 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java
@@ -51,7 +51,7 @@ public class Q10351_OwnerOfHall extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java
index 1175e2cdd1..18cd204fc0 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java
@@ -94,7 +94,7 @@ public class Q10353_CertificationOfValue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java
index ea20f5fe52..c1723c3065 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java
@@ -51,7 +51,7 @@ public class Q10354_ResurrectedOwnerOfHall extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java
index 3a33d33da4..816efa29cd 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java
@@ -59,7 +59,7 @@ public class Q10358_DividedSakumPoslof extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10359_TracesOfEvil/Q10359_TracesOfEvil.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10359_TracesOfEvil/Q10359_TracesOfEvil.java
index e03bf7a6a2..f294b34dcb 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10359_TracesOfEvil/Q10359_TracesOfEvil.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10359_TracesOfEvil/Q10359_TracesOfEvil.java
@@ -69,7 +69,7 @@ public class Q10359_TracesOfEvil extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java
index 9f01a049cf..56eaa948f2 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java
@@ -89,7 +89,7 @@ public class Q10360_CertificationOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java
index de64b241ea..8080af8df8 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java
@@ -59,7 +59,7 @@ public class Q10362_CertificationOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java
index 15280f04b9..813cd594d1 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java
@@ -61,7 +61,7 @@ public class Q10363_RequestOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java
index 051aed8230..1e68e49da7 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java
@@ -58,7 +58,7 @@ public class Q10364_ObligationsOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/Q10365_ForTheSearchdogKing.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/Q10365_ForTheSearchdogKing.java
index 753f1450fe..6ce4649c47 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/Q10365_ForTheSearchdogKing.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/Q10365_ForTheSearchdogKing.java
@@ -57,7 +57,7 @@ public class Q10365_ForTheSearchdogKing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java
index b22e7cd95e..778094e232 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java
@@ -63,7 +63,7 @@ public class Q10366_ReportOnTheSituationAtTheRuins extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10369_NoblesseSoulTesting/Q10369_NoblesseSoulTesting.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10369_NoblesseSoulTesting/Q10369_NoblesseSoulTesting.java
index 236fe0146e..511af97acc 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10369_NoblesseSoulTesting/Q10369_NoblesseSoulTesting.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10369_NoblesseSoulTesting/Q10369_NoblesseSoulTesting.java
@@ -122,11 +122,11 @@ public class Q10369_NoblesseSoulTesting extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player == null)
 		{
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
@@ -321,7 +321,7 @@ public class Q10369_NoblesseSoulTesting extends Quest
 									final Quest instance = QuestManager.getInstance().getQuest(EvasHiddenSpace.class.getSimpleName());
 									if (instance != null)
 									{
-										instance.onAdvEvent("enterInstance", npc, player);
+										instance.onEvent("enterInstance", npc, player);
 									}
 									htmltext = null;
 									break;
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10370_MenacingTimes/Q10370_MenacingTimes.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10370_MenacingTimes/Q10370_MenacingTimes.java
index dc213da234..4763dba885 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10370_MenacingTimes/Q10370_MenacingTimes.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10370_MenacingTimes/Q10370_MenacingTimes.java
@@ -65,7 +65,7 @@ public class Q10370_MenacingTimes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10371_GraspThyPower/Q10371_GraspThyPower.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10371_GraspThyPower/Q10371_GraspThyPower.java
index a3a431ae90..f19d9a6240 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10371_GraspThyPower/Q10371_GraspThyPower.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10371_GraspThyPower/Q10371_GraspThyPower.java
@@ -61,7 +61,7 @@ public class Q10371_GraspThyPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10372_PurgatoryVolvere/Q10372_PurgatoryVolvere.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10372_PurgatoryVolvere/Q10372_PurgatoryVolvere.java
index 34e367af3f..73c9586552 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10372_PurgatoryVolvere/Q10372_PurgatoryVolvere.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10372_PurgatoryVolvere/Q10372_PurgatoryVolvere.java
@@ -58,7 +58,7 @@ public class Q10372_PurgatoryVolvere extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10373_ExploringTheDimensionSealingTheDimension/Q10373_ExploringTheDimensionSealingTheDimension.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10373_ExploringTheDimensionSealingTheDimension/Q10373_ExploringTheDimensionSealingTheDimension.java
index 7056e8b72a..425b0c979d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10373_ExploringTheDimensionSealingTheDimension/Q10373_ExploringTheDimensionSealingTheDimension.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10373_ExploringTheDimensionSealingTheDimension/Q10373_ExploringTheDimensionSealingTheDimension.java
@@ -44,7 +44,7 @@ public class Q10373_ExploringTheDimensionSealingTheDimension extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10374_ThatPlaceSuccubus/Q10374_ThatPlaceSuccubus.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10374_ThatPlaceSuccubus/Q10374_ThatPlaceSuccubus.java
index 8d91352295..44d4e50656 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10374_ThatPlaceSuccubus/Q10374_ThatPlaceSuccubus.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10374_ThatPlaceSuccubus/Q10374_ThatPlaceSuccubus.java
@@ -65,7 +65,7 @@ public class Q10374_ThatPlaceSuccubus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10375_SuccubusDisciples/Q10375_SuccubusDisciples.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10375_SuccubusDisciples/Q10375_SuccubusDisciples.java
index 2bbdfeff18..f14f026f93 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10375_SuccubusDisciples/Q10375_SuccubusDisciples.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10375_SuccubusDisciples/Q10375_SuccubusDisciples.java
@@ -64,7 +64,7 @@ public class Q10375_SuccubusDisciples extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java
index 965d1d06dd..8d6af4cb2d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java
@@ -66,7 +66,7 @@ public class Q10376_BloodyGoodTime extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java
index 255a3ce354..6a38565c9f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java
@@ -59,7 +59,7 @@ public class Q10377_TheInvadedExecutionGrounds extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10378_WeedingWork/Q10378_WeedingWork.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10378_WeedingWork/Q10378_WeedingWork.java
index e55058d9a5..cc498e2821 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10378_WeedingWork/Q10378_WeedingWork.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10378_WeedingWork/Q10378_WeedingWork.java
@@ -57,7 +57,7 @@ public class Q10378_WeedingWork extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10379_AnUninvitedGuest/Q10379_AnUninvitedGuest.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10379_AnUninvitedGuest/Q10379_AnUninvitedGuest.java
index 8502410bee..e227de28c7 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10379_AnUninvitedGuest/Q10379_AnUninvitedGuest.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10379_AnUninvitedGuest/Q10379_AnUninvitedGuest.java
@@ -69,7 +69,7 @@ public class Q10379_AnUninvitedGuest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10380_TheExecutionersExecution/Q10380_TheExecutionersExecution.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10380_TheExecutionersExecution/Q10380_TheExecutionersExecution.java
index 7b59d40bcb..5b4910c43e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10380_TheExecutionersExecution/Q10380_TheExecutionersExecution.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10380_TheExecutionersExecution/Q10380_TheExecutionersExecution.java
@@ -67,7 +67,7 @@ public class Q10380_TheExecutionersExecution extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java
index 3fdb1d2625..1a0550ce7a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java
@@ -49,7 +49,7 @@ public class Q10381_ToTheSeedOfHellfire extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10382_DayOfLiberation/Q10382_DayOfLiberation.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10382_DayOfLiberation/Q10382_DayOfLiberation.java
index 29de22db80..bf7a89cbc4 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10382_DayOfLiberation/Q10382_DayOfLiberation.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10382_DayOfLiberation/Q10382_DayOfLiberation.java
@@ -48,7 +48,7 @@ public class Q10382_DayOfLiberation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java
index 5a50c186ec..97fd290cdb 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java
@@ -61,7 +61,7 @@ public class Q10383_FergasonsOffer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java
index 11188fdada..9aba58dd1e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java
@@ -52,7 +52,7 @@ public class Q10384_AnAudienceWithTauti extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10385_RedThreadOfFate/Q10385_RedThreadOfFate.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10385_RedThreadOfFate/Q10385_RedThreadOfFate.java
index e16cde08bf..1a97e6d7de 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10385_RedThreadOfFate/Q10385_RedThreadOfFate.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10385_RedThreadOfFate/Q10385_RedThreadOfFate.java
@@ -120,7 +120,7 @@ public class Q10385_RedThreadOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -756,7 +756,7 @@ public class Q10385_RedThreadOfFate extends Quest
 						final Quest instance = QuestManager.getInstance().getQuest(TalkingIslandPast.class.getSimpleName());
 						if (instance != null)
 						{
-							instance.onAdvEvent("enterInstance", npc, player);
+							instance.onEvent("enterInstance", npc, player);
 						}
 					}
 					break;
@@ -844,7 +844,7 @@ public class Q10385_RedThreadOfFate extends Quest
 							final Quest instance = QuestManager.getInstance().getQuest(TalkingIslandPast.class.getSimpleName());
 							if (instance != null)
 							{
-								instance.onAdvEvent("enterInstance", npc, player);
+								instance.onEvent("enterInstance", npc, player);
 							}
 							break;
 						}
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10386_MysteriousJourney/Q10386_MysteriousJourney.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10386_MysteriousJourney/Q10386_MysteriousJourney.java
index 199681b2fa..51a014c8bf 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10386_MysteriousJourney/Q10386_MysteriousJourney.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10386_MysteriousJourney/Q10386_MysteriousJourney.java
@@ -50,7 +50,7 @@ public class Q10386_MysteriousJourney extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10387_SoullessOne/Q10387_SoullessOne.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10387_SoullessOne/Q10387_SoullessOne.java
index 3b4e70d070..90284f0de9 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10387_SoullessOne/Q10387_SoullessOne.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10387_SoullessOne/Q10387_SoullessOne.java
@@ -54,7 +54,7 @@ public class Q10387_SoullessOne extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java
index 174ea1a300..e5a8517a69 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java
@@ -46,7 +46,7 @@ public class Q10388_ConspiracyBehindDoor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java
index 6d60016a06..619cf89fa5 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java
@@ -66,7 +66,7 @@ public class Q10389_TheVoiceOfAuthority extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10390_KekropusLetter/Q10390_KekropusLetter.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10390_KekropusLetter/Q10390_KekropusLetter.java
index 5e59060743..501925f30e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10390_KekropusLetter/Q10390_KekropusLetter.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10390_KekropusLetter/Q10390_KekropusLetter.java
@@ -68,7 +68,7 @@ public class Q10390_KekropusLetter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10391_ASuspiciousHelper/Q10391_ASuspiciousHelper.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10391_ASuspiciousHelper/Q10391_ASuspiciousHelper.java
index 5c96feab38..915e3c1f84 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10391_ASuspiciousHelper/Q10391_ASuspiciousHelper.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10391_ASuspiciousHelper/Q10391_ASuspiciousHelper.java
@@ -52,7 +52,7 @@ public class Q10391_ASuspiciousHelper extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10392_FailureAndItsConsequences/Q10392_FailureAndItsConsequences.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10392_FailureAndItsConsequences/Q10392_FailureAndItsConsequences.java
index b228973062..b083f4154f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10392_FailureAndItsConsequences/Q10392_FailureAndItsConsequences.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10392_FailureAndItsConsequences/Q10392_FailureAndItsConsequences.java
@@ -60,7 +60,7 @@ public class Q10392_FailureAndItsConsequences extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10393_KekropusLetterAClueCompleted/Q10393_KekropusLetterAClueCompleted.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10393_KekropusLetterAClueCompleted/Q10393_KekropusLetterAClueCompleted.java
index 2333feba9a..5ad013083f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10393_KekropusLetterAClueCompleted/Q10393_KekropusLetterAClueCompleted.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10393_KekropusLetterAClueCompleted/Q10393_KekropusLetterAClueCompleted.java
@@ -59,7 +59,7 @@ public class Q10393_KekropusLetterAClueCompleted extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java
index 03cd8902d2..c7c76563db 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java
@@ -56,7 +56,7 @@ public class Q10394_MutualBenefit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java
index 11cba933b5..0dd1b301df 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java
@@ -65,7 +65,7 @@ public class Q10395_NotATraitor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10397_KekropusLetterASuspiciousBadge/Q10397_KekropusLetterASuspiciousBadge.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10397_KekropusLetterASuspiciousBadge/Q10397_KekropusLetterASuspiciousBadge.java
index 7af2523627..0f04ac68f7 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10397_KekropusLetterASuspiciousBadge/Q10397_KekropusLetterASuspiciousBadge.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10397_KekropusLetterASuspiciousBadge/Q10397_KekropusLetterASuspiciousBadge.java
@@ -59,7 +59,7 @@ public class Q10397_KekropusLetterASuspiciousBadge extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10398_ASuspiciousBadge/Q10398_ASuspiciousBadge.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10398_ASuspiciousBadge/Q10398_ASuspiciousBadge.java
index 553def9529..a1ddb26e59 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10398_ASuspiciousBadge/Q10398_ASuspiciousBadge.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10398_ASuspiciousBadge/Q10398_ASuspiciousBadge.java
@@ -60,7 +60,7 @@ public class Q10398_ASuspiciousBadge extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10399_TheAlphabetOfTheGiants/Q10399_TheAlphabetOfTheGiants.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10399_TheAlphabetOfTheGiants/Q10399_TheAlphabetOfTheGiants.java
index 8bdd94fd28..528855b4c0 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10399_TheAlphabetOfTheGiants/Q10399_TheAlphabetOfTheGiants.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10399_TheAlphabetOfTheGiants/Q10399_TheAlphabetOfTheGiants.java
@@ -58,7 +58,7 @@ public class Q10399_TheAlphabetOfTheGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10401_KekropusLetterDecodingTheBadge/Q10401_KekropusLetterDecodingTheBadge.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10401_KekropusLetterDecodingTheBadge/Q10401_KekropusLetterDecodingTheBadge.java
index 5920fad949..65887d6f03 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10401_KekropusLetterDecodingTheBadge/Q10401_KekropusLetterDecodingTheBadge.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10401_KekropusLetterDecodingTheBadge/Q10401_KekropusLetterDecodingTheBadge.java
@@ -59,7 +59,7 @@ public class Q10401_KekropusLetterDecodingTheBadge extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java
index 5e4d8b1482..4fd1ce9cab 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java
@@ -65,7 +65,7 @@ public class Q10402_NowhereToTurn extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10403_TheGuardianGiant/Q10403_TheGuardianGiant.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10403_TheGuardianGiant/Q10403_TheGuardianGiant.java
index 51b91a715d..72cf81d741 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10403_TheGuardianGiant/Q10403_TheGuardianGiant.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10403_TheGuardianGiant/Q10403_TheGuardianGiant.java
@@ -64,7 +64,7 @@ public class Q10403_TheGuardianGiant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10404_KekropusLetterAHiddenMeaning/Q10404_KekropusLetterAHiddenMeaning.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10404_KekropusLetterAHiddenMeaning/Q10404_KekropusLetterAHiddenMeaning.java
index b20d24d3cb..0d4cec46e4 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10404_KekropusLetterAHiddenMeaning/Q10404_KekropusLetterAHiddenMeaning.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10404_KekropusLetterAHiddenMeaning/Q10404_KekropusLetterAHiddenMeaning.java
@@ -59,7 +59,7 @@ public class Q10404_KekropusLetterAHiddenMeaning extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10405_KartiasSeed/Q10405_KartiasSeed.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10405_KartiasSeed/Q10405_KartiasSeed.java
index cf7dcbf31a..3818cabb82 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10405_KartiasSeed/Q10405_KartiasSeed.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10405_KartiasSeed/Q10405_KartiasSeed.java
@@ -67,7 +67,7 @@ public class Q10405_KartiasSeed extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java
index c8889e1fe1..78fb20d20a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java
@@ -57,7 +57,7 @@ public class Q10406_BeforeDarknessBearsFruit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10407_LetsGoFishing/Q10407_LetsGoFishing.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10407_LetsGoFishing/Q10407_LetsGoFishing.java
index 6be6ce07fc..ed6967b6a7 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10407_LetsGoFishing/Q10407_LetsGoFishing.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10407_LetsGoFishing/Q10407_LetsGoFishing.java
@@ -81,7 +81,7 @@ public class Q10407_LetsGoFishing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10408_KekropusLetterTheSwampOfScreams/Q10408_KekropusLetterTheSwampOfScreams.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10408_KekropusLetterTheSwampOfScreams/Q10408_KekropusLetterTheSwampOfScreams.java
index 6e6ff67975..59d6ea191d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10408_KekropusLetterTheSwampOfScreams/Q10408_KekropusLetterTheSwampOfScreams.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10408_KekropusLetterTheSwampOfScreams/Q10408_KekropusLetterTheSwampOfScreams.java
@@ -59,7 +59,7 @@ public class Q10408_KekropusLetterTheSwampOfScreams extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java
index 2098f70548..5b4eced23f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java
@@ -50,7 +50,7 @@ public class Q10409_ASuspiciousVagabondInTheSwamp extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java
index 1ac13b6b1f..931fb75ded 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java
@@ -75,7 +75,7 @@ public class Q10410_EmbryoInTheSwampOfScreams extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10411_KekropusLetterTheForestOfTheDead/Q10411_KekropusLetterTheForestOfTheDead.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10411_KekropusLetterTheForestOfTheDead/Q10411_KekropusLetterTheForestOfTheDead.java
index 97b3c6b112..82bba6e8b3 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10411_KekropusLetterTheForestOfTheDead/Q10411_KekropusLetterTheForestOfTheDead.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10411_KekropusLetterTheForestOfTheDead/Q10411_KekropusLetterTheForestOfTheDead.java
@@ -59,7 +59,7 @@ public class Q10411_KekropusLetterTheForestOfTheDead extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java
index e81dd514b7..ae77b686d0 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java
@@ -50,7 +50,7 @@ public class Q10412_ASuspiciousVagabondInTheForest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java
index 981177a544..bfe5518086 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java
@@ -104,7 +104,7 @@ public class Q10413_EmbryoInTheForestOfTheDead extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10414_KekropusLetterWithCourage/Q10414_KekropusLetterWithCourage.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10414_KekropusLetterWithCourage/Q10414_KekropusLetterWithCourage.java
index 9ccfbd816a..d7087994d4 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10414_KekropusLetterWithCourage/Q10414_KekropusLetterWithCourage.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10414_KekropusLetterWithCourage/Q10414_KekropusLetterWithCourage.java
@@ -59,7 +59,7 @@ public class Q10414_KekropusLetterWithCourage extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10415_KekropusLetterWithWisdom/Q10415_KekropusLetterWithWisdom.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10415_KekropusLetterWithWisdom/Q10415_KekropusLetterWithWisdom.java
index 75e5d02fcd..9c59892974 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10415_KekropusLetterWithWisdom/Q10415_KekropusLetterWithWisdom.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10415_KekropusLetterWithWisdom/Q10415_KekropusLetterWithWisdom.java
@@ -60,7 +60,7 @@ public class Q10415_KekropusLetterWithWisdom extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java
index 4861df0eb2..96e7a785ae 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java
@@ -48,7 +48,7 @@ public class Q10416_InSearchOfTheEyeOfArgos extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java
index 5761e4157d..894b3f0208 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java
@@ -75,7 +75,7 @@ public class Q10417_DaimonTheWhiteEyed extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10418_TheImmortalPirateKing/Q10418_TheImmortalPirateKing.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10418_TheImmortalPirateKing/Q10418_TheImmortalPirateKing.java
index 239ef8a3a7..d6d93746c2 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10418_TheImmortalPirateKing/Q10418_TheImmortalPirateKing.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10418_TheImmortalPirateKing/Q10418_TheImmortalPirateKing.java
@@ -48,7 +48,7 @@ public class Q10418_TheImmortalPirateKing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10419_KekropusLetterKampfsWhereabouts/Q10419_KekropusLetterKampfsWhereabouts.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10419_KekropusLetterKampfsWhereabouts/Q10419_KekropusLetterKampfsWhereabouts.java
index 6549b92bf6..6475a8bb53 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10419_KekropusLetterKampfsWhereabouts/Q10419_KekropusLetterKampfsWhereabouts.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10419_KekropusLetterKampfsWhereabouts/Q10419_KekropusLetterKampfsWhereabouts.java
@@ -59,7 +59,7 @@ public class Q10419_KekropusLetterKampfsWhereabouts extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10420_TheVarkaSilenosSupporters/Q10420_TheVarkaSilenosSupporters.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10420_TheVarkaSilenosSupporters/Q10420_TheVarkaSilenosSupporters.java
index 698897c1c3..839f6f03d5 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10420_TheVarkaSilenosSupporters/Q10420_TheVarkaSilenosSupporters.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10420_TheVarkaSilenosSupporters/Q10420_TheVarkaSilenosSupporters.java
@@ -77,7 +77,7 @@ public class Q10420_TheVarkaSilenosSupporters extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10421_AssassinationOfTheVarkaSilenosCommander/Q10421_AssassinationOfTheVarkaSilenosCommander.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10421_AssassinationOfTheVarkaSilenosCommander/Q10421_AssassinationOfTheVarkaSilenosCommander.java
index 8b7feff241..c7629b3637 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10421_AssassinationOfTheVarkaSilenosCommander/Q10421_AssassinationOfTheVarkaSilenosCommander.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10421_AssassinationOfTheVarkaSilenosCommander/Q10421_AssassinationOfTheVarkaSilenosCommander.java
@@ -53,7 +53,7 @@ public class Q10421_AssassinationOfTheVarkaSilenosCommander extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java
index 7c9b29ca62..e4f5a2f5b7 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java
@@ -57,7 +57,7 @@ public class Q10422_AssassinationOfTheVarkaSilenosChief extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10424_KekropusLetterBelosWhereabouts/Q10424_KekropusLetterBelosWhereabouts.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10424_KekropusLetterBelosWhereabouts/Q10424_KekropusLetterBelosWhereabouts.java
index deb3c13012..6d21d04d40 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10424_KekropusLetterBelosWhereabouts/Q10424_KekropusLetterBelosWhereabouts.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10424_KekropusLetterBelosWhereabouts/Q10424_KekropusLetterBelosWhereabouts.java
@@ -59,7 +59,7 @@ public class Q10424_KekropusLetterBelosWhereabouts extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10425_TheKetraOrcSupporters/Q10425_TheKetraOrcSupporters.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10425_TheKetraOrcSupporters/Q10425_TheKetraOrcSupporters.java
index d7fc88c94c..39fc075b58 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10425_TheKetraOrcSupporters/Q10425_TheKetraOrcSupporters.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10425_TheKetraOrcSupporters/Q10425_TheKetraOrcSupporters.java
@@ -80,7 +80,7 @@ public class Q10425_TheKetraOrcSupporters extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10426_AssassinationOfTheKetraOrcCommander/Q10426_AssassinationOfTheKetraOrcCommander.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10426_AssassinationOfTheKetraOrcCommander/Q10426_AssassinationOfTheKetraOrcCommander.java
index e5b518988d..231e2242c2 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10426_AssassinationOfTheKetraOrcCommander/Q10426_AssassinationOfTheKetraOrcCommander.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10426_AssassinationOfTheKetraOrcCommander/Q10426_AssassinationOfTheKetraOrcCommander.java
@@ -55,7 +55,7 @@ public class Q10426_AssassinationOfTheKetraOrcCommander extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java
index 70922047ea..d277aca298 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java
@@ -57,7 +57,7 @@ public class Q10427_AssassinationOfTheKetraOrcChief extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10442_TheAnnihilatedPlains1/Q10442_TheAnnihilatedPlains1.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10442_TheAnnihilatedPlains1/Q10442_TheAnnihilatedPlains1.java
index 5d9569f1bc..cfa2532708 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10442_TheAnnihilatedPlains1/Q10442_TheAnnihilatedPlains1.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10442_TheAnnihilatedPlains1/Q10442_TheAnnihilatedPlains1.java
@@ -43,7 +43,7 @@ public class Q10442_TheAnnihilatedPlains1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10443_TheAnnihilatedPlains2/Q10443_TheAnnihilatedPlains2.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10443_TheAnnihilatedPlains2/Q10443_TheAnnihilatedPlains2.java
index a17b25f237..4a8eacfbf6 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10443_TheAnnihilatedPlains2/Q10443_TheAnnihilatedPlains2.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10443_TheAnnihilatedPlains2/Q10443_TheAnnihilatedPlains2.java
@@ -52,7 +52,7 @@ public class Q10443_TheAnnihilatedPlains2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10444_TheOriginOfMonsters/Q10444_TheOriginOfMonsters.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10444_TheOriginOfMonsters/Q10444_TheOriginOfMonsters.java
index ad98ec175b..e52d6f6c4f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10444_TheOriginOfMonsters/Q10444_TheOriginOfMonsters.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10444_TheOriginOfMonsters/Q10444_TheOriginOfMonsters.java
@@ -57,7 +57,7 @@ public class Q10444_TheOriginOfMonsters extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10445_AnImpendingThreat/Q10445_AnImpendingThreat.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10445_AnImpendingThreat/Q10445_AnImpendingThreat.java
index c78d904936..dac215a5b1 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10445_AnImpendingThreat/Q10445_AnImpendingThreat.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10445_AnImpendingThreat/Q10445_AnImpendingThreat.java
@@ -53,7 +53,7 @@ public class Q10445_AnImpendingThreat extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java
index bb70f87faa..4649f7548e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java
@@ -58,7 +58,7 @@ public class Q10446_HitAndRun extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java
index c49b98c92d..c173bf24b6 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java
@@ -74,7 +74,7 @@ public class Q10447_TimingIsEverything extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10450_ADarkAmbition/Q10450_ADarkAmbition.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10450_ADarkAmbition/Q10450_ADarkAmbition.java
index c3f232b499..8f085a2197 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10450_ADarkAmbition/Q10450_ADarkAmbition.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10450_ADarkAmbition/Q10450_ADarkAmbition.java
@@ -49,7 +49,7 @@ public class Q10450_ADarkAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10452_IsItEdible/Q10452_IsItEdible.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10452_IsItEdible/Q10452_IsItEdible.java
index 921c507a44..751de64b84 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10452_IsItEdible/Q10452_IsItEdible.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10452_IsItEdible/Q10452_IsItEdible.java
@@ -53,7 +53,7 @@ public class Q10452_IsItEdible extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10453_StoppingTheWindDragon/Q10453_StoppingTheWindDragon.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10453_StoppingTheWindDragon/Q10453_StoppingTheWindDragon.java
index 3b567c5d04..6a74beb026 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10453_StoppingTheWindDragon/Q10453_StoppingTheWindDragon.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10453_StoppingTheWindDragon/Q10453_StoppingTheWindDragon.java
@@ -46,7 +46,7 @@ public class Q10453_StoppingTheWindDragon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java
index b6cec7570e..7268e0de45 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java
@@ -50,7 +50,7 @@ public class Q10455_ElikiasLetter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10456_OperationRescue/Q10456_OperationRescue.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10456_OperationRescue/Q10456_OperationRescue.java
index f38ae9e388..7da35bc35f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10456_OperationRescue/Q10456_OperationRescue.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10456_OperationRescue/Q10456_OperationRescue.java
@@ -66,7 +66,7 @@ public class Q10456_OperationRescue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10457_KefensisIllusion/Q10457_KefensisIllusion.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10457_KefensisIllusion/Q10457_KefensisIllusion.java
index 907cca5e98..32d56eba4b 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10457_KefensisIllusion/Q10457_KefensisIllusion.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10457_KefensisIllusion/Q10457_KefensisIllusion.java
@@ -65,7 +65,7 @@ public class Q10457_KefensisIllusion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java
index fc5b941631..11718fe3dc 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java
@@ -54,7 +54,7 @@ public class Q10459_ASickAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10460_ReturnOfTheAlligatorHunter/Q10460_ReturnOfTheAlligatorHunter.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10460_ReturnOfTheAlligatorHunter/Q10460_ReturnOfTheAlligatorHunter.java
index d62452bd77..e5379d1f25 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10460_ReturnOfTheAlligatorHunter/Q10460_ReturnOfTheAlligatorHunter.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10460_ReturnOfTheAlligatorHunter/Q10460_ReturnOfTheAlligatorHunter.java
@@ -61,7 +61,7 @@ public class Q10460_ReturnOfTheAlligatorHunter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10461_TappingThePowerWithin/Q10461_TappingThePowerWithin.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10461_TappingThePowerWithin/Q10461_TappingThePowerWithin.java
index fba665d36a..c6682c66ea 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10461_TappingThePowerWithin/Q10461_TappingThePowerWithin.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10461_TappingThePowerWithin/Q10461_TappingThePowerWithin.java
@@ -46,7 +46,7 @@ public class Q10461_TappingThePowerWithin extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10462_TemperARustingBlade/Q10462_TemperARustingBlade.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10462_TemperARustingBlade/Q10462_TemperARustingBlade.java
index 26bd532b3f..4d2fdb9690 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10462_TemperARustingBlade/Q10462_TemperARustingBlade.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10462_TemperARustingBlade/Q10462_TemperARustingBlade.java
@@ -56,7 +56,7 @@ public class Q10462_TemperARustingBlade extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10465_SoulFrostSword/Q10465_SoulFrostSword.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10465_SoulFrostSword/Q10465_SoulFrostSword.java
index c5e88e36f4..3cdb6e09b2 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10465_SoulFrostSword/Q10465_SoulFrostSword.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10465_SoulFrostSword/Q10465_SoulFrostSword.java
@@ -52,7 +52,7 @@ public class Q10465_SoulFrostSword extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10472_WindsOfFateEncroachingShadows/Q10472_WindsOfFateEncroachingShadows.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10472_WindsOfFateEncroachingShadows/Q10472_WindsOfFateEncroachingShadows.java
index 0ffb1623b8..eb5b37a492 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10472_WindsOfFateEncroachingShadows/Q10472_WindsOfFateEncroachingShadows.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10472_WindsOfFateEncroachingShadows/Q10472_WindsOfFateEncroachingShadows.java
@@ -91,7 +91,7 @@ public class Q10472_WindsOfFateEncroachingShadows extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
index bacbb7058b..ad79a5980b 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
@@ -73,7 +73,7 @@ public class Q10501_ZakenEmbroideredSoulCloak extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (player.getLevel() >= MIN_LEVEL) && event.equals("32612-04.html"))
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
index d1678a7601..38f4514197 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
@@ -73,7 +73,7 @@ public class Q10502_FreyaEmbroideredSoulCloak extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (player.getLevel() >= MIN_LEVEL) && event.equals("32612-04.html"))
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
index 224940ecd9..08aa62d532 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
@@ -74,7 +74,7 @@ public class Q10503_FrintezzaEmbroideredSoulCloak extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (player.getLevel() >= MIN_LEVEL) && event.equals("32612-04.html"))
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java
index b150a02b38..d81d398014 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java
@@ -66,7 +66,7 @@ public class Q10504_JewelOfAntharas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java
index 0c9360d9b7..e598298776 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java
@@ -66,7 +66,7 @@ public class Q10505_JewelOfValakas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java
index d54b590a9b..426591ffae 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java
@@ -59,7 +59,7 @@ public class Q10521_QueenNavarisLetterVarkaSilenosBarracks extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10522_TheDarkSecretOfVarkaSilenos/Q10522_TheDarkSecretOfVarkaSilenos.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10522_TheDarkSecretOfVarkaSilenos/Q10522_TheDarkSecretOfVarkaSilenos.java
index 703a1ac8bc..9564458b27 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10522_TheDarkSecretOfVarkaSilenos/Q10522_TheDarkSecretOfVarkaSilenos.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10522_TheDarkSecretOfVarkaSilenos/Q10522_TheDarkSecretOfVarkaSilenos.java
@@ -73,7 +73,7 @@ public class Q10522_TheDarkSecretOfVarkaSilenos extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10523_TheAssassinationOfTheVarkaSilenosCommander/Q10523_TheAssassinationOfTheVarkaSilenosCommander.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10523_TheAssassinationOfTheVarkaSilenosCommander/Q10523_TheAssassinationOfTheVarkaSilenosCommander.java
index bc88c09827..66a58918c5 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10523_TheAssassinationOfTheVarkaSilenosCommander/Q10523_TheAssassinationOfTheVarkaSilenosCommander.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10523_TheAssassinationOfTheVarkaSilenosCommander/Q10523_TheAssassinationOfTheVarkaSilenosCommander.java
@@ -55,7 +55,7 @@ public class Q10523_TheAssassinationOfTheVarkaSilenosCommander extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief.java
index 73761de539..f501b9bbee 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief.java
@@ -58,7 +58,7 @@ public class Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief extends Ques
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10525_QueenNavarisLetterKetraOrcOutpost/Q10525_QueenNavarisLetterKetraOrcOutpost.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10525_QueenNavarisLetterKetraOrcOutpost/Q10525_QueenNavarisLetterKetraOrcOutpost.java
index 804bd26873..bb23986f42 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10525_QueenNavarisLetterKetraOrcOutpost/Q10525_QueenNavarisLetterKetraOrcOutpost.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10525_QueenNavarisLetterKetraOrcOutpost/Q10525_QueenNavarisLetterKetraOrcOutpost.java
@@ -58,7 +58,7 @@ public class Q10525_QueenNavarisLetterKetraOrcOutpost extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10526_TheDarkSecretOfTheKetraOrcs/Q10526_TheDarkSecretOfTheKetraOrcs.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10526_TheDarkSecretOfTheKetraOrcs/Q10526_TheDarkSecretOfTheKetraOrcs.java
index 95b5d6c43d..038e8661b8 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10526_TheDarkSecretOfTheKetraOrcs/Q10526_TheDarkSecretOfTheKetraOrcs.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10526_TheDarkSecretOfTheKetraOrcs/Q10526_TheDarkSecretOfTheKetraOrcs.java
@@ -78,7 +78,7 @@ public class Q10526_TheDarkSecretOfTheKetraOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10527_TheAssassinationOfTheKetraOrcCommander/Q10527_TheAssassinationOfTheKetraOrcCommander.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10527_TheAssassinationOfTheKetraOrcCommander/Q10527_TheAssassinationOfTheKetraOrcCommander.java
index 7cca4304fb..16beb3437e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10527_TheAssassinationOfTheKetraOrcCommander/Q10527_TheAssassinationOfTheKetraOrcCommander.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10527_TheAssassinationOfTheKetraOrcCommander/Q10527_TheAssassinationOfTheKetraOrcCommander.java
@@ -56,7 +56,7 @@ public class Q10527_TheAssassinationOfTheKetraOrcCommander extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10528_TheAssassinationOfTheKetraOrcChief/Q10528_TheAssassinationOfTheKetraOrcChief.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10528_TheAssassinationOfTheKetraOrcChief/Q10528_TheAssassinationOfTheKetraOrcChief.java
index 02307626f3..713ac08316 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10528_TheAssassinationOfTheKetraOrcChief/Q10528_TheAssassinationOfTheKetraOrcChief.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10528_TheAssassinationOfTheKetraOrcChief/Q10528_TheAssassinationOfTheKetraOrcChief.java
@@ -59,7 +59,7 @@ public class Q10528_TheAssassinationOfTheKetraOrcChief extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10530_KekropusLetterTheDragonsTransition/Q10530_KekropusLetterTheDragonsTransition.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10530_KekropusLetterTheDragonsTransition/Q10530_KekropusLetterTheDragonsTransition.java
index 61ae1e53ac..f2a9294597 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10530_KekropusLetterTheDragonsTransition/Q10530_KekropusLetterTheDragonsTransition.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10530_KekropusLetterTheDragonsTransition/Q10530_KekropusLetterTheDragonsTransition.java
@@ -61,7 +61,7 @@ public class Q10530_KekropusLetterTheDragonsTransition extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10531_OddHappeningsAtDragonValley/Q10531_OddHappeningsAtDragonValley.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10531_OddHappeningsAtDragonValley/Q10531_OddHappeningsAtDragonValley.java
index 0b6cb61f4c..b366a824aa 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10531_OddHappeningsAtDragonValley/Q10531_OddHappeningsAtDragonValley.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10531_OddHappeningsAtDragonValley/Q10531_OddHappeningsAtDragonValley.java
@@ -72,7 +72,7 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java
index f8f9d1af2c..c67fbd555d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java
@@ -68,7 +68,7 @@ public class Q10532_UncoveringTheConspiracy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10534_HatchlingResearch/Q10534_HatchlingResearch.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10534_HatchlingResearch/Q10534_HatchlingResearch.java
index ca8ea7ebfa..32a839c147 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10534_HatchlingResearch/Q10534_HatchlingResearch.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10534_HatchlingResearch/Q10534_HatchlingResearch.java
@@ -52,7 +52,7 @@ public class Q10534_HatchlingResearch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10537_KamaelDisarray/Q10537_KamaelDisarray.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10537_KamaelDisarray/Q10537_KamaelDisarray.java
index 3f641802c2..63def42cfb 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10537_KamaelDisarray/Q10537_KamaelDisarray.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10537_KamaelDisarray/Q10537_KamaelDisarray.java
@@ -82,7 +82,7 @@ public class Q10537_KamaelDisarray extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10538_GiantsEvolution/Q10538_GiantsEvolution.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10538_GiantsEvolution/Q10538_GiantsEvolution.java
index f237fe9262..5b4da4cac7 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10538_GiantsEvolution/Q10538_GiantsEvolution.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10538_GiantsEvolution/Q10538_GiantsEvolution.java
@@ -60,7 +60,7 @@ public class Q10538_GiantsEvolution extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10539_EnergySupplyCutoffPlan/Q10539_EnergySupplyCutoffPlan.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10539_EnergySupplyCutoffPlan/Q10539_EnergySupplyCutoffPlan.java
index f97a6b1c21..4be23c454e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10539_EnergySupplyCutoffPlan/Q10539_EnergySupplyCutoffPlan.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10539_EnergySupplyCutoffPlan/Q10539_EnergySupplyCutoffPlan.java
@@ -61,7 +61,7 @@ public class Q10539_EnergySupplyCutoffPlan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10540_ThwartingMimirsPlan/Q10540_ThwartingMimirsPlan.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10540_ThwartingMimirsPlan/Q10540_ThwartingMimirsPlan.java
index abb91a031f..022a73b7dc 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10540_ThwartingMimirsPlan/Q10540_ThwartingMimirsPlan.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10540_ThwartingMimirsPlan/Q10540_ThwartingMimirsPlan.java
@@ -49,7 +49,7 @@ public class Q10540_ThwartingMimirsPlan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java
index e535bac70e..e7512c8a13 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java
@@ -78,7 +78,7 @@ public class Q10541_TrainLikeTheRealThing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java
index 6ed762a459..36c84dbc26 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java
@@ -64,7 +64,7 @@ public class Q10542_SearchingForNewPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java
index 22addc42d3..97de9ee5f4 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java
@@ -57,7 +57,7 @@ public class Q10543_SheddingWeight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10544_SeekerSupplies/Q10544_SeekerSupplies.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10544_SeekerSupplies/Q10544_SeekerSupplies.java
index d3a4dcdf0f..1294572c58 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10544_SeekerSupplies/Q10544_SeekerSupplies.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10544_SeekerSupplies/Q10544_SeekerSupplies.java
@@ -71,7 +71,7 @@ public class Q10544_SeekerSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/Q10658_MakkumInTheDimension.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/Q10658_MakkumInTheDimension.java
index 4345dfeba7..1f1ee2e21d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/Q10658_MakkumInTheDimension.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/Q10658_MakkumInTheDimension.java
@@ -50,7 +50,7 @@ public class Q10658_MakkumInTheDimension extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java
index 593c0d4936..e2bb80f5e5 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java
@@ -46,7 +46,7 @@ public class Q10701_TheRoadToDestruction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java
index 1ede0c4ba5..ba1153cd88 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java
@@ -46,7 +46,7 @@ public class Q10702_TheRoadToInfinity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java
index 2ee25d6af7..253b12cda4 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java
@@ -48,7 +48,7 @@ public class Q10703_BottleOfIstinasSoul extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java
index 23bae467b4..9e799c2fcb 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java
@@ -48,7 +48,7 @@ public class Q10704_BottleOfOctavisSoul extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java
index 94c10b561b..4c8ae1432b 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java
@@ -48,7 +48,7 @@ public class Q10705_BottleOfTautisSoul extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java
index 16b4f7af81..680a69f7b3 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java
@@ -63,7 +63,7 @@ public class Q10707_FlamesOfSorrow extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java
index dc5315cb66..37078cfbee 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java
@@ -53,7 +53,7 @@ public class Q10708_StrengthenTheBarrier extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (event.equals("activateKey"))
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10709_TheStolenSeed/Q10709_TheStolenSeed.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10709_TheStolenSeed/Q10709_TheStolenSeed.java
index 6d74cc229a..7734a2ed74 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10709_TheStolenSeed/Q10709_TheStolenSeed.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10709_TheStolenSeed/Q10709_TheStolenSeed.java
@@ -58,7 +58,7 @@ public class Q10709_TheStolenSeed extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (event.equals("action"))
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10710_LifeEnergyRepository/Q10710_LifeEnergyRepository.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10710_LifeEnergyRepository/Q10710_LifeEnergyRepository.java
index d85b1154c8..d3ec85c20a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10710_LifeEnergyRepository/Q10710_LifeEnergyRepository.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10710_LifeEnergyRepository/Q10710_LifeEnergyRepository.java
@@ -64,7 +64,7 @@ public class Q10710_LifeEnergyRepository extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (event.equals("action"))
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java
index 6e5eb3cafd..7a20bc6711 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java
@@ -46,7 +46,7 @@ public class Q10732_AForeignLand extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java
index 72240e61bb..ab45ced198 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java
@@ -51,7 +51,7 @@ public class Q10733_TheTestForSurvival extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java
index f7fe13789b..59236f55a2 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java
@@ -68,7 +68,7 @@ public class Q10734_DoOrDie extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java
index 6d51149018..fa1ffbfa27 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java
@@ -64,7 +64,7 @@ public class Q10735_ASpecialPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("33942-02.htm"))
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java
index 195b92dea1..112039ce84 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java
@@ -63,7 +63,7 @@ public class Q10736_ASpecialPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("33943-02.htm"))
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java
index 350792eb17..94214632aa 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java
@@ -57,7 +57,7 @@ public class Q10737_GrakonsWarehouse extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java
index 063ad7d06c..8c1406aac3 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java
@@ -51,7 +51,7 @@ public class Q10738_AnInnerBeauty extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java
index d31c254fe7..80fb44427a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java
@@ -65,7 +65,7 @@ public class Q10739_SupplyAndDemand extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java
index 4b4379d023..0e0f8218fd 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java
@@ -66,7 +66,7 @@ public class Q10740_NeverForget extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java
index 897dc08246..14d56cb857 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java
@@ -57,7 +57,7 @@ public class Q10741_ADraughtForTheCold extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java
index 91747ce053..61518ac855 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java
@@ -62,7 +62,7 @@ public class Q10742_AFurryFriend extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java
index 62be95fe57..e57fe9584e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java
@@ -64,7 +64,7 @@ public class Q10743_StrangeFungus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java
index a30ff5fd9d..59e6700719 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java
@@ -53,7 +53,7 @@ public class Q10744_StrongerThanSteel extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java
index 6edc5ade14..085bc4830c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java
@@ -60,7 +60,7 @@ public class Q10745_TheSecretIngredients extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java
index 99a593cea4..e3f9521f8e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java
@@ -57,7 +57,7 @@ public class Q10746_SeeTheWorld extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10748_MysteriousSuggestion1/Q10748_MysteriousSuggestion1.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10748_MysteriousSuggestion1/Q10748_MysteriousSuggestion1.java
index bf24739d4a..1db27a83de 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10748_MysteriousSuggestion1/Q10748_MysteriousSuggestion1.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10748_MysteriousSuggestion1/Q10748_MysteriousSuggestion1.java
@@ -54,7 +54,7 @@ public final class Q10748_MysteriousSuggestion1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10749_MysteriousSuggestion2/Q10749_MysteriousSuggestion2.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10749_MysteriousSuggestion2/Q10749_MysteriousSuggestion2.java
index 2e1b4f7932..fe683bb978 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10749_MysteriousSuggestion2/Q10749_MysteriousSuggestion2.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10749_MysteriousSuggestion2/Q10749_MysteriousSuggestion2.java
@@ -54,7 +54,7 @@ public final class Q10749_MysteriousSuggestion2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java
index 0ef19ce0fa..2f6ddd1da8 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java
@@ -98,7 +98,7 @@ public class Q10751_WindsOfFateEncounters extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java
index 327ace8eca..4af6f4b0ed 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java
@@ -87,7 +87,7 @@ public class Q10752_WindsOfFateAPromise extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java
index 706839850c..f6e230ff2c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java
@@ -135,7 +135,7 @@ public class Q10753_WindsOfFateChoices extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10755_LettersFromTheQueenWindyHill/Q10755_LettersFromTheQueenWindyHill.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10755_LettersFromTheQueenWindyHill/Q10755_LettersFromTheQueenWindyHill.java
index d5c4bced8d..979254f51d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10755_LettersFromTheQueenWindyHill/Q10755_LettersFromTheQueenWindyHill.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10755_LettersFromTheQueenWindyHill/Q10755_LettersFromTheQueenWindyHill.java
@@ -55,7 +55,7 @@ public class Q10755_LettersFromTheQueenWindyHill extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java
index 88303627aa..f3d60b3ab9 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java
@@ -62,7 +62,7 @@ public class Q10756_AnInterdimensionalDraft extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java
index 827f52bf70..4971f73a3f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java
@@ -59,7 +59,7 @@ public class Q10757_QuietingTheStorm extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10758_TheOathOfTheWind/Q10758_TheOathOfTheWind.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10758_TheOathOfTheWind/Q10758_TheOathOfTheWind.java
index 4485888467..a6b19e4eb5 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10758_TheOathOfTheWind/Q10758_TheOathOfTheWind.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10758_TheOathOfTheWind/Q10758_TheOathOfTheWind.java
@@ -54,7 +54,7 @@ public class Q10758_TheOathOfTheWind extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10760_LettersFromTheQueenOrcBarracks/Q10760_LettersFromTheQueenOrcBarracks.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10760_LettersFromTheQueenOrcBarracks/Q10760_LettersFromTheQueenOrcBarracks.java
index 6f19d93f5b..728a4d8750 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10760_LettersFromTheQueenOrcBarracks/Q10760_LettersFromTheQueenOrcBarracks.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10760_LettersFromTheQueenOrcBarracks/Q10760_LettersFromTheQueenOrcBarracks.java
@@ -55,7 +55,7 @@ public class Q10760_LettersFromTheQueenOrcBarracks extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java
index cc57420b36..b19c945784 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java
@@ -65,7 +65,7 @@ public class Q10761_AnOrcInLove extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10762_MarionetteSpirit/Q10762_MarionetteSpirit.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10762_MarionetteSpirit/Q10762_MarionetteSpirit.java
index b4724c2b81..5b5d3dc231 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10762_MarionetteSpirit/Q10762_MarionetteSpirit.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10762_MarionetteSpirit/Q10762_MarionetteSpirit.java
@@ -55,7 +55,7 @@ public class Q10762_MarionetteSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java
index 1ae3f48a9b..cb7c39a7c0 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java
@@ -54,7 +54,7 @@ public class Q10763_TerrifyingChertuba extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java
index 7dd9c4ebae..8067e73cf3 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java
@@ -62,7 +62,7 @@ public class Q10764_FreeSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10766_ANewCraft/Q10766_ANewCraft.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10766_ANewCraft/Q10766_ANewCraft.java
index c9bc545a1a..708268cf05 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10766_ANewCraft/Q10766_ANewCraft.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10766_ANewCraft/Q10766_ANewCraft.java
@@ -63,7 +63,7 @@ public class Q10766_ANewCraft extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java
index 6fb43e4cd6..a82c8271e6 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java
@@ -60,7 +60,7 @@ public class Q10767_AWholeNewLevelOfAlchemy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10769_LettersFromTheQueenCrumaTowerPart1/Q10769_LettersFromTheQueenCrumaTowerPart1.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10769_LettersFromTheQueenCrumaTowerPart1/Q10769_LettersFromTheQueenCrumaTowerPart1.java
index dd3094b3e1..8d340700ac 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10769_LettersFromTheQueenCrumaTowerPart1/Q10769_LettersFromTheQueenCrumaTowerPart1.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10769_LettersFromTheQueenCrumaTowerPart1/Q10769_LettersFromTheQueenCrumaTowerPart1.java
@@ -57,7 +57,7 @@ public class Q10769_LettersFromTheQueenCrumaTowerPart1 extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java
index 54e0a0f389..2acfad68bd 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java
@@ -62,7 +62,7 @@ public class Q10770_InSearchOfTheGrail extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java
index 78b1a969d8..f744ad750f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java
@@ -60,7 +60,7 @@ public class Q10771_VolatilePower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java
index 6e5545e8f4..78a1c7ec03 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java
@@ -60,7 +60,7 @@ public class Q10772_ReportsFromCrumaTowerPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java
index ddd688d95a..c29029eed7 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java
@@ -56,7 +56,7 @@ public class Q10774_LettersFromTheQueenCrumaTowerPart2 extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java
index 461bb753c7..a6e48a1216 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java
@@ -64,7 +64,7 @@ public class Q10775_InSearchOfAnAncientGiant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java
index 16c146334a..f9e797dc7f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java
@@ -70,7 +70,7 @@ public class Q10776_TheWrathOfTheGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java
index d8030e4eee..0fd3f2e737 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java
@@ -60,7 +60,7 @@ public class Q10777_ReportsFromCrumaTowerPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10779_LettersFromTheQueenSeaOfSpores/Q10779_LettersFromTheQueenSeaOfSpores.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10779_LettersFromTheQueenSeaOfSpores/Q10779_LettersFromTheQueenSeaOfSpores.java
index 20e9699738..1743f54b84 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10779_LettersFromTheQueenSeaOfSpores/Q10779_LettersFromTheQueenSeaOfSpores.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10779_LettersFromTheQueenSeaOfSpores/Q10779_LettersFromTheQueenSeaOfSpores.java
@@ -56,7 +56,7 @@ public class Q10779_LettersFromTheQueenSeaOfSpores extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java
index 1444f44b3d..1389dc7cd5 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java
@@ -66,7 +66,7 @@ public class Q10780_AWeakenedBarrier extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10781_IngredientsToEnforcements/Q10781_IngredientsToEnforcements.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10781_IngredientsToEnforcements/Q10781_IngredientsToEnforcements.java
index ae9e2ae780..880bc75f17 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10781_IngredientsToEnforcements/Q10781_IngredientsToEnforcements.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10781_IngredientsToEnforcements/Q10781_IngredientsToEnforcements.java
@@ -61,7 +61,7 @@ public class Q10781_IngredientsToEnforcements extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java
index 6c11c32381..ba9cdbe126 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java
@@ -56,7 +56,7 @@ public class Q10782_LettersFromTheQueenForsakenPlains extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java
index bf536b64e4..dfbaa8ddc2 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java
@@ -79,7 +79,7 @@ public class Q10783_TracesOfAnAmbush extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java
index bbd2071af5..f32c83a0af 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java
@@ -66,7 +66,7 @@ public class Q10784_TheBrokenDevice extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java
index c688e09ef8..1edfa79000 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java
@@ -56,7 +56,7 @@ public class Q10785_LettersFromTheQueenFieldsOfMassacre extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java
index 8234edf8b1..b64830bfcd 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java
@@ -74,7 +74,7 @@ public class Q10786_ResidentProblemSolver extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java
index 09bd9760de..8aa64b279c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java
@@ -58,7 +58,7 @@ public class Q10787_ASpyMission extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java
index 8f151450ce..602b67c92f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java
@@ -56,7 +56,7 @@ public class Q10789_LettersFromTheQueenSwampOfScreams extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java
index 1c7c1b56d6..9b9c5b917c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java
@@ -75,7 +75,7 @@ public class Q10790_AMercenaryHelper extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java
index 06e621609d..ce55607210 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java
@@ -66,7 +66,7 @@ public class Q10791_TheManOfMystery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java
index 199a233254..82e3335ab0 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java
@@ -56,7 +56,7 @@ public class Q10792_LettersFromTheQueenForestOfTheDead extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java
index c1d1d998d8..e1d0307f88 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java
@@ -72,7 +72,7 @@ public class Q10793_SaveTheSouls extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java
index a6755ce1c7..55fc667c4a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java
@@ -95,7 +95,7 @@ public class Q10794_InvestigateTheForest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java
index 41036407f6..2fde8e412d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java
@@ -41,7 +41,7 @@ public class Q10795_LettersFromTheQueenWallOfAgros extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java
index 249b0ee4dd..8263dbf02d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java
@@ -68,7 +68,7 @@ public class Q10796_TheEyeThatDefiedTheGods extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
index 7d89984145..46893db27c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
@@ -53,7 +53,7 @@ public class Q10797_CrossingFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java
index a4388db16a..2cc223805a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java
@@ -57,7 +57,7 @@ public class Q10798_LettersFromTheQueenDragonValley extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java
index ca11445d73..2d0029e122 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java
@@ -71,7 +71,7 @@ public class Q10799_StrangeThingsAfootInTheValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java
index 775ddadcdf..24497f8891 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java
@@ -71,7 +71,7 @@ public class Q10800_ReconnaissanceAtDragonValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
index b1dca4d5b3..15fc371c1a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
@@ -55,7 +55,7 @@ public class Q10801_TheDimensionalWarpPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
index 1339720830..1b0c8d74d0 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
@@ -56,7 +56,7 @@ public class Q10802_TheDimensionalWarpPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
index 117f5cc53e..4cae513e93 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
@@ -57,7 +57,7 @@ public class Q10803_TheDimensionalWarpPart3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
index 124823783a..f16e276a8f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
@@ -57,7 +57,7 @@ public class Q10804_TheDimensionalWarpPart4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
index a6796e0c63..b80b2b6ae5 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
@@ -57,7 +57,7 @@ public class Q10805_TheDimensionalWarpPart5 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
index d6ecba6b8e..5a8d67d930 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
@@ -56,7 +56,7 @@ public class Q10806_TheDimensionalWarpPart6 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
index 12462309a1..393bbe074c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
@@ -56,7 +56,7 @@ public class Q10807_TheDimensionalWarpPart7 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
index 8073ec2f06..22a2ff228a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
@@ -56,7 +56,7 @@ public class Q10811_ExaltedOneWhoFacesTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java
index 7ec8f800a0..fedb8e39bb 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java
@@ -93,7 +93,7 @@ public class Q10812_FacingSadness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10813_ForGlory/Q10813_ForGlory.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10813_ForGlory/Q10813_ForGlory.java
index 76fd620dde..89b572a2cc 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10813_ForGlory/Q10813_ForGlory.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10813_ForGlory/Q10813_ForGlory.java
@@ -58,7 +58,7 @@ public class Q10813_ForGlory extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java
index e487e06324..f583c8098b 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java
@@ -75,7 +75,7 @@ public class Q10814_BefittingOfTheStatus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java
index 7972a03dab..fa919c506c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java
@@ -66,7 +66,7 @@ public class Q10815_StepUp extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
index d508360581..d7790a8516 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
@@ -57,7 +57,7 @@ public class Q10817_ExaltedOneWhoOvercomesTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java
index 22cbb61194..0f898acae0 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java
@@ -64,7 +64,7 @@ public class Q10818_ConfrontingAGiantMonster extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10819_ForHonor/Q10819_ForHonor.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10819_ForHonor/Q10819_ForHonor.java
index d3d25867b9..250f860227 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10819_ForHonor/Q10819_ForHonor.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10819_ForHonor/Q10819_ForHonor.java
@@ -62,7 +62,7 @@ public class Q10819_ForHonor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10820_RelationshipsBefittingOfTheStatus/Q10820_RelationshipsBefittingOfTheStatus.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10820_RelationshipsBefittingOfTheStatus/Q10820_RelationshipsBefittingOfTheStatus.java
index d23b38f64a..126444e4a6 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10820_RelationshipsBefittingOfTheStatus/Q10820_RelationshipsBefittingOfTheStatus.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10820_RelationshipsBefittingOfTheStatus/Q10820_RelationshipsBefittingOfTheStatus.java
@@ -58,7 +58,7 @@ public class Q10820_RelationshipsBefittingOfTheStatus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10821_HelpingOthers/Q10821_HelpingOthers.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10821_HelpingOthers/Q10821_HelpingOthers.java
index 0ad084443b..bdbb8b5edb 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10821_HelpingOthers/Q10821_HelpingOthers.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10821_HelpingOthers/Q10821_HelpingOthers.java
@@ -55,7 +55,7 @@ public class Q10821_HelpingOthers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
index 783687b68a..068d0313dd 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
@@ -59,7 +59,7 @@ public class Q10823_ExaltedOneWhoShattersTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java
index 68dd1f489a..b9d8b3ecb3 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java
@@ -55,7 +55,7 @@ public class Q10824_ConfrontingTheGreatestDanger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java
index d9982218ab..f62d1ec44d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java
@@ -61,7 +61,7 @@ public class Q10825_ForVictory extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10826_LuckBefittingOfTheStatus/Q10826_LuckBefittingOfTheStatus.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10826_LuckBefittingOfTheStatus/Q10826_LuckBefittingOfTheStatus.java
index 5a01415cd2..9a969561c5 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10826_LuckBefittingOfTheStatus/Q10826_LuckBefittingOfTheStatus.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10826_LuckBefittingOfTheStatus/Q10826_LuckBefittingOfTheStatus.java
@@ -76,7 +76,7 @@ public class Q10826_LuckBefittingOfTheStatus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10827_StepUpToLead/Q10827_StepUpToLead.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10827_StepUpToLead/Q10827_StepUpToLead.java
index 35fcab2537..73a3168454 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10827_StepUpToLead/Q10827_StepUpToLead.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10827_StepUpToLead/Q10827_StepUpToLead.java
@@ -58,7 +58,7 @@ public class Q10827_StepUpToLead extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10829_InSearchOfTheCause/Q10829_InSearchOfTheCause.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10829_InSearchOfTheCause/Q10829_InSearchOfTheCause.java
index 8f4b8ea015..8d961007e0 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10829_InSearchOfTheCause/Q10829_InSearchOfTheCause.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10829_InSearchOfTheCause/Q10829_InSearchOfTheCause.java
@@ -49,7 +49,7 @@ public class Q10829_InSearchOfTheCause extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/Q10830_TheLostGardenOfSpirits.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/Q10830_TheLostGardenOfSpirits.java
index f5a77a8c46..f1e8fcac8e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/Q10830_TheLostGardenOfSpirits.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/Q10830_TheLostGardenOfSpirits.java
@@ -63,7 +63,7 @@ public class Q10830_TheLostGardenOfSpirits extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10831_UnbelievableSight/Q10831_UnbelievableSight.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10831_UnbelievableSight/Q10831_UnbelievableSight.java
index 292e487dbb..09e8f8bffb 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10831_UnbelievableSight/Q10831_UnbelievableSight.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10831_UnbelievableSight/Q10831_UnbelievableSight.java
@@ -64,7 +64,7 @@ public class Q10831_UnbelievableSight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10832_EnergyOfSadnessAndAnger/Q10832_EnergyOfSadnessAndAnger.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10832_EnergyOfSadnessAndAnger/Q10832_EnergyOfSadnessAndAnger.java
index c3ba629f61..69125c3c8e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10832_EnergyOfSadnessAndAnger/Q10832_EnergyOfSadnessAndAnger.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10832_EnergyOfSadnessAndAnger/Q10832_EnergyOfSadnessAndAnger.java
@@ -79,7 +79,7 @@ public class Q10832_EnergyOfSadnessAndAnger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10833_PutTheQueenOfSpiritsToSleep/Q10833_PutTheQueenOfSpiritsToSleep.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10833_PutTheQueenOfSpiritsToSleep/Q10833_PutTheQueenOfSpiritsToSleep.java
index f139198949..0072e5d723 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10833_PutTheQueenOfSpiritsToSleep/Q10833_PutTheQueenOfSpiritsToSleep.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10833_PutTheQueenOfSpiritsToSleep/Q10833_PutTheQueenOfSpiritsToSleep.java
@@ -56,7 +56,7 @@ public class Q10833_PutTheQueenOfSpiritsToSleep extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10836_DisappearedClanMember/Q10836_DisappearedClanMember.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10836_DisappearedClanMember/Q10836_DisappearedClanMember.java
index 3b3f852c70..3230d13891 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10836_DisappearedClanMember/Q10836_DisappearedClanMember.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10836_DisappearedClanMember/Q10836_DisappearedClanMember.java
@@ -59,7 +59,7 @@ public class Q10836_DisappearedClanMember extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10837_LookingForTheBlackbirdClanMember/Q10837_LookingForTheBlackbirdClanMember.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10837_LookingForTheBlackbirdClanMember/Q10837_LookingForTheBlackbirdClanMember.java
index 217cabf9fb..a83cf4e3fa 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10837_LookingForTheBlackbirdClanMember/Q10837_LookingForTheBlackbirdClanMember.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10837_LookingForTheBlackbirdClanMember/Q10837_LookingForTheBlackbirdClanMember.java
@@ -54,7 +54,7 @@ public class Q10837_LookingForTheBlackbirdClanMember extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java
index 2ef2a3e32e..6b0de70720 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java
@@ -64,7 +64,7 @@ public class Q10838_TheReasonForNotBeingAbleToGetOut extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java
index 248d9275e5..c4ba15bb8f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java
@@ -61,7 +61,7 @@ public class Q10839_BlackbirdsNameValue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java
index 218f86f996..1a12c524a9 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java
@@ -63,7 +63,7 @@ public class Q10840_TimeToRecover extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java
index 8cf3b7506e..cae50c4972 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java
@@ -53,7 +53,7 @@ public class Q10841_DeepInsideAteliaFortress extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10843_AnomalyInTheEnchantedValley/Q10843_AnomalyInTheEnchantedValley.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10843_AnomalyInTheEnchantedValley/Q10843_AnomalyInTheEnchantedValley.java
index e1712c2ba9..ae707e925f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10843_AnomalyInTheEnchantedValley/Q10843_AnomalyInTheEnchantedValley.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10843_AnomalyInTheEnchantedValley/Q10843_AnomalyInTheEnchantedValley.java
@@ -48,7 +48,7 @@ public class Q10843_AnomalyInTheEnchantedValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10844_BloodyBattleSeizingSupplies/Q10844_BloodyBattleSeizingSupplies.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10844_BloodyBattleSeizingSupplies/Q10844_BloodyBattleSeizingSupplies.java
index 3a18492bfa..95e9f265f1 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10844_BloodyBattleSeizingSupplies/Q10844_BloodyBattleSeizingSupplies.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10844_BloodyBattleSeizingSupplies/Q10844_BloodyBattleSeizingSupplies.java
@@ -56,7 +56,7 @@ public class Q10844_BloodyBattleSeizingSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10845_BloodyBattleRescueTheSmiths/Q10845_BloodyBattleRescueTheSmiths.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10845_BloodyBattleRescueTheSmiths/Q10845_BloodyBattleRescueTheSmiths.java
index 262fbdc4b5..632574f511 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10845_BloodyBattleRescueTheSmiths/Q10845_BloodyBattleRescueTheSmiths.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10845_BloodyBattleRescueTheSmiths/Q10845_BloodyBattleRescueTheSmiths.java
@@ -62,7 +62,7 @@ public final class Q10845_BloodyBattleRescueTheSmiths extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = event;
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10846_BloodyBattleMeetingTheCommander/Q10846_BloodyBattleMeetingTheCommander.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10846_BloodyBattleMeetingTheCommander/Q10846_BloodyBattleMeetingTheCommander.java
index e228126513..dcf5ff470f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10846_BloodyBattleMeetingTheCommander/Q10846_BloodyBattleMeetingTheCommander.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10846_BloodyBattleMeetingTheCommander/Q10846_BloodyBattleMeetingTheCommander.java
@@ -53,7 +53,7 @@ public class Q10846_BloodyBattleMeetingTheCommander extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10848_TrialsBeforeTheBattle/Q10848_TrialsBeforeTheBattle.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10848_TrialsBeforeTheBattle/Q10848_TrialsBeforeTheBattle.java
index 868ecb9bdc..cad927beb2 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10848_TrialsBeforeTheBattle/Q10848_TrialsBeforeTheBattle.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10848_TrialsBeforeTheBattle/Q10848_TrialsBeforeTheBattle.java
@@ -58,7 +58,7 @@ public final class Q10848_TrialsBeforeTheBattle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10849_TrialsForAdaptation/Q10849_TrialsForAdaptation.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10849_TrialsForAdaptation/Q10849_TrialsForAdaptation.java
index 8f77ff4caf..437e5c9a8e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10849_TrialsForAdaptation/Q10849_TrialsForAdaptation.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10849_TrialsForAdaptation/Q10849_TrialsForAdaptation.java
@@ -76,7 +76,7 @@ public class Q10849_TrialsForAdaptation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10851_ElvenBotany/Q10851_ElvenBotany.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10851_ElvenBotany/Q10851_ElvenBotany.java
index d22f5130b5..e74becd0de 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10851_ElvenBotany/Q10851_ElvenBotany.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10851_ElvenBotany/Q10851_ElvenBotany.java
@@ -58,7 +58,7 @@ public class Q10851_ElvenBotany extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10852_TheMotherTreeRevivalProject/Q10852_TheMotherTreeRevivalProject.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10852_TheMotherTreeRevivalProject/Q10852_TheMotherTreeRevivalProject.java
index 650f2a8248..ea67637b49 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10852_TheMotherTreeRevivalProject/Q10852_TheMotherTreeRevivalProject.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10852_TheMotherTreeRevivalProject/Q10852_TheMotherTreeRevivalProject.java
@@ -82,7 +82,7 @@ public class Q10852_TheMotherTreeRevivalProject extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10853_ToWeakenTheGiants/Q10853_ToWeakenTheGiants.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10853_ToWeakenTheGiants/Q10853_ToWeakenTheGiants.java
index d631d47348..70eddc1c55 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10853_ToWeakenTheGiants/Q10853_ToWeakenTheGiants.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10853_ToWeakenTheGiants/Q10853_ToWeakenTheGiants.java
@@ -60,7 +60,7 @@ public final class Q10853_ToWeakenTheGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10854_ToSeizeTheFortress/Q10854_ToSeizeTheFortress.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10854_ToSeizeTheFortress/Q10854_ToSeizeTheFortress.java
index 0f131cd3d9..dbdc97fc8b 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10854_ToSeizeTheFortress/Q10854_ToSeizeTheFortress.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10854_ToSeizeTheFortress/Q10854_ToSeizeTheFortress.java
@@ -77,7 +77,7 @@ public final class Q10854_ToSeizeTheFortress extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = event;
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10856_SuperionAppears/Q10856_SuperionAppears.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10856_SuperionAppears/Q10856_SuperionAppears.java
index 6beea62bcf..37c5a21afe 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10856_SuperionAppears/Q10856_SuperionAppears.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10856_SuperionAppears/Q10856_SuperionAppears.java
@@ -45,7 +45,7 @@ public class Q10856_SuperionAppears extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10857_SecretTeleport/Q10857_SecretTeleport.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10857_SecretTeleport/Q10857_SecretTeleport.java
index 80fce78d5e..8db2ad22a1 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10857_SecretTeleport/Q10857_SecretTeleport.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10857_SecretTeleport/Q10857_SecretTeleport.java
@@ -69,7 +69,7 @@ public class Q10857_SecretTeleport extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10858_QueenRamonaControllerOfTheVessel/Q10858_QueenRamonaControllerOfTheVessel.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10858_QueenRamonaControllerOfTheVessel/Q10858_QueenRamonaControllerOfTheVessel.java
index 8343b8e737..6adf4b1901 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10858_QueenRamonaControllerOfTheVessel/Q10858_QueenRamonaControllerOfTheVessel.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10858_QueenRamonaControllerOfTheVessel/Q10858_QueenRamonaControllerOfTheVessel.java
@@ -50,7 +50,7 @@ public class Q10858_QueenRamonaControllerOfTheVessel extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10859_OwnTheEarthAndTheHeavens/Q10859_OwnTheEarthAndTheHeavens.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10859_OwnTheEarthAndTheHeavens/Q10859_OwnTheEarthAndTheHeavens.java
index d4ac9e202b..f5e36c2340 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10859_OwnTheEarthAndTheHeavens/Q10859_OwnTheEarthAndTheHeavens.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10859_OwnTheEarthAndTheHeavens/Q10859_OwnTheEarthAndTheHeavens.java
@@ -50,7 +50,7 @@ public class Q10859_OwnTheEarthAndTheHeavens extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/ThirdClassTransferQuest.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
index b230b12a5b..e0ee0b931a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
@@ -133,7 +133,7 @@ public abstract class ThirdClassTransferQuest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/vehicles/AirShipController.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/vehicles/AirShipController.java
index 682f3b238b..ee534c5f04 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/vehicles/AirShipController.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/vehicles/AirShipController.java
@@ -117,7 +117,7 @@ public abstract class AirShipController extends AbstractNpcAI
 	private static final SystemMessage SM_NEED_MORE = new SystemMessage(SystemMessageId.AN_AIRSHIP_CANNOT_BE_SUMMONED_BECAUSE_YOU_DON_T_HAVE_ENOUGH_S1).addItemName(STARSTONE);
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("summon".equalsIgnoreCase(event))
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
index f3974aa349..c748e1c2cd 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
@@ -162,7 +162,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player.isTransformed())
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
index 7ff39fb0c0..8675a7ec2c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
@@ -51,7 +51,7 @@ public class AllianceMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!"9001-01.htm".equals(event) && (player.getClan() == null))
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
index 58c0e304f2..20648ef643 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
@@ -80,7 +80,7 @@ public class ClanMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LEADER_REQUIRED.containsKey(event) && !player.isClanLeader())
 		{
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/quest/Quest.java
index 6a48e78703..22f52a0b5b 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/quest/Quest.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/quest/Quest.java
@@ -247,7 +247,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -269,7 +269,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -560,7 +560,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 			{
 				player.setSimulatedTalking(false);
 			}
-			res = onAdvEvent(event, npc, player);
+			res = onEvent(event, npc, player);
 		}
 		catch (Exception e)
 		{
@@ -1038,12 +1038,11 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 */
 	public String onDeath(Creature killer, Creature victim, QuestState qs)
 	{
-		return onAdvEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
+		return onEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
 	}
 	
 	/**
 	 * This function is called whenever a player clicks on a link in a quest dialog and whenever a timer fires.<br>
-	 * If is not overridden by a subclass, then default to the returned value of the simpler (and older) {@link #onEvent(String, QuestState)} override.<br>
 	 * If the player has a quest state, use it as parameter in the next call, otherwise return null.
 	 * @param event this parameter contains a string identifier for the event.<br>
 	 *            Generally, this string is passed directly via the link.<br>
@@ -1062,35 +1061,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 *            This parameter may be {@code null} in certain circumstances.
 	 * @return the text returned by the event (may be {@code null}, a filename or just text)
 	 */
-	public String onAdvEvent(String event, Npc npc, Player player)
-	{
-		if (player != null)
-		{
-			final QuestState qs = player.getQuestState(getName());
-			if (qs != null)
-			{
-				return onEvent(event, qs);
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * This function is called in place of {@link #onAdvEvent(String, Npc, Player)} if the former is not implemented.<br>
-	 * If a script contains both {@link #onAdvEvent(String, Npc, Player)} and this implementation, then this method will never be called unless the script's {@link #onAdvEvent(String, Npc, Player)} explicitly calls this method.
-	 * @param event this parameter contains a string identifier for the event.<br>
-	 *            Generally, this string is passed directly via the link.<br>
-	 *            For example:<br>
-	 *            <code>
-	 *            &lt;a action="bypass -h Quest 626_ADarkTwilight 31517-01.htm"&gt;hello&lt;/a&gt;
-	 *            </code><br>
-	 *            The above link sets the event variable to "31517-01.htm" for the quest 626_ADarkTwilight.<br>
-	 *            In the case of timers, this will be the name of the timer.<br>
-	 *            This parameter serves as a sort of identifier.
-	 * @param qs this parameter contains a reference to the quest state of the player who used the link or started the timer.
-	 * @return the text returned by the event (may be {@code null}, a filename or just text)
-	 */
-	public String onEvent(String event, QuestState qs)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return null;
 	}
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java
index 2ab35f83dc..6740fe6383 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java
@@ -46,7 +46,7 @@ public class Ruine extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
index e85df039b0..0ebae68471 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
@@ -73,7 +73,7 @@ public class AncientArcanCity extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CHANGE_STATE"))
 		{
@@ -107,7 +107,7 @@ public class AncientArcanCity extends AbstractNpcAI
 				cat.broadcastSocialAction(2);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
index d76c158f9e..d38ceb917e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
@@ -42,7 +42,7 @@ public class Lykus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
index 4fd3e87bb7..92979a713e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
@@ -39,7 +39,7 @@ public class Mumu extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
index 56ceed0cda..34c3cc9100 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
@@ -329,7 +329,7 @@ public class AteliaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/AteliaFortress/TeleportDevice/TeleportDevice.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/AteliaFortress/TeleportDevice/TeleportDevice.java
index 9ea87d2149..7ff361c8e1 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/AteliaFortress/TeleportDevice/TeleportDevice.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/AteliaFortress/TeleportDevice/TeleportDevice.java
@@ -45,7 +45,7 @@ public class TeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player.getFactionLevel(Faction.KINGDOM_ROYAL_GUARDS) < 3)
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
index c87c4e9224..a2a2891b57 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
@@ -56,7 +56,7 @@ public class BabyPets extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("HEAL") && (player != null))
 		{
@@ -78,7 +78,7 @@ public class BabyPets extends AbstractNpcAI
 				cancelQuestTimer("HEAL", null, player);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGOUT)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
index b0153ef5da..f0f610c8b9 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
@@ -56,7 +56,7 @@ public class ImprovedBabyPets extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player != null)
 		{
@@ -108,7 +108,7 @@ public class ImprovedBabyPets extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
index 6b4a147550..301899a76f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
@@ -42,7 +42,7 @@ public class Tunatun extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java
index f6485e07b4..2693ef7a00 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java
@@ -48,7 +48,7 @@ public class Alarm extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Player player0 = npc.getVariables().getObject("player0", Player.class);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
index a2b4810dfa..ad01bdba4a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
@@ -46,14 +46,14 @@ public class CrumaTower extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("MESSAGE") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_GO_TO_UNDERGROUND_LV_3_USING_THE_ELEVATOR_IN_THE_BACK);
 			startQuestTimer(event, 15000, npc, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
index 7cab0d9caf..9ac87f3024 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
@@ -77,7 +77,7 @@ public class FrightenedRagnaOrc extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
index ee5d44d59e..db9d7838fc 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
@@ -53,7 +53,7 @@ public class DragonVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("Spawn".equals(event))
 		{
@@ -104,7 +104,7 @@ public class DragonVortex extends AbstractNpcAI
 		{
 			npc.setScriptValue(0);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
index de54d68cf6..ce248d3f8f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
@@ -53,7 +53,7 @@ public class LairOfAntharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CHECK_HOME") && (npc != null) && !npc.isDead())
 		{
@@ -67,7 +67,7 @@ public class LairOfAntharas extends AbstractNpcAI
 				npc.broadcastPacket(new ValidateLocation(npc));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
index bf46d16542..c4e625c565 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
@@ -55,7 +55,7 @@ public class LeopardDragonHachling extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && event.equals("MOVE_TO_TRANSFORM"))
 		{
@@ -77,7 +77,7 @@ public class LeopardDragonHachling extends AbstractNpcAI
 				npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, nearestLocation(npc));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
index 04396d3683..6f794f4008 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
@@ -40,13 +40,13 @@ public class MercenaryCaptain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THE_EASTERN_PART_OF_DRAGON_VALLEY_IS_MUCH_MORE_DANGEROUS_THAN_THE_WEST_BE_CAREFUL));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
index 13dfbd313b..324120327b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
@@ -61,10 +61,10 @@ public class MercenaryTeleport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		player.teleToLocation(LOCATIONS.get(event), true);
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DragonValley/Namo.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
index 99057c816c..f21c497157 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
@@ -40,13 +40,13 @@ public class Namo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THIS_PLACE_SWARMS_WITH_DRAGONS_BY_DAY_AND_UNDEAD_BY_NIGHT));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
index 32c7beb400..c02404f76a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
@@ -40,13 +40,13 @@ public class Rakun extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THIS_PLACE_SWARMS_WITH_DRAGONS_BY_DAY_AND_UNDEAD_BY_NIGHT));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
index 349976c56b..cc5487971c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
@@ -72,7 +72,7 @@ public class SeparatedSoul extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LOCATIONS.containsKey(event))
 		{
@@ -98,7 +98,7 @@ public class SeparatedSoul extends AbstractNpcAI
 				return "no-items.htm";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java
index 2125fca0d8..870b8a5820 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java
@@ -50,7 +50,7 @@ public class Celestiel extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java
index 4cb6303606..8d927f12d2 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java
@@ -48,7 +48,7 @@ public class FlowerBud extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("spawn") && npc.isDead())
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
index 8ca5f0c7d4..a3b3d2da62 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
@@ -49,7 +49,7 @@ public class AltarOfSouls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -96,7 +96,7 @@ public class AltarOfSouls extends AbstractNpcAI
 				return "33920-9.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
index 47beace94a..c82e8969f1 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
@@ -41,7 +41,7 @@ public class RemembranceTower extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("action") && npc.isScriptValue(0))
 		{
@@ -54,7 +54,7 @@ public class RemembranceTower extends AbstractNpcAI
 			npc.setScriptValue(0);
 			npc.broadcastPacket(new OnEventTrigger(EMMITER_ID, false));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
index 39625630cd..0d3824cd68 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
@@ -60,7 +60,7 @@ public class LargeCocoon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -138,7 +138,7 @@ public class LargeCocoon extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
index d4a9137f8d..20aad104b0 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
@@ -41,7 +41,7 @@ public class KrateisCube extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
index 54f813c829..c1de7e5630 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
@@ -365,7 +365,7 @@ public class TalentShow extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((event == null) || event.isEmpty())
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
index 099500e9bb..8dea4780a1 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
@@ -41,7 +41,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -54,7 +54,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 				npc.deleteMe();
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_DAY_NIGHT_CHANGE)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
index 8029a17703..20dfae5ccf 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
@@ -88,7 +88,7 @@ public class ForgeOfTheGods extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
index ba045bd19c..39fcc5a8d7 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
@@ -84,7 +84,7 @@ public class Rooney extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport") && !npc.isDecayed())
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
index a3bc5828d9..40c8ad2e0d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
@@ -87,7 +87,7 @@ public class GainakSiege extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("GAINAK_WAR"))
 		{
@@ -129,7 +129,7 @@ public class GainakSiege extends AbstractNpcAI
 				ZoneManager.getInstance().getZoneById(GAINAK_TOWN_ZONE.getId(), PeaceZone.class).setEnabled(false);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
index 27e969e0c9..955c7ddd25 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
@@ -46,7 +46,7 @@ public class Lailly extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
index 35274b2de7..ca8919593a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
@@ -128,7 +128,7 @@ public class TavernEmployee extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
index c99c7cdf42..0ff79c4f5d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
@@ -76,7 +76,7 @@ public class Apherus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("buff"))
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
index 06a75493ac..d7944dd6f3 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
@@ -40,7 +40,7 @@ public class ApherusLookout extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		if (event.equals("open_bag"))
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
index e984558e2c..0d30623e93 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
@@ -48,7 +48,7 @@ public class GardenWatchman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -78,7 +78,7 @@ public class GardenWatchman extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
index 02b6a47091..42752aea0c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
@@ -42,7 +42,7 @@ public class GenesisVines extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CAST_SKILL") && npc.isScriptValue(1))
 		{
@@ -58,7 +58,7 @@ public class GenesisVines extends AbstractNpcAI
 			npc.setScriptValue(0);
 			npc.deleteMe();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
index 3216884d13..ab0d91e3cd 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
@@ -53,7 +53,7 @@ public class Statues extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("fight"))
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfSpirits/Belas/Belas.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfSpirits/Belas/Belas.java
index 526cfce78f..00cfa7a674 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfSpirits/Belas/Belas.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfSpirits/Belas/Belas.java
@@ -44,7 +44,7 @@ public class Belas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfSpirits/Dinford/Dinford.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfSpirits/Dinford/Dinford.java
index 6f9f40ec3c..742cc37560 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfSpirits/Dinford/Dinford.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfSpirits/Dinford/Dinford.java
@@ -46,7 +46,7 @@ public class Dinford extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java
index bdffef8294..386587cc49 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java
@@ -40,7 +40,7 @@ public class Eubina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
index 29ccfb6308..64246fbb51 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
@@ -46,7 +46,7 @@ public class FuryKiku extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -76,7 +76,7 @@ public class FuryKiku extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
index 84b5b0c214..08ba28f0fd 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
@@ -50,7 +50,7 @@ public class Isabella extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAWN"))
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java
index fab023bab3..5e9e8d3a57 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java
@@ -40,7 +40,7 @@ public class Rotoeh extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
index dc07df1c2f..a7ab45ea5e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
@@ -42,7 +42,7 @@ public class GiantsCave extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
index 50c14b79bb..20f3adf32d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
@@ -57,7 +57,7 @@ public class Kekropus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
index d4c54fcddd..9e41be2b4a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
@@ -82,7 +82,7 @@ public class Spirit extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -102,7 +102,7 @@ public class Spirit extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Heine/WrapGate.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
index eb934ee4dc..bd1d86a743 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
@@ -43,7 +43,7 @@ public class WrapGate extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("enter_hellbound".equals(event))
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java
index 245a039160..074991c7f8 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java
@@ -79,7 +79,7 @@ public class EnchantedMegaliths extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
index e49050b695..c4486b2670 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
@@ -39,7 +39,7 @@ public class LeonaBlackbird extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
index 888a2980ef..5923d188eb 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
@@ -60,7 +60,7 @@ public class Theorn extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
index e026f3cd57..5ef95aed5e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
@@ -47,7 +47,7 @@ public class Merlot extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/ImperialTomb/BloodySuccubus.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/ImperialTomb/BloodySuccubus.java
index 1f56178ded..2ab48d235a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/ImperialTomb/BloodySuccubus.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/ImperialTomb/BloodySuccubus.java
@@ -118,7 +118,7 @@ public class BloodySuccubus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
index 1879ece1c7..a69a2810f4 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
@@ -218,7 +218,7 @@ public class FourSepulchers extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
index 6ea0a0760f..14c4560f16 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
@@ -43,7 +43,7 @@ public class Zenya extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
index 2b048463f8..99e8fa6078 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
@@ -63,7 +63,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -135,7 +135,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 				npc.reduceCurrentHp(500, npc, null); // poison kills Fafurion if he is not healed
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
index 2a0a8014f8..d4dc25aab8 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
@@ -47,7 +47,7 @@ public class Rignos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -90,7 +90,7 @@ public class Rignos extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
index 43e2c64226..af4b116516 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
@@ -57,7 +57,7 @@ public class HillsOfGold extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -75,7 +75,7 @@ public class HillsOfGold extends AbstractNpcAI
 			});
 			startQuestTimer("SPICULA_AGGRO", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
index edf9416113..efaf6d6bf8 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
@@ -61,7 +61,7 @@ public class AvantGarde extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
index 37f35f00f8..ac8772d975 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
@@ -108,7 +108,7 @@ public class KetraOrcSupport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
index 6c1085f7d0..f253eadcb6 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
@@ -38,13 +38,13 @@ public class El extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_USE_THE_JUMP_BOARD_TO_GET_STRAIGHT_TO_THE_2ND_FLOOR, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
index 282d7a6326..debef79252 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
@@ -58,7 +58,7 @@ public class GeneralDilios extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("command_"))
 		{
@@ -87,7 +87,7 @@ public class GeneralDilios extends AbstractNpcAI
 				startQuestTimer("guard_animation_" + (value + 1), 1500, null, null);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
index 0a84cf47a0..b4dbbc74ae 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
@@ -47,7 +47,7 @@ public class Lekon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
index e4edb350d4..3cdddadb06 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
@@ -56,7 +56,7 @@ public class LindviorScene extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -109,7 +109,7 @@ public class LindviorScene extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public void scheduleNextLindviorVisit()
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
index 79aaecd2f1..9d38ce28a4 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
@@ -59,7 +59,7 @@ public class Nottingale extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
index 975e4a2614..b0ded82d61 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
@@ -38,13 +38,13 @@ public class Plenos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_BE_TELEPORTED_TO_EACH_SEED_IF_YOU_VOLUNTEER_WHY_NOT_TRY, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
index 18f2110178..7fc2284ccb 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
@@ -46,7 +46,7 @@ public class SeedTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -75,7 +75,7 @@ public class SeedTeleportDevice extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
index 23b5c50033..c8498cbee5 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
@@ -49,7 +49,7 @@ public class MithrilMinesTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int index = Integer.parseInt(event) - 1;
 		if (LOCS.length > index)
@@ -57,7 +57,7 @@ public class MithrilMinesTeleporter extends AbstractNpcAI
 			final Location loc = LOCS[index];
 			player.teleToLocation(loc, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
index d398cfc3b8..2901995fbe 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
@@ -82,7 +82,7 @@ public class MonasteryOfSilence extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -130,7 +130,7 @@ public class MonasteryOfSilence extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
index 9a2ee10f60..434807bd9e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
@@ -62,7 +62,7 @@ public class PaganTeleporters extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
index 7eed58ebec..1c6e6ba756 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
@@ -60,7 +60,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -90,7 +90,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI
 				instanceScript.notifyEvent(event, npc, player);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
index 9d4b3bde33..781bfa3af3 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
@@ -39,13 +39,13 @@ public class Fioren extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("startMovie"))
 		{
 			playMovie(player, Movie.SI_BARLOG_STORY);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java
index 9c52a15e19..2d6d808bad 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java
@@ -93,7 +93,7 @@ public class PlainsOfLizardman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("fantasy_mushroom") && (npc != null) && (player != null))
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
index 21ff72d2e7..c8747c6857 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
@@ -179,7 +179,7 @@ public class PrimevalIsle extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -239,7 +239,7 @@ public class PrimevalIsle extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
index 5ffc401682..6a166ec683 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
@@ -74,7 +74,7 @@ public class Kaysen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
index 619d9e57f4..ceb8d8a7b9 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
@@ -63,7 +63,7 @@ public class NervasTemporaryPrison extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
index b8b803e57f..43691cef06 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
@@ -38,14 +38,14 @@ public class RoAGuard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THIS_IS_RUINS_OF_AGONY_WHERE_KANILOV_IS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
index f3af67aba7..dd2a52bdc5 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
@@ -38,14 +38,14 @@ public class RoDGuard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THIS_IS_THE_RUINS_OF_AGONY_WHERE_POSLOF_IS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
index 5e57a9fb94..a19c1d4085 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
@@ -48,7 +48,7 @@ public class AltarOfSacrifice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("msg_text"))
 		{
@@ -68,7 +68,7 @@ public class AltarOfSacrifice extends AbstractNpcAI
 			startQuestTimer("msg_text", 135000, npc, null);
 			_jenas_guard.setScriptValue(0);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
index a025e62542..b50f530164 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
@@ -147,7 +147,7 @@ public class Venom extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
index ed4ce2d782..cd89ebcb9e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
@@ -43,7 +43,7 @@ public class Klemis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("portInside"))
 		{
@@ -56,7 +56,7 @@ public class Klemis extends AbstractNpcAI
 				return "32734-01.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
index d66782538a..c1db3c8180 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
@@ -80,7 +80,7 @@ public class Maguen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || (player == null))
 		{
@@ -163,7 +163,7 @@ public class Maguen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
index 344d65a44f..d5ab73ff74 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
@@ -48,7 +48,7 @@ public class Nemo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
index 251458ea98..ae26a6c701 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
@@ -297,7 +297,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("ChangeSeedsStatus"))
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
index d6f644fa86..765deb4a7d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
@@ -51,7 +51,7 @@ public class Seyo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (npc == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
index f213bbec6c..f62aa835e8 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
@@ -132,7 +132,7 @@ public class SelMahumDrill extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -188,7 +188,7 @@ public class SelMahumDrill extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
index 4d3891946f..4e0a01cea2 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
@@ -83,7 +83,7 @@ public class SelMahumSquad extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -189,7 +189,7 @@ public class SelMahumSquad extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java
index 1c47135e60..a38df65796 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java
@@ -70,7 +70,7 @@ public class SilentValley extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
index ebf70cc5ae..6ba58ffc8e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
@@ -197,7 +197,7 @@ public class StakatoNest extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || (player == null) || npc.isDead())
 		{
@@ -225,7 +225,7 @@ public class StakatoNest extends AbstractNpcAI
 			addAttackPlayerDesire(spawned, player);
 			npc.deleteMe();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private static Monster checkMinion(Npc npc)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
index 611b134c70..2469300cb4 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
@@ -49,7 +49,7 @@ public class StakatoNestTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int index = Integer.parseInt(event) - 1;
 		if (LOCS.length > index)
@@ -67,7 +67,7 @@ public class StakatoNestTeleporter extends AbstractNpcAI
 			}
 			player.teleToLocation(loc, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
index 4a64afbd00..ba580c2dad 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
@@ -44,7 +44,7 @@ public class Apprentice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("rideKukuru"))
 		{
@@ -61,7 +61,7 @@ public class Apprentice extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TRY_RIDING_A_KUKURI, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
index e09ab8270d..8c1824fe61 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
@@ -97,7 +97,7 @@ public class AwakeningMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
index cd6185a888..8ed7701c68 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
@@ -38,7 +38,7 @@ public class Banette extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
@@ -62,7 +62,7 @@ public class Banette extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
index 87e0629227..858331ae3e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
@@ -38,13 +38,13 @@ public class Bink extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TALKING_ISLAND_VILLAGE_IS_REALLY_BEAUTIFUL, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
index e439d986ad..5d231aa00d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
@@ -45,7 +45,7 @@ public class BoyAndGirl extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_CHANGEWEAP"))
 		{
@@ -66,7 +66,7 @@ public class BoyAndGirl extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, npc.getId() == BOY ? NpcStringId.WEEE : NpcStringId.BOYS_ARE_SO_ANNOYING);
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
index ff53080809..22d19b3496 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
@@ -41,7 +41,7 @@ public class Devno extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -74,7 +74,7 @@ public class Devno extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
index a4f08b8c99..18c04b2e7e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
@@ -42,7 +42,7 @@ public class DrillSergeant extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SOCIAL_SHOW"))
 		{
@@ -66,7 +66,7 @@ public class DrillSergeant extends AbstractNpcAI
 				npc.broadcastSocialAction(socialActionId);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
index 8e3f9e5943..83363ef157 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
@@ -41,7 +41,7 @@ public class Eleve extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Eleve extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
index b8863b9963..114728632b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
@@ -44,13 +44,13 @@ public class Gagabu extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, GAGABU_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
index 44dab7df42..d490504792 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
@@ -38,14 +38,14 @@ public class Galad extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSocialAction(3);
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.OCCASIONALLY_RARE_JEWELS_OF_GIANTS_ARE_DISCOVERED_IN_THE_BEACH, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
index a0c7f71816..3a56943e20 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
@@ -52,7 +52,7 @@ public class GiantSoldiers extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
index a703c40323..b94d2f9624 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
@@ -38,7 +38,7 @@ public class GuardSoldier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -49,7 +49,7 @@ public class GuardSoldier extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(2);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
index b26d9fd748..1b0dd65c82 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
@@ -43,7 +43,7 @@ public class Hadel extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
index bdb70d1f2d..d7ff70d9a0 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
@@ -38,7 +38,7 @@ public class Handermonkey extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE") && (npc != null))
 		{
@@ -54,7 +54,7 @@ public class Handermonkey extends AbstractNpcAI
 				npc.broadcastSocialAction(9);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
index b8370bffe7..5ea0569424 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
@@ -60,7 +60,7 @@ public class Hardin extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = getHtmlMessage(player);
 		if (htmltext != null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
index a8bded51f1..536ee7f5cd 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
@@ -58,7 +58,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("HARNAK_SPAWN"))
 		{
@@ -70,7 +70,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
 				_templates.forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName), null));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private static class zoneInfo
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
index 3c2080e85a..03dca71bb5 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
@@ -55,13 +55,13 @@ public class HurnakMobMsg extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("ATTACK"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomEntry(ON_ATTACK_MSG));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
index 81f6617329..7055381eab 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
@@ -38,14 +38,14 @@ public class Hera extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomBoolean() ? NpcStringId.DOES_THE_GODDESS_SEE_WHAT_SHE_HAS_DONE : NpcStringId.WHY_HAVE_THE_HEROES_ABANDONED_US);
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
index 7003ad014d..2b6a1a1e51 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
@@ -38,7 +38,7 @@ public class Heymond extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
@@ -62,7 +62,7 @@ public class Heymond extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
index 52ce99be7f..8033f3c1ec 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
@@ -38,7 +38,7 @@ public class Holly extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -48,7 +48,7 @@ public class Holly extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(6);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
index 3f9141b931..e11490debc 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
@@ -41,7 +41,7 @@ public class Karonf extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Karonf extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
index 597cfd80f2..c102b0cc4c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
@@ -44,7 +44,7 @@ public class Luderic extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -54,7 +54,7 @@ public class Luderic extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(1);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
index 0c07720a0a..08de6143f0 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
@@ -45,13 +45,13 @@ public class Lumi extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, LUMI_SHOUT[getRandom(3)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
index 68b2789416..3bdb8de60b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
@@ -38,13 +38,13 @@ public class Mahram extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.ALCHEMY_IS_A_SCIENCE_AND_AN_ART, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
index e00fd6c98c..85117713a0 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
@@ -38,13 +38,13 @@ public class Mai extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EVERY_RACE_BUILT_A_PIECE_OF_THIS_VILLAGE, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
index dcd47a9822..2d44f1568a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
@@ -38,13 +38,13 @@ public class MarinSmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.HMM_IS_THIS_STILL_A_DECENT_WEAPON, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
index d5e5496e16..0d4e8f79e3 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
@@ -41,7 +41,7 @@ public class Marsha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Marsha extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
index aa9eb0eb87..81bc246742 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
@@ -43,7 +43,7 @@ public class Milia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("gludioAirship"))
 		{
@@ -53,7 +53,7 @@ public class Milia extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SPEAK_WITH_ME_ABOUT_TRAVELING_AROUND_ADEN, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
index b1e037eb5a..933c139b8c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
@@ -64,7 +64,7 @@ public class MonkOfChaos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
index f6cd83883a..0bedb09eb6 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
@@ -41,7 +41,7 @@ public class Morgan extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Morgan extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
index e7ce45a4e5..fd5e025cd2 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
@@ -40,7 +40,7 @@ public class Oris extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SOCIAL_ACTION_1"))
 		{
@@ -55,7 +55,7 @@ public class Oris extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_HAVEN_T_FELT_THIS_GOOD_IN_AGES, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
index 328de6a4df..34ae4f55b6 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
@@ -49,7 +49,7 @@ public class Pantheon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
index 869ebf3119..e44fe2e373 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
@@ -152,7 +152,7 @@ public class Raina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
index 4c8862c733..8d66a71766 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
@@ -41,7 +41,7 @@ public class Rubentis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Rubentis extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
index d5c86cee97..87e1df4a6b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
@@ -38,14 +38,14 @@ public class Ruks extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomBoolean() ? NpcStringId.THE_SEVEN_SIGNS_ENDED : NpcStringId.WE_NEED_TO_FIND_HER_WEAKNESS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
index cc9a63c666..880532e52c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
@@ -38,13 +38,13 @@ public class Sebion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TIS_A_SCRATCH, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
index fa3cc06633..4b05120bde 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
@@ -38,13 +38,13 @@ public class Shannon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.LOOK_AT_ALL_THE_NEWBIES_HA_HA_HA, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
index 219ac48515..7fd067c374 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
@@ -44,13 +44,13 @@ public class Sodian extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, SODIAN_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
index e11dfb9aaf..8413c93bc8 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
@@ -44,13 +44,13 @@ public class Stiller extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, STILLER_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
index b10f044196..d196091a8e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
@@ -38,13 +38,13 @@ public class Theodore extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.AND_NOW_YOUR_JOURNEY_BEGINS, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
index 4290aa8fc6..8e4f8ed738 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
@@ -38,7 +38,7 @@ public class TomaJunior extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -49,7 +49,7 @@ public class TomaJunior extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(6);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java
index 219f1f4879..1e4bdb3ff1 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java
@@ -48,7 +48,7 @@ public class Toyron extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true);
 		if (event.equals("museum_teleport"))
@@ -62,7 +62,7 @@ public class Toyron extends AbstractNpcAI
 				player.teleToLocation(MUSEUM_OUT);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
index c3aa031317..78ce6f2c8c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
@@ -38,7 +38,7 @@ public class TrainningSoldier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -55,7 +55,7 @@ public class TrainningSoldier extends AbstractNpcAI
 			}
 			startQuestTimer("START_ATTACK", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
index 848196c047..b92e79413b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
@@ -63,7 +63,7 @@ public class Trandon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String[] substrings = event.split(" ");
 		if (substrings.length < 1)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
index 8cd3cd965d..b65bd9a7ad 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
@@ -42,7 +42,7 @@ public class YeSagiraGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -56,7 +56,7 @@ public class YeSagiraGuards extends AbstractNpcAI
 			}
 			startQuestTimer("GUARD_AGGRO", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
index 007d0e13d3..a4e0c941bd 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
@@ -88,7 +88,7 @@ public class YeSegiraTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LOCATIONS.containsKey(event))
 		{
@@ -111,7 +111,7 @@ public class YeSegiraTeleportDevice extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_PLAYER_CREATE)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java
index e546cbc086..be903e83d2 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java
@@ -87,7 +87,7 @@ public class ToIVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int npcId = npc.getId();
 		
@@ -133,7 +133,7 @@ public class ToIVortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TownOfGiran/Alexandria/Alexandria.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TownOfGiran/Alexandria/Alexandria.java
index 1a0064cbcd..8091ac70e6 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TownOfGiran/Alexandria/Alexandria.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TownOfGiran/Alexandria/Alexandria.java
@@ -82,7 +82,7 @@ public class Alexandria extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("30098-02.html"))
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
index 2c8e967539..4bb6be2086 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
@@ -40,7 +40,7 @@ public class Acateo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("give_circlet"))
 		{
@@ -51,7 +51,7 @@ public class Acateo extends AbstractNpcAI
 			giveItems(player, ACADEMY_CIRCLET, 1);
 			return "33905-2.html";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TownOfGoddard/Cerenas/Cerenas.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TownOfGoddard/Cerenas/Cerenas.java
index 4b87f5ec09..f2df150f21 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TownOfGoddard/Cerenas/Cerenas.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TownOfGoddard/Cerenas/Cerenas.java
@@ -41,7 +41,7 @@ public class Cerenas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(Q10369_NoblesseSoulTesting.class.getSimpleName());
 		String htmltext = null;
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
index 949fb8f279..48ca778074 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
@@ -108,7 +108,7 @@ public class VarkaSilenosSupport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
index b7fb571500..3a94d3d378 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
@@ -43,7 +43,7 @@ public class ElmoredenServantsGhost extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("teleport1") || event.equals("teleport2"))
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
index 427084ea7a..150fee7dfb 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
@@ -83,7 +83,7 @@ public class Wastelands extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || !npc.isSpawned())
 		{
@@ -184,7 +184,7 @@ public class Wastelands extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
index 61678a5cb2..5e24c8040c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
@@ -47,7 +47,7 @@ public class ZealotOfShilen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -75,7 +75,7 @@ public class ZealotOfShilen extends AbstractNpcAI
 			}
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
index 2da266ca0e..ab6a6ebc3e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
@@ -38,14 +38,14 @@ public class Commando extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.WE_RE_COLLECTING_SEEKER_OF_ADEN);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Anais/Anais.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Anais/Anais.java
index 74fe879672..823d08142f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Anais/Anais.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Anais/Anais.java
@@ -75,7 +75,7 @@ public class Anais extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -134,7 +134,7 @@ public class Anais extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
index 00ebb5f34f..6f04200e6f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
@@ -361,7 +361,7 @@ public class Anakim extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -475,7 +475,7 @@ public class Anakim extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index d236e19d43..a5157acfc7 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -193,7 +193,7 @@ public class Antharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -605,7 +605,7 @@ public class Antharas extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 0fea286d69..e6080d34c6 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -164,7 +164,7 @@ public class Baium extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -478,7 +478,7 @@ public class Baium extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
index 992eae3c7c..7bea095520 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
@@ -105,7 +105,7 @@ public class BalokWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -115,7 +115,7 @@ public class BalokWarzone extends AbstractInstance
 				takeItems(player, PRISON_KEY, -1);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
index 6684b9b04c..ce39ed9b22 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
@@ -72,7 +72,7 @@ public class BaylorWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -124,7 +124,7 @@ public class BaylorWarzone extends AbstractInstance
 				player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index b5a24845bb..3748875859 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -126,7 +126,7 @@ public class Beleth extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -536,7 +536,7 @@ public class Beleth extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
index e2770b5bec..b768e563e9 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
@@ -49,7 +49,7 @@ public class Wormhole extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Core/Core.java
index 344ad52a0a..34584c31c3 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -143,7 +143,7 @@ public class Core extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
@@ -162,7 +162,7 @@ public class Core extends AbstractNpcAI
 			_minions.forEach(Attackable::decayMe);
 			_minions.clear();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
index 859e6fc695..ed664b4197 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
@@ -65,7 +65,7 @@ public class IceQueensCastle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class IceQueensCastle extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
index a07501ed22..9f3772a47d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
@@ -160,7 +160,7 @@ public class IceQueensCastleBattle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterEasy"))
 		{
@@ -700,7 +700,7 @@ public class IceQueensCastleBattle extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
index 7fa44d08d6..21e250c482 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
@@ -45,7 +45,7 @@ public class Jinia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
index 62de6736d0..3a3ddc74e7 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
@@ -165,7 +165,7 @@ public class LastImperialTomb extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
index 282b9f8fbc..254c891bc5 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
@@ -62,7 +62,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/Helios.java
index d6de973ec6..8288e0626c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/Helios.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/Helios.java
@@ -320,7 +320,7 @@ public class Helios extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/Helios1.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/Helios1.java
index 7eb394719d..5d2364fbc0 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/Helios1.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/Helios1.java
@@ -45,7 +45,7 @@ public class Helios1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -58,7 +58,7 @@ public class Helios1 extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/Helios2.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/Helios2.java
index 2147bd52c0..abe0cc400e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/Helios2.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/Helios2.java
@@ -45,7 +45,7 @@ public class Helios2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -58,7 +58,7 @@ public class Helios2 extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/Helios3.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/Helios3.java
index 364dce85de..8e293ad2a4 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/Helios3.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/Helios3.java
@@ -46,7 +46,7 @@ public class Helios3 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -59,7 +59,7 @@ public class Helios3 extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java
index 404237e0fa..29b64fa20b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java
@@ -44,7 +44,7 @@ public class RoyalArchmageMinion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class RoyalArchmageMinion extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
index e4260628ce..d61884c91b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
@@ -92,7 +92,7 @@ public class IstinaCavern extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance instance = npc.getInstanceWorld();
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
index 27728f34c1..f1945e2def 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
@@ -40,7 +40,7 @@ public class Rumiese extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
index b94d17f47b..ae0e6aaef9 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
@@ -141,7 +141,7 @@ public class Kelbim extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -281,7 +281,7 @@ public class Kelbim extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
index 9f677053b2..c3e066a466 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
@@ -137,7 +137,7 @@ public class KimerianCommon extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance instance = npc.getInstanceWorld();
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
index 8d618ecd4f..f0d8652322 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
@@ -387,7 +387,7 @@ public class Lilith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -501,7 +501,7 @@ public class Lilith extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
index 5b16c333e2..ced833a889 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
@@ -49,7 +49,7 @@ public class KatoSicanus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
index 2bd8aeb2c6..7dacdd2c16 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
@@ -674,7 +674,7 @@ public class Lindvior extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
index 73d5d88407..f676f620a3 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
@@ -49,7 +49,7 @@ public class Vortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -110,7 +110,7 @@ public class Vortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java
index 190f1ce9ea..02f57b1bd5 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java
@@ -59,7 +59,7 @@ public class Lydia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
index 49a224c8bc..8c7d0eb77d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
@@ -122,7 +122,7 @@ public class OctavisWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -146,7 +146,7 @@ public class OctavisWarzone extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index e74bc817e6..11c8477773 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -180,7 +180,7 @@ public class Orfen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -263,7 +263,7 @@ public class Orfen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 93735c996b..72e174bb65 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -155,7 +155,7 @@ public class QueenAnt extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -239,7 +239,7 @@ public class QueenAnt extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
index 7a3322b68a..297948d172 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
@@ -53,7 +53,7 @@ public class QueenShyeed extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java
index 2f0966fa1d..7b29e5a344 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java
@@ -149,7 +149,7 @@ public class Ramona extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -377,7 +377,7 @@ public class Ramona extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
index ad87d93fe0..20e1572d8a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
@@ -80,7 +80,7 @@ public class Sailren extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -249,7 +249,7 @@ public class Sailren extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
index 4eeb4da057..b11aa4de6a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
@@ -73,7 +73,7 @@ public class Cannon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
index f754206b22..45b4c89ee7 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
@@ -62,7 +62,7 @@ public class TautiWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -170,7 +170,7 @@ public class TautiWarzone extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
index 50da94c8b2..f973bf0e12 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
@@ -182,7 +182,7 @@ public class TeredorWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
index 7b07413999..63b2c0589a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
@@ -507,7 +507,7 @@ public class Stage1 extends AbstractInstance implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
index 70d36f9c61..d2abf63365 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
@@ -50,7 +50,7 @@ public class Daichir extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterEarthWyrnCave"))
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
index e69a688d77..2c365d7f61 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
@@ -570,7 +570,7 @@ public class Trasken extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -694,7 +694,7 @@ public class Trasken extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index 74f7b64063..4eaf667f0a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -191,7 +191,7 @@ public class Valakas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -380,7 +380,7 @@ public class Valakas extends AbstractNpcAI
 		{
 			BOSS_ZONE.oustAllPlayers();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
index a211f7bfc0..bae4d63898 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
@@ -172,7 +172,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter60"))
 		{
@@ -254,7 +254,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/AdenReconstructorManager.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
index efa4bfa6ca..65a08050b6 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
@@ -42,7 +42,7 @@ public class AdenReconstructorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -67,7 +67,7 @@ public class AdenReconstructorManager extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
index 44c53756e4..8ccc667fd0 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
@@ -143,7 +143,7 @@ public class AdventureGuildsman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
index 3c31c32b91..ee742bab33 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
@@ -65,7 +65,7 @@ public class AdventurersGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
index 8bb8061495..3428520002 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
@@ -53,7 +53,7 @@ public class AlchemistManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index b939ece983..849ed827d3 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -63,7 +63,7 @@ public class ArenaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -128,7 +128,7 @@ public class ArenaManager extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
index 1c51b94358..352c31c8fc 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
@@ -38,7 +38,7 @@ public class BlackJudge extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("weakenBreath"))
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
index d35adf8706..e203aecd5e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
@@ -42,7 +42,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equals("31092-01.html"))
@@ -79,7 +79,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 			giveAdena(player, count, false);
 			return "31092-04.html";
 		}
-		return super.onAdvEvent(htmltext, npc, player);
+		return super.onEvent(htmltext, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
index 6a44d63e0b..81e90f2d67 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
@@ -56,7 +56,7 @@ public class CastleAmbassador extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
index b07792cd2d..11b8786523 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
@@ -57,7 +57,7 @@ public class CastleBlacksmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return (event.equalsIgnoreCase(npc.getId() + "-02.html") && hasRights(player, npc)) ? event : null;
 	}
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
index 355012ffea..5385531356 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
@@ -393,7 +393,7 @@ public class CastleChamberlain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Castle castle = npc.getCastle();
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
index 3e2cd16930..4a8fac8c0e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
@@ -140,7 +140,7 @@ public class CastleCourtMagician extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player.getClan() == null) && (player.getClanId() != npc.getCastle().getOwnerId()))
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
index b9c1f3faf5..70bae86615 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
@@ -72,7 +72,7 @@ public class CastleDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
index bb32dde319..a319e3977f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
@@ -56,7 +56,7 @@ public class CastleMercenaryManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index ac71c1afad..0e8137bb1d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -78,7 +78,7 @@ public class CastleTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
@@ -168,7 +168,7 @@ public class CastleTeleporter extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
index bffed40bcc..ea1b40c41c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
@@ -52,7 +52,7 @@ public class CastleWarehouse extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final boolean isMyLord = player.isClanLeader() && (player.getClan().getCastleId() == (npc.getCastle() != null ? npc.getCastle().getResidenceId() : -1));
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index 7ecb6353f0..9bcfe3e781 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -64,7 +64,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
index a86581206e..afd7250ca4 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
@@ -57,7 +57,7 @@ public class ClanHallDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 51ff62c312..4da19f2400 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -107,7 +107,7 @@ public class ClanHallManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
index 1d8e114daa..77845525b2 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
@@ -68,7 +68,7 @@ public class ClanTrader extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index ca48b6b231..551a1bd767 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -235,7 +235,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		if (!_isEnabled)
 		{
@@ -936,7 +936,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	{
 		if (event.getCommand().startsWith("Quest ClassMaster "))
 		{
-			final String html = onAdvEvent(event.getCommand().substring(18), null, event.getPlayer());
+			final String html = onEvent(event.getCommand().substring(18), null, event.getPlayer());
 			event.getPlayer().sendPacket(TutorialCloseHtml.STATIC_PACKET);
 			showResult(event.getPlayer(), html);
 		}
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
index 21aafa7e87..7b61214c91 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
@@ -43,7 +43,7 @@ public class CrimsonHatuOtis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -69,7 +69,7 @@ public class CrimsonHatuOtis extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java
index e1f6de3c80..c66ba04bfe 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java
@@ -73,7 +73,7 @@ public class DimensionalMerchant extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/DivineBeast.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/DivineBeast.java
index 1f247a7b35..3f3a076992 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/DivineBeast.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/DivineBeast.java
@@ -44,7 +44,7 @@ public class DivineBeast extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player == null) || !player.hasServitors())
 		{
@@ -55,7 +55,7 @@ public class DivineBeast extends AbstractNpcAI
 			cancelQuestTimer(event, npc, player);
 			player.getServitors().values().forEach(summon -> summon.unSummon(player));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/EnergySeeds.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/EnergySeeds.java
index 509c12bbeb..befbad7bff 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/EnergySeeds.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/EnergySeeds.java
@@ -196,7 +196,7 @@ public class EnergySeeds extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("StartSoDAi"))
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/FameManager/FameManager.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/FameManager/FameManager.java
index d4f16a9b96..b0a7bc0a20 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/FameManager/FameManager.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/FameManager/FameManager.java
@@ -49,7 +49,7 @@ public class FameManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
index 79742f7171..c5a075fbcf 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
@@ -69,7 +69,7 @@ public class FortressSiegeManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
index 344d4c5547..db32dd6f2b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
@@ -67,7 +67,7 @@ public class HealerTrainer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
index 94b2f5f16d..2b2e0d3c40 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
@@ -89,7 +89,7 @@ public class HermuncusMinion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(eventValue, " ");
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
index 2928fbd023..abe98a50e5 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
@@ -47,7 +47,7 @@ public class LaVieEnRose extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/Mammons/Mammons.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/Mammons/Mammons.java
index 3ff005b72b..f58c7b8b86 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/Mammons/Mammons.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/Mammons/Mammons.java
@@ -79,12 +79,12 @@ public class Mammons extends AbstractNpcAI
 		addTalkId(MAMMONS);
 		addFirstTalkId(MAMMONS);
 		
-		onAdvEvent("RESPAWN_MAMMONS", null, null);
+		onEvent("RESPAWN_MAMMONS", null, null);
 		startQuestTimer("RESPAWN_MAMMONS", TELEPORT_DELAY, null, null, true);
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
index 8d38a27541..6763b0367c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
@@ -71,7 +71,7 @@ public class ManorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
index 0ef47a4ae0..efd307540c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
@@ -145,7 +145,7 @@ public class MentorGuide extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("exchange"))
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/Minigame/Minigame.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/Minigame/Minigame.java
index 14e3f84dbd..3971049085 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/Minigame/Minigame.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/Minigame/Minigame.java
@@ -68,7 +68,7 @@ public class Minigame extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final MinigameRoom room = getRoomByManager(npc);
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
index fe59e53b0b..a020799422 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
@@ -79,7 +79,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/MysteriousWizard/MysteriousWizard.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/MysteriousWizard/MysteriousWizard.java
index 2c423c6490..667463de4d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/MysteriousWizard/MysteriousWizard.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/MysteriousWizard/MysteriousWizard.java
@@ -41,7 +41,7 @@ public class MysteriousWizard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return event.equals("33980-01.html") ? event : null;
 	}
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
index 4ad7e0a2fc..d3576b9fff 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
@@ -48,14 +48,14 @@ public class NornilTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("teleport_"))
 		{
 			final int locId = Integer.parseInt(event.replace("teleport_", ""));
 			player.teleToLocation(LOCATIONS[locId - 1]);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
index 8f79775909..dd36d3b165 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
@@ -68,7 +68,7 @@ public class OlyBuffer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index be19fd9cce..0c71a54aa1 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -88,7 +88,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/PrisonGuards.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/PrisonGuards.java
index 4084beddca..c79356a1f0 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/PrisonGuards.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/PrisonGuards.java
@@ -53,7 +53,7 @@ public class PrisonGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CLEAR_STATUS"))
 		{
@@ -67,7 +67,7 @@ public class PrisonGuards extends AbstractNpcAI
 			}
 			startQuestTimer("CHECK_HOME", 30000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
index 21d281c6c9..435f293345 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
@@ -84,7 +84,7 @@ public class Proclaimer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("giveBuff"))
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
index 8b3515e12b..83098c1eaf 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
@@ -79,7 +79,7 @@ public class ProvisionalHalls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/Servitors/SinEater.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/Servitors/SinEater.java
index 1ed8d645a5..d7536614e8 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/Servitors/SinEater.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/Servitors/SinEater.java
@@ -48,7 +48,7 @@ public class SinEater extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TALK") && (player != null) && (player.getPet() != null))
 		{
@@ -79,7 +79,7 @@ public class SinEater extends AbstractNpcAI
 			}
 			startQuestTimer("TALK", 60000, null, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_CREATURE_DEATH)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
index ec177e537e..373c64200b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
@@ -128,7 +128,7 @@ public class SupportUnitCaptain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int fortOwner = npc.getFort().getOwnerClan() == null ? 0 : npc.getFort().getOwnerClan().getId();
 		if ((player.getClan() == null) || (player.getClanId() != fortOwner))
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
index f6d1e74529..a733b87dad 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
@@ -53,7 +53,7 @@ public class SymbolMaker extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
index f9cd32a0dd..82ec9274c2 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
@@ -94,7 +94,7 @@ public class TeleportToUndergroundColiseum extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.endsWith(".htm"))
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
index dbe26ae6a3..7052b10367 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
@@ -75,7 +75,7 @@ public class TersisHerald extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("giveBuff"))
 		{
@@ -87,7 +87,7 @@ public class TersisHerald extends AbstractNpcAI
 			npc.setTarget(player);
 			npc.doCast(DRAGON_BUFF.getSkill());
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java
index 3c46f755ca..c2f0970ccc 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java
@@ -58,7 +58,7 @@ public class TrainingCamp extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (!Config.TRAINING_CAMP_ENABLE || !checkConditions(player))
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
index 8e94950d76..520a057481 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
@@ -62,7 +62,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = "";
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
index 9924fb4ace..0a6b873028 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
@@ -85,7 +85,7 @@ public class ClassTransferTalk extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/WarriorFishingBlock.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
index 56b29fee5b..78e3d1c99e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
@@ -75,7 +75,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -104,7 +104,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
index b9439eb0ec..a1878b037b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
@@ -156,7 +156,7 @@ public class WeaverOlf extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.contains("_grade_"))
 		{
@@ -185,7 +185,7 @@ public class WeaverOlf extends AbstractNpcAI
 			}
 			else
 			{
-				return super.onAdvEvent(event, npc, player);
+				return super.onEvent(event, npc, player);
 			}
 			
 			if (hasQuestItems(player, itemIds[0]))
@@ -225,7 +225,7 @@ public class WeaverOlf extends AbstractNpcAI
 			{
 				return npc.getId() + "-no.htm";
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		return event;
 	}
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index 777998cde4..48bf41ab6d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -210,7 +210,7 @@ public class WyvernManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
index 0c2e7586c9..c49be5297b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
@@ -36,7 +36,7 @@ public class DelevelManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.DELEVEL_MANAGER_ENABLED)
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
index 5eaddb78ba..76b7f1e559 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
@@ -54,7 +54,7 @@ public class FactionSystem extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class FactionSystem extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
index 8b9c676ad5..771c8a9058 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
@@ -34,7 +34,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -77,7 +77,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 				npc.broadcastInfo(); // update flag status
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
index e6fdc75e16..7423521604 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
@@ -70,7 +70,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("AUTOBUFF") && (npc != null) && !npc.isDead())
 		{
@@ -98,7 +98,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
 			}
 			startQuestTimer("AUTOBUFF", 30000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
index f19aa0cb6f..447c512987 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
@@ -39,7 +39,7 @@ public class NoblessMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.NOBLESS_MASTER_ENABLED)
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
index 370e9a1ced..3488295c5a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
@@ -163,7 +163,7 @@ public class Deathmatch extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
index 1eb84eca93..b92bbe7f77 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
@@ -213,7 +213,7 @@ public class Rabbits extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/events/Race/Race.java
index ff9fc462f6..6ac325ca6f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/events/Race/Race.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/events/Race/Race.java
@@ -320,7 +320,7 @@ public class Race extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 68f87b19cb..e38ed4d256 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -182,7 +182,7 @@ public class TvT extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
index 77c055cc79..84a2d7763d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
@@ -45,7 +45,7 @@ public class BirthOfDraco extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
index 9bc0ff9c55..87ac868dc7 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
@@ -64,7 +64,7 @@ public class CharacterBirthday extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("despawn_npc"))
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index a966bdff3e..4648d78f95 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -56,7 +56,7 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
index a8f534ca97..76c5aa611f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
@@ -73,7 +73,7 @@ public class FreyaCelebration extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("give_potion"))
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
index b45e872a60..2570ef061a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
@@ -86,7 +86,7 @@ public class GiftOfVitality extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/HappyHours/HappyHours.java
index 8213b7f1e6..55d8e49ff3 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/HappyHours/HappyHours.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/HappyHours/HappyHours.java
@@ -49,7 +49,7 @@ public class HappyHours extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
index aa5419e179..76aaa4ab09 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
@@ -59,7 +59,7 @@ public class HeavyMedal extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		int level = checkLevel(player);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/HungryHorse/HungryHorse.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
index 5232662a42..44000b61a0 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
@@ -60,7 +60,7 @@ public class HungryHorse extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
index 6107af7f71..502fce9a30 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
@@ -55,7 +55,7 @@ public class HuntForSanta extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/LetterCollector/LetterCollector.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
index 744b1f2ae4..d87bd82b02 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
@@ -123,7 +123,7 @@ public class LetterCollector extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
index b71176a555..a42e986ee4 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
@@ -49,7 +49,7 @@ public class LoveYourGatekeeper extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
index c868fad2b3..6460eb4ab0 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
@@ -61,7 +61,7 @@ public class LoversJubilee extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmtext = event;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
index dd6b8696a7..b73bce80f1 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
@@ -68,7 +68,7 @@ public class MasterOfEnchanting extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("buy_staff"))
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/RedLibra/RedLibra.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/RedLibra/RedLibra.java
index 69414f20c6..693f2efd18 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/RedLibra/RedLibra.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/RedLibra/RedLibra.java
@@ -42,7 +42,7 @@ public class RedLibra extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
index f6c714eddc..7d3462224b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
@@ -58,7 +58,7 @@ public class RudolphsBlessing extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("rudolph_eat") && (player != null) && player.isOnline())
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
index 3f076fc92b..17ff961002 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
@@ -297,7 +297,7 @@ public class SavingSanta extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!isEventPeriod())
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
index 5c00677d25..862a8df578 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
@@ -51,7 +51,7 @@ public class ThePowerOfLove extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
index 6696dee542..a53ca2b3a0 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
@@ -130,7 +130,7 @@ public class AltarOfShilen extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (event.equals("enterInstance"))
@@ -266,7 +266,7 @@ public class AltarOfShilen extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
index 4fcc21b412..56b8393b3a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
@@ -154,7 +154,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -269,7 +269,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
index d804da8ba1..1d83951eff 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
@@ -467,7 +467,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
index 1100b43aee..80911f4423 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
@@ -72,7 +72,7 @@ public class ChamberOfProphecies extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
index 4f0f2f7a19..b815b5bae7 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
@@ -177,7 +177,7 @@ public class ChamberOfDelusion extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CommandPost/CommandPost.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CommandPost/CommandPost.java
index 23da57e021..4a68caa376 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CommandPost/CommandPost.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CommandPost/CommandPost.java
@@ -105,7 +105,7 @@ public class CommandPost extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
index ff860c70bb..c8bed455cc 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
@@ -114,13 +114,13 @@ public class CrystalCavernsCoralGarden extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
index 6db8525e11..46f3d2fdf6 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
@@ -79,13 +79,13 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
index c51b5d7887..121e3a89f4 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
@@ -135,13 +135,13 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
index 72d2fe0f6f..58eec2329b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
@@ -122,7 +122,7 @@ public class DarkCloudMansion extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
index 00241b7b77..4f4fade41e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
@@ -45,7 +45,7 @@ public class DimensionMakkum extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = getPlayerInstance(player);
 		switch (event)
@@ -69,7 +69,7 @@ public class DimensionMakkum extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
index 605b8ebdf8..981a91d4a7 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
@@ -53,13 +53,13 @@ public class DimensionalArchon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), getRandomEntry(ARCHON_MSG)));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
index 176ee5b803..9243451cde 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
@@ -53,7 +53,7 @@ public class DimensionalTrap extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || npc.isAlikeDead())
 		{
@@ -102,7 +102,7 @@ public class DimensionalTrap extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
index 4da8316b88..5b922b7ecd 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
@@ -115,7 +115,7 @@ public class DimensionalWrap extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
index 8211e90098..4d937103a7 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
@@ -45,7 +45,7 @@ public class EvasHiddenSpace extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = player.getQuestState(Q10369_NoblesseSoulTesting.class.getSimpleName());
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
index 98e2ac0c8b..a40e7e3c88 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
@@ -195,12 +195,12 @@ public class EvilIncubator extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player);
 		if ((st == null) || !st.isStarted())
 		{
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java
index d0098998c9..429e0ddd64 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java
@@ -69,7 +69,7 @@ public class FaeronTrainingGrounds1 extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(Q10735_ASpecialPower.class.getSimpleName());
 		String htmltext = null;
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java
index 299468b58f..485d2168fc 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java
@@ -68,7 +68,7 @@ public class FaeronTrainingGrounds2 extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(Q10736_ASpecialPower.class.getSimpleName());
 		String htmltext = null;
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
index 6d58bd6eb4..1477e297c5 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
@@ -59,7 +59,7 @@ public class FortressOfTheDead extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/Fortuna/Fortuna.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/Fortuna/Fortuna.java
index 339328eea4..ef7b65659f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/Fortuna/Fortuna.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/Fortuna/Fortuna.java
@@ -51,7 +51,7 @@ public class Fortuna extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -472,7 +472,7 @@ public class Fortuna extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
index ef73cf3920..a205145189 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
@@ -119,7 +119,7 @@ public class HarnakUndergroundRuins extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
index 598a7460c7..c7180064eb 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
@@ -642,7 +642,7 @@ public class Kamaloka extends AbstractInstance
 	 * Handles only player's enter, single parameter - integer kamaloka index
 	 */
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java
index 7a8f1aa4b3..ef3b1ae1ba 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java
@@ -48,7 +48,7 @@ public class KaraphonHabitat extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(Q10745_TheSecretIngredients.class.getSimpleName());
 		if (qs != null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
index cccdf5d51f..4db13d5b98 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
@@ -195,7 +195,7 @@ public class KartiasLabyrinth extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -268,7 +268,7 @@ public class KartiasLabyrinth extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java
index defddc2e63..4a871ec80d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java
@@ -95,7 +95,7 @@ public class LabyrinthOfBelis extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter_instance"))
 		{
@@ -209,7 +209,7 @@ public class LabyrinthOfBelis extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java
index 0284ac988f..7f88562bc4 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java
@@ -61,7 +61,7 @@ public class MithrilMine extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -108,7 +108,7 @@ public class MithrilMine extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java
index 8477e30897..7a34ab8b3c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java
@@ -127,13 +127,13 @@ public class MuseumDungeon extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter_instance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
index f83f2fcec1..024065f4e9 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
@@ -83,7 +83,7 @@ public class MysticTavern extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
index 48ee563ff5..56d62a42d1 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
@@ -81,7 +81,7 @@ public class StoryOfFreya extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance world = npc.getInstanceWorld();
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
index e21d937eb6..d1d82fe8d7 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
@@ -107,7 +107,7 @@ public class StoryOfTauti extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		switch (event)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
index 150d8f3496..acd2b4b1f7 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
@@ -67,7 +67,7 @@ public class NightmareKamaloka extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -132,7 +132,7 @@ public class NightmareKamaloka extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
index 68ff2fba1b..d91167b4bb 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
@@ -93,7 +93,7 @@ public class NornilsGarden extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (isInInstance(world))
@@ -157,7 +157,7 @@ public class NornilsGarden extends AbstractInstance
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/Nursery/Nursery.java
index 2e394a7446..9042632611 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/Nursery/Nursery.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/Nursery/Nursery.java
@@ -192,7 +192,7 @@ public class Nursery extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance instance = npc.getInstanceWorld();
 		if (isInInstance(instance))
@@ -269,7 +269,7 @@ public class Nursery extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
index 8ddaa9cd0f..f78f43a9dc 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
@@ -101,7 +101,7 @@ public class PailakaDevilsLegacy extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter"))
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java
index b9b2064a77..07fcb7c67b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java
@@ -139,7 +139,7 @@ public class PailakaInjuredDragon extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = player.getQuestState(Q00144_PailakaInjuredDragon.class.getSimpleName());
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
index 5f1d771719..64f2155310 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
@@ -105,7 +105,7 @@ public class PailakaRuneCastle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
index 00fb1c9096..7b25c61e9d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
@@ -63,7 +63,7 @@ public class PailakaSongOfIceAndFire extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -102,7 +102,7 @@ public class PailakaSongOfIceAndFire extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
index 422cbc96a0..48039ff29e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
@@ -173,7 +173,7 @@ public class PrisonOfDarkness extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -313,7 +313,7 @@ public class PrisonOfDarkness extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java
index c72d9b8646..da8c6e785c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java
@@ -162,7 +162,7 @@ public class SSQDisciplesNecropolisPast extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = player.getInstanceWorld();
 		if (world != null)
@@ -264,7 +264,7 @@ public class SSQDisciplesNecropolisPast extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java
index be0450dd2e..b4d398e7d9 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java
@@ -63,7 +63,7 @@ public class SSQLibraryOfSages extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = player.getInstanceWorld();
 		if (world != null)
@@ -103,7 +103,7 @@ public class SSQLibraryOfSages extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java
index e378631253..4b2f28016a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java
@@ -126,7 +126,7 @@ public class SSQMonasteryOfSilence extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = player.getInstanceWorld();
 		if (world != null)
@@ -218,7 +218,7 @@ public class SSQMonasteryOfSilence extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/SSQSanctumOftheLordsOfDawn/SSQSanctumOftheLordsOfDawn.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/SSQSanctumOftheLordsOfDawn/SSQSanctumOftheLordsOfDawn.java
index 9a84142109..863594e558 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/SSQSanctumOftheLordsOfDawn/SSQSanctumOftheLordsOfDawn.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/SSQSanctumOftheLordsOfDawn/SSQSanctumOftheLordsOfDawn.java
@@ -89,7 +89,7 @@ public class SSQSanctumOftheLordsOfDawn extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -126,7 +126,7 @@ public class SSQSanctumOftheLordsOfDawn extends AbstractInstance
 				player.teleToLocation(SAVE_POINT[npc.getScriptValue()]);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java
index dfb00caae2..d5bece244e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java
@@ -196,13 +196,13 @@ public class TaintedDimension extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java
index b0f641adfe..1c74f89fdf 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java
@@ -60,7 +60,7 @@ public class TalkingIslandPast extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -74,7 +74,7 @@ public class TalkingIslandPast extends AbstractInstance
 				teleportPlayerOut(player, world);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
index e4f0fea409..0aa8f7b0be 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
@@ -46,7 +46,7 @@ public class Q00013_ParcelDelivery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
index a9332344fe..5772a2064d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
@@ -44,7 +44,7 @@ public class Q00015_SweetWhispers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
index d825925804..37d92fabd2 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
@@ -53,7 +53,7 @@ public class Q00016_TheComingDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
index 4a1a62c19a..0e0ef5512d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
@@ -52,7 +52,7 @@ public class Q00017_LightAndDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
index c8de373b1f..cb246e0b70 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
@@ -47,7 +47,7 @@ public class Q00019_GoToThePastureland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
index 8467c0a18f..b161006570 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
@@ -44,7 +44,7 @@ public class Q00020_BringUpWithLove extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
index c1ede03985..b885fa960d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
@@ -56,7 +56,7 @@ public class Q00031_SecretBuriedInTheSwamp extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
index ab85113705..02fd7814dd 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
@@ -64,7 +64,7 @@ public class Q00032_AnObviousLie extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
index 346e21ba51..3e17f3d69c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
@@ -53,7 +53,7 @@ public class Q00033_MakeAPairOfDressShoes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
index 30988810b7..32c4a3f461 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
@@ -61,7 +61,7 @@ public class Q00034_InSearchOfCloth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
index c9b8b6e19c..c2d6566765 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
@@ -57,7 +57,7 @@ public class Q00035_FindGlitteringJewelry extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
index e3bd0e5753..73ae6c433d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
@@ -53,7 +53,7 @@ public class Q00036_MakeASewingKit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
index 78660c7498..29c1bd2863 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
@@ -54,7 +54,7 @@ public class Q00037_MakeFormalWear extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
index 5c4d3d5074..c4274aa035 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
@@ -50,7 +50,7 @@ public class Q00040_ASpecialOrder extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
index 100213b849..fe31a6ab4e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
@@ -54,7 +54,7 @@ public class Q00042_HelpTheUncle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
index 9d5f9265df..a5d1225fca 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
@@ -60,7 +60,7 @@ public class Q00043_HelpTheSister extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
index 7cc6c0f337..a13197fc21 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
@@ -55,7 +55,7 @@ public class Q00044_HelpTheSon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java
index 5768b389fd..4e93e4e1bb 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java
@@ -55,7 +55,7 @@ public class Q00061_LawEnforcement extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
index 9cdc614440..8ac70695cd 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
@@ -47,7 +47,7 @@ public class Q00109_InSearchOfTheNest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
index 8dfcd422ca..82e6fe12d2 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
@@ -46,7 +46,7 @@ public class Q00110_ToThePrimevalIsle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java
index 8727edab49..00fa0933e5 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java
@@ -87,7 +87,7 @@ public class Q00111_ElrokianHuntersProof extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
index 40a4965112..c29eaa83b6 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
@@ -55,7 +55,7 @@ public class Q00115_TheOtherSideOfTruth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
index 720f90157c..7701c4bef7 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
@@ -44,7 +44,7 @@ public class Q00119_LastImperialPrince extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
index 84e03ee2a4..cdaa5c33f0 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
@@ -46,7 +46,7 @@ public class Q00124_MeetingTheElroki extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
index 0f59ea74d7..34b0e7404d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
@@ -77,7 +77,7 @@ public class Q00125_TheNameOfEvil1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
index c880bfcd78..2cdaa0aa91 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
@@ -55,7 +55,7 @@ public class Q00126_TheNameOfEvil2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
index 452b42393c..e923610ac9 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
@@ -82,7 +82,7 @@ public class Q00128_PailakaSongOfIceAndFire extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java
index 8afec644ae..f60ce01f79 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java
@@ -68,7 +68,7 @@ public class Q00129_PailakaDevilsLegacy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
index 3b340ac633..7d7eeb1bf5 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
@@ -72,7 +72,7 @@ public class Q00134_TempleMissionary extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
index b16e0481cc..c9771f6f78 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
@@ -70,7 +70,7 @@ public class Q00135_TempleExecutor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
index 62a45e847c..7e8051404a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
@@ -82,7 +82,7 @@ public class Q00136_MoreThanMeetsTheEye extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
index bd8fa776f8..786030dbaa 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
@@ -66,7 +66,7 @@ public class Q00137_TempleChampionPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
index ca37a25537..6d1b504de8 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
@@ -64,7 +64,7 @@ public class Q00138_TempleChampionPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
index df1521d00e..ff220cfb81 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
@@ -59,7 +59,7 @@ public class Q00139_ShadowFoxPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
index 2a37d17413..a168e639b0 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
@@ -68,7 +68,7 @@ public class Q00140_ShadowFoxPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
index c9b1f579f9..0df4d73fda 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
@@ -63,7 +63,7 @@ public class Q00141_ShadowFoxPart3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player, false);
 		if (st == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
index 0c1af718d5..78fb0e0b32 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
@@ -73,7 +73,7 @@ public class Q00142_FallenAngelRequestOfDawn extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
index 78a954764d..9d44b1bc42 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
@@ -52,7 +52,7 @@ public class Q00143_FallenAngelRequestOfDusk extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java
index 8f024cd03b..686696b998 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java
@@ -99,7 +99,7 @@ public class Q00144_PailakaInjuredDragon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java
index e22a0075dd..856ecd88b0 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java
@@ -53,7 +53,7 @@ public class Q00146_TheZeroHour extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java
index f197dee99a..44145d4eed 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java
@@ -50,7 +50,7 @@ public class Q00149_PrimalMotherIstina extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java
index 04ab71a2eb..2d50cdf25e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java
@@ -49,7 +49,7 @@ public class Q00150_ExtremeChallengePrimalMotherResurrected extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
index 22ae037b8c..55261fadf8 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
@@ -69,7 +69,7 @@ public class Q00177_SplitDestiny extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00180_InfernalFlamesBurningInCrystalPrison/Q00180_InfernalFlamesBurningInCrystalPrison.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00180_InfernalFlamesBurningInCrystalPrison/Q00180_InfernalFlamesBurningInCrystalPrison.java
index 3aadc906fe..7a005c6b00 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00180_InfernalFlamesBurningInCrystalPrison/Q00180_InfernalFlamesBurningInCrystalPrison.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00180_InfernalFlamesBurningInCrystalPrison/Q00180_InfernalFlamesBurningInCrystalPrison.java
@@ -53,7 +53,7 @@ public class Q00180_InfernalFlamesBurningInCrystalPrison extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java
index a325fcb987..d44207205c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java
@@ -54,7 +54,7 @@ public class Q00181_DevilsStrikeBackAdventOfBalok extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java
index 2c9337e950..cf6321781b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java
@@ -47,7 +47,7 @@ public class Q00183_RelicExploration extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java
index 56fa89ac7f..416ef1fbd8 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java
@@ -54,7 +54,7 @@ public class Q00184_ArtOfPersuasion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java
index f98dd20667..5a3e22a29c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java
@@ -54,7 +54,7 @@ public class Q00185_NikolasCooperation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java
index e02899fc82..bc04a591e4 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java
@@ -68,7 +68,7 @@ public class Q00186_ContractExecution extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java
index 9c540f6338..a2460cb6c8 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java
@@ -49,7 +49,7 @@ public class Q00187_NikolasHeart extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java
index 1c1777caec..47b0cf65fc 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java
@@ -52,7 +52,7 @@ public class Q00188_SealRemoval extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java
index 5af9afe0fd..68da52d09c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java
@@ -49,7 +49,7 @@ public class Q00189_ContractCompletion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java
index 898d20eee3..45237f5fde 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java
@@ -46,7 +46,7 @@ public class Q00190_LostDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java
index ebc1748aa6..5fcd0f8944 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java
@@ -49,7 +49,7 @@ public class Q00191_VainConclusion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java
index 07c28bdb93..88b7048a5f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java
@@ -52,7 +52,7 @@ public class Q00192_SevenSignsSeriesOfDoubt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
index f81be2e67f..78a292d3d9 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
@@ -66,7 +66,7 @@ public class Q00193_SevenSignsDyingMessage extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == SHILENS_EVIL_THOUGHTS) && "despawn".equals(event))
 		{
@@ -76,7 +76,7 @@ public class Q00193_SevenSignsDyingMessage extends Quest
 				npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.NEXT_TIME_YOU_WILL_NOT_ESCAPE);
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
index 63ec681f3e..1420f8b7af 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
@@ -63,7 +63,7 @@ public class Q00194_SevenSignsMammonsContract extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java
index 4c400a55b1..122ede966b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java
@@ -62,7 +62,7 @@ public class Q00195_SevenSignsSecretRitualOfThePriests extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java
index 5320deacab..129c02898e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java
@@ -60,14 +60,14 @@ public class Q00196_SevenSignsSealOfTheEmperor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == MERCHANT_OF_MAMMON) && "DESPAWN".equals(event))
 		{
 			isBusy = false;
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THE_ANCIENT_PROMISE_TO_THE_EMPEROR_HAS_BEEN_FULFILLED);
 			npc.deleteMe();
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
index 5dab25e1e5..092819fee0 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
@@ -62,7 +62,7 @@ public class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == SHILENS_EVIL_THOUGHTS) && "despawn".equals(event))
 		{
@@ -72,7 +72,7 @@ public class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
 				npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.NEXT_TIME_YOU_WILL_NOT_ESCAPE);
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
index c026781542..c1400b2fe9 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
@@ -65,7 +65,7 @@ public class Q00198_SevenSignsEmbryo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == SHILENS_EVIL_THOUGHTS) && "despawn".equals(event))
 		{
@@ -75,7 +75,7 @@ public class Q00198_SevenSignsEmbryo extends Quest
 				npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.NEXT_TIME_YOU_WILL_NOT_ESCAPE);
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java
index aaf98cd2ae..3495505fb2 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java
@@ -47,7 +47,7 @@ public class Q00210_ObtainAWolfPet extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java
index d0ea67a785..87a060a1c1 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java
@@ -56,7 +56,7 @@ public class Q00237_WindsOfChange extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java
index 31a6cd6c0f..006525cd6f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java
@@ -58,7 +58,7 @@ public class Q00238_SuccessFailureOfBusiness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java
index 1318b53727..e31a6f3e4f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java
@@ -58,7 +58,7 @@ public class Q00239_WontYouJoinUs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
index b8e21a687e..631714d268 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
@@ -65,7 +65,7 @@ public class Q00240_ImTheOnlyOneYouCanTrust extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java
index cef8901dd4..aec784b926 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java
@@ -77,7 +77,7 @@ public class Q00245_ComeToMe extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player.isMentor() && event.equals("30847-13.html"))
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java
index d563a46c8c..282ad1a84b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java
@@ -135,7 +135,7 @@ public class Q00254_LegendaryTales extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java
index 5ff293f59c..69d9549a06 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java
@@ -61,7 +61,7 @@ public class Q00270_TheOneWhoEndsSilence extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java
index 74b891182a..812619fff6 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java
@@ -50,7 +50,7 @@ public class Q00278_HomeSecurity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
index 0680c8e1ac..8002b57df8 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
@@ -73,7 +73,7 @@ public class Q00310_OnlyWhatRemains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
index a5a6fafea2..edae9395ac 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
@@ -113,7 +113,7 @@ public class Q00337_AudienceWithTheLandDragon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
index c8a74d6b71..0bbbc76a1c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
@@ -87,7 +87,7 @@ public class Q00344_1000YearsTheEndOfLamentation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java
index ffe42d334e..be857602fe 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java
@@ -86,7 +86,7 @@ public class Q00371_ShrieksOfGhosts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
index e61f3448e2..d5d9f396a3 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
@@ -124,7 +124,7 @@ public class Q00386_StolenDignity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (npc.getId() == WAREHOUSE_KEEPER_ROMP))
@@ -259,7 +259,7 @@ public class Q00386_StolenDignity extends Quest
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private String takeHtml(Player player, QuestState qs, int num)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
index 7726a3df5d..3e481e9b26 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
@@ -126,7 +126,7 @@ public class Q00420_LittleWing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
index 6390601ce2..14cbad6537 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
@@ -86,7 +86,7 @@ public class Q00421_LittleWingsBigAdventure extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
index 47fc9d7da4..ee9504f119 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
@@ -54,7 +54,7 @@ public class Q00450_GraveRobberRescue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
index 47e03b544f..e38e415a0a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
@@ -61,7 +61,7 @@ public class Q00451_LuciensAltar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
index 946e2fb51d..be55660c3e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
@@ -50,7 +50,7 @@ public class Q00452_FindingtheLostSoldiers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
index 76ba1205f5..18e37daee3 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
@@ -174,7 +174,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java
index 507820dc6a..0fd000078b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java
@@ -63,7 +63,7 @@ public class Q00454_CompletelyLost extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
index 6daf2a37e3..f67b20750b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
@@ -91,7 +91,7 @@ public class Q00455_WingsOfSand extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
index 10f2f47f73..cabd56f883 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
@@ -230,7 +230,7 @@ public class Q00456_DontKnowDontCare extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java
index 524655a0ae..3aa766a77b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java
@@ -65,7 +65,7 @@ public class Q00457_LostAndFound extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java
index 05ac4029e1..baf20da08a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java
@@ -83,7 +83,7 @@ public class Q00458_PerfectForm extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String noQuest = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00459_TheVillainOfTheUndergroundMineTeredor/Q00459_TheVillainOfTheUndergroundMineTeredor.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00459_TheVillainOfTheUndergroundMineTeredor/Q00459_TheVillainOfTheUndergroundMineTeredor.java
index bcec6a35af..0cf6ea0dcb 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00459_TheVillainOfTheUndergroundMineTeredor/Q00459_TheVillainOfTheUndergroundMineTeredor.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00459_TheVillainOfTheUndergroundMineTeredor/Q00459_TheVillainOfTheUndergroundMineTeredor.java
@@ -51,7 +51,7 @@ public class Q00459_TheVillainOfTheUndergroundMineTeredor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00460_PreciousResearchMaterial/Q00460_PreciousResearchMaterial.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00460_PreciousResearchMaterial/Q00460_PreciousResearchMaterial.java
index fb020c3040..981ff3c14e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00460_PreciousResearchMaterial/Q00460_PreciousResearchMaterial.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00460_PreciousResearchMaterial/Q00460_PreciousResearchMaterial.java
@@ -52,7 +52,7 @@ public class Q00460_PreciousResearchMaterial extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java
index bdda5c0ff1..2092e40879 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java
@@ -71,7 +71,7 @@ public class Q00462_StuffedAncientHeroes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java
index f7dbd2b655..4b978752e6 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java
@@ -87,7 +87,7 @@ public class Q00464_Oath extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00465_WeAreFriends/Q00465_WeAreFriends.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00465_WeAreFriends/Q00465_WeAreFriends.java
index 52d86f67f3..af30a59f5d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00465_WeAreFriends/Q00465_WeAreFriends.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00465_WeAreFriends/Q00465_WeAreFriends.java
@@ -51,7 +51,7 @@ public class Q00465_WeAreFriends extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java
index c350641b85..3eb4b71954 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java
@@ -83,7 +83,7 @@ public class Q00466_PlacingMySmallPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00468_BeLostInTheMysteriousScent/Q00468_BeLostInTheMysteriousScent.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00468_BeLostInTheMysteriousScent/Q00468_BeLostInTheMysteriousScent.java
index d880c919e2..5b347e1276 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00468_BeLostInTheMysteriousScent/Q00468_BeLostInTheMysteriousScent.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00468_BeLostInTheMysteriousScent/Q00468_BeLostInTheMysteriousScent.java
@@ -53,7 +53,7 @@ public class Q00468_BeLostInTheMysteriousScent extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00469_SuspiciousGardener/Q00469_SuspiciousGardener.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00469_SuspiciousGardener/Q00469_SuspiciousGardener.java
index 77e00cc205..c739186b4d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00469_SuspiciousGardener/Q00469_SuspiciousGardener.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00469_SuspiciousGardener/Q00469_SuspiciousGardener.java
@@ -52,7 +52,7 @@ public class Q00469_SuspiciousGardener extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00470_DivinityProtector/Q00470_DivinityProtector.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00470_DivinityProtector/Q00470_DivinityProtector.java
index 73c7cefac0..4948dcf1ee 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00470_DivinityProtector/Q00470_DivinityProtector.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00470_DivinityProtector/Q00470_DivinityProtector.java
@@ -72,7 +72,7 @@ public class Q00470_DivinityProtector extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00471_BreakingThroughTheEmeraldSquare/Q00471_BreakingThroughTheEmeraldSquare.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00471_BreakingThroughTheEmeraldSquare/Q00471_BreakingThroughTheEmeraldSquare.java
index 78f677a640..c563bbad31 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00471_BreakingThroughTheEmeraldSquare/Q00471_BreakingThroughTheEmeraldSquare.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00471_BreakingThroughTheEmeraldSquare/Q00471_BreakingThroughTheEmeraldSquare.java
@@ -50,7 +50,7 @@ public class Q00471_BreakingThroughTheEmeraldSquare extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00472_ChallengeSteamCorridor/Q00472_ChallengeSteamCorridor.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00472_ChallengeSteamCorridor/Q00472_ChallengeSteamCorridor.java
index 69f96d292c..0d36fed463 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00472_ChallengeSteamCorridor/Q00472_ChallengeSteamCorridor.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00472_ChallengeSteamCorridor/Q00472_ChallengeSteamCorridor.java
@@ -50,7 +50,7 @@ public class Q00472_ChallengeSteamCorridor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00473_InTheCoralGarden/Q00473_InTheCoralGarden.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00473_InTheCoralGarden/Q00473_InTheCoralGarden.java
index 3331b4528f..7489bd9a3f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00473_InTheCoralGarden/Q00473_InTheCoralGarden.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00473_InTheCoralGarden/Q00473_InTheCoralGarden.java
@@ -50,7 +50,7 @@ public class Q00473_InTheCoralGarden extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00474_WaitingForTheSummer/Q00474_WaitingForTheSummer.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00474_WaitingForTheSummer/Q00474_WaitingForTheSummer.java
index 51691cc5ff..7d5a64da50 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00474_WaitingForTheSummer/Q00474_WaitingForTheSummer.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00474_WaitingForTheSummer/Q00474_WaitingForTheSummer.java
@@ -59,7 +59,7 @@ public class Q00474_WaitingForTheSummer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java
index 3890d7cd62..d98e0f6ace 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java
@@ -79,7 +79,7 @@ public class Q00476_PlainMission extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00482_RecertificationOfValue/Q00482_RecertificationOfValue.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00482_RecertificationOfValue/Q00482_RecertificationOfValue.java
index 62d524dfd3..35d3fa4406 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00482_RecertificationOfValue/Q00482_RecertificationOfValue.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00482_RecertificationOfValue/Q00482_RecertificationOfValue.java
@@ -131,7 +131,7 @@ public class Q00482_RecertificationOfValue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java
index e15e32b144..c10c564ffb 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java
@@ -68,7 +68,7 @@ public class Q00483_IntendedTactic extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00485_HotSpringWater/Q00485_HotSpringWater.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00485_HotSpringWater/Q00485_HotSpringWater.java
index a35badf96b..6b75b6753e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00485_HotSpringWater/Q00485_HotSpringWater.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00485_HotSpringWater/Q00485_HotSpringWater.java
@@ -62,7 +62,7 @@ public class Q00485_HotSpringWater extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00488_WondersOfCaring/Q00488_WondersOfCaring.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00488_WondersOfCaring/Q00488_WondersOfCaring.java
index a310d9ea60..7f6097ddf1 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00488_WondersOfCaring/Q00488_WondersOfCaring.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00488_WondersOfCaring/Q00488_WondersOfCaring.java
@@ -61,7 +61,7 @@ public class Q00488_WondersOfCaring extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00489_InThisQuietPlace/Q00489_InThisQuietPlace.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00489_InThisQuietPlace/Q00489_InThisQuietPlace.java
index 6da9fd75c7..12cf169210 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00489_InThisQuietPlace/Q00489_InThisQuietPlace.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00489_InThisQuietPlace/Q00489_InThisQuietPlace.java
@@ -58,7 +58,7 @@ public class Q00489_InThisQuietPlace extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java
index 4c6f1e68d7..19f3e9b8c6 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java
@@ -74,7 +74,7 @@ public class Q00490_DutyOfTheSurvivor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00491_InNominePatris/Q00491_InNominePatris.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00491_InNominePatris/Q00491_InNominePatris.java
index 3090a9cabe..915b628983 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00491_InNominePatris/Q00491_InNominePatris.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00491_InNominePatris/Q00491_InNominePatris.java
@@ -63,7 +63,7 @@ public class Q00491_InNominePatris extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00492_TombRaiders/Q00492_TombRaiders.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00492_TombRaiders/Q00492_TombRaiders.java
index e45ffa88ae..78553efafa 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00492_TombRaiders/Q00492_TombRaiders.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00492_TombRaiders/Q00492_TombRaiders.java
@@ -59,7 +59,7 @@ public class Q00492_TombRaiders extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java
index 8380c30732..d8b8bd9e9e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java
@@ -53,7 +53,7 @@ public class Q00493_KickingOutUnwelcomeGuests extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java
index 0f9eb53194..4084aa0142 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java
@@ -49,7 +49,7 @@ public class Q00494_IncarnationOfGreedZellakaGroup extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java
index ccf3cd1614..e3fe44aa0f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java
@@ -49,7 +49,7 @@ public class Q00495_IncarnationOfJealousyPellineGroup extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java
index 366e0d572d..94df5d6174 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java
@@ -49,7 +49,7 @@ public class Q00496_IncarnationOfGluttonyKaliosGroup extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java
index 008f69dd2f..d1580e694f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java
@@ -49,7 +49,7 @@ public class Q00497_IncarnationOfGreedZellakaSolo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java
index fe6d1060e8..9585452d7d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java
@@ -49,7 +49,7 @@ public class Q00498_IncarnationOfJealousyPellineSolo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java
index 3023aa50c3..3c2e128522 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java
@@ -49,7 +49,7 @@ public class Q00499_IncarnationOfGluttonyKaliosSolo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
index 0bfb256a66..176b40ad56 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
@@ -69,7 +69,7 @@ public class Q00500_BrothersBoundInChains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java
index ffc938563f..9004f3f63d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java
@@ -106,7 +106,7 @@ public class Q00501_ProofOfClanAlliance extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java
index 1496baa0e7..fa050bef5e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java
@@ -85,7 +85,7 @@ public class Q00503_PursuitOfClanAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
index 1badd9d119..840fe1eb90 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
@@ -74,7 +74,7 @@ public class Q00508_AClansReputation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
index 41dec6a58c..dbc9ddda44 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
@@ -68,7 +68,7 @@ public class Q00509_AClansFame extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
index 4a03ad47de..5a3658c28d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
@@ -56,7 +56,7 @@ public class Q00510_AClansPrestige extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
index 8facc4a8cd..6476fcc9c3 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
@@ -71,7 +71,7 @@ public class Q00511_AwlUnderFoot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
index eab4647ba2..31444f8866 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
@@ -58,7 +58,7 @@ public class Q00512_BladeUnderFoot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
index 0348f88e9b..f97ce90a8e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
@@ -50,7 +50,7 @@ public class Q00551_OlympiadStarter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
index 1a59edd6b7..b06358dc78 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
@@ -50,7 +50,7 @@ public class Q00553_OlympiadUndefeated extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
index 295b613316..d362ed8b48 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
@@ -84,7 +84,7 @@ public class Q00617_GatherTheFlames extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
index 22d8a3f362..481380c065 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
@@ -65,7 +65,7 @@ public class Q00618_IntoTheFlame extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
index 24dc552a09..554a65b448 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
@@ -108,7 +108,7 @@ public class Q00620_FourGoblets extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = player.getQuestState(getName());
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
index effc3c81e3..e473202bfa 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
@@ -62,7 +62,7 @@ public class Q00621_EggDelivery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
index 8a857ca301..0aa311db9e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
@@ -62,7 +62,7 @@ public class Q00622_SpecialtyLiquorDelivery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
index a464df7f99..a0ed4ec2a8 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
@@ -66,7 +66,7 @@ public class Q00623_TheFinestFood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
index 335ef36527..882e4a1ad1 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
@@ -78,7 +78,7 @@ public class Q00627_HeartInSearchOfPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
index 79d69e4221..d4e6a5b7a8 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
@@ -88,7 +88,7 @@ public class Q00631_DeliciousTopChoiceMeat extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
index 6ab1e34b5a..f7548f5322 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
@@ -57,7 +57,7 @@ public class Q00641_AttackSailren extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
index 3ad4eb9269..f4030b7e1d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
@@ -66,7 +66,7 @@ public class Q00642_APowerfulPrimevalCreature extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
index 41c5a83b2a..48d241ef82 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
@@ -103,7 +103,7 @@ public class Q00643_RiseAndFallOfTheElrokiTribe extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
index dec61c1331..ac5cb7ff52 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
@@ -59,7 +59,7 @@ public class Q00645_GhostsOfBatur extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
index 6f6013cac1..ff2f3a5bfe 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
@@ -99,7 +99,7 @@ public class Q00648_AnIceMerchantsDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		final QuestState q115 = player.getQuestState(Q00115_TheOtherSideOfTruth.class.getSimpleName());
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
index e012de30f8..b36fd12f72 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
@@ -90,7 +90,7 @@ public class Q00662_AGameOfCards extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
index 3b05df07a2..51e520cc09 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
@@ -153,7 +153,7 @@ public class Q00663_SeductiveWhispers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00665_BasicTrainingForHunterGuildMember/Q00665_BasicTrainingForHunterGuildMember.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00665_BasicTrainingForHunterGuildMember/Q00665_BasicTrainingForHunterGuildMember.java
index d5ea1aeadc..1dd72a5854 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00665_BasicTrainingForHunterGuildMember/Q00665_BasicTrainingForHunterGuildMember.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00665_BasicTrainingForHunterGuildMember/Q00665_BasicTrainingForHunterGuildMember.java
@@ -64,7 +64,7 @@ public class Q00665_BasicTrainingForHunterGuildMember extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00666_HunterGuildMembersKnowledge/Q00666_HunterGuildMembersKnowledge.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00666_HunterGuildMembersKnowledge/Q00666_HunterGuildMembersKnowledge.java
index b39573ac0b..b1205ef9b6 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00666_HunterGuildMembersKnowledge/Q00666_HunterGuildMembersKnowledge.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00666_HunterGuildMembersKnowledge/Q00666_HunterGuildMembersKnowledge.java
@@ -69,7 +69,7 @@ public class Q00666_HunterGuildMembersKnowledge extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00668_ABattleWithTheGiants/Q00668_ABattleWithTheGiants.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00668_ABattleWithTheGiants/Q00668_ABattleWithTheGiants.java
index 0115611bea..9a2f5d7c44 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00668_ABattleWithTheGiants/Q00668_ABattleWithTheGiants.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00668_ABattleWithTheGiants/Q00668_ABattleWithTheGiants.java
@@ -58,7 +58,7 @@ public class Q00668_ABattleWithTheGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00669_DesperateFightWithTheDragons/Q00669_DesperateFightWithTheDragons.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00669_DesperateFightWithTheDragons/Q00669_DesperateFightWithTheDragons.java
index 86282d9458..808368ccf6 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00669_DesperateFightWithTheDragons/Q00669_DesperateFightWithTheDragons.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00669_DesperateFightWithTheDragons/Q00669_DesperateFightWithTheDragons.java
@@ -57,7 +57,7 @@ public class Q00669_DesperateFightWithTheDragons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00670_DefeatingTheLordOfSeed/Q00670_DefeatingTheLordOfSeed.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00670_DefeatingTheLordOfSeed/Q00670_DefeatingTheLordOfSeed.java
index 7d13e190f7..e8f1153c86 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00670_DefeatingTheLordOfSeed/Q00670_DefeatingTheLordOfSeed.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00670_DefeatingTheLordOfSeed/Q00670_DefeatingTheLordOfSeed.java
@@ -58,7 +58,7 @@ public class Q00670_DefeatingTheLordOfSeed extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00671_PathToFindingThePast/Q00671_PathToFindingThePast.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00671_PathToFindingThePast/Q00671_PathToFindingThePast.java
index bdf1b18f42..b033d03fa8 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00671_PathToFindingThePast/Q00671_PathToFindingThePast.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00671_PathToFindingThePast/Q00671_PathToFindingThePast.java
@@ -69,7 +69,7 @@ public class Q00671_PathToFindingThePast extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00672_ArchenemyEmbryo/Q00672_ArchenemyEmbryo.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00672_ArchenemyEmbryo/Q00672_ArchenemyEmbryo.java
index 596488f105..5b32e1a999 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00672_ArchenemyEmbryo/Q00672_ArchenemyEmbryo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00672_ArchenemyEmbryo/Q00672_ArchenemyEmbryo.java
@@ -55,7 +55,7 @@ public class Q00672_ArchenemyEmbryo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00673_BelethAmbition/Q00673_BelethAmbition.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00673_BelethAmbition/Q00673_BelethAmbition.java
index bb8f3e8832..39b200a128 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00673_BelethAmbition/Q00673_BelethAmbition.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00673_BelethAmbition/Q00673_BelethAmbition.java
@@ -55,7 +55,7 @@ public class Q00673_BelethAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
index 1dfdc81b32..e1e41ba51e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
@@ -49,7 +49,7 @@ public class Q00688_DefeatTheElrokianRaiders extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
index 0278e46ec2..17895d5c45 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
@@ -69,7 +69,7 @@ public class Q00726_LightWithinTheDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
index da19640964..bd744f7aaa 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
@@ -57,7 +57,7 @@ public class Q00727_HopeWithinTheDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00744_TheAlligatorHunterReturns/Q00744_TheAlligatorHunterReturns.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00744_TheAlligatorHunterReturns/Q00744_TheAlligatorHunterReturns.java
index 4230ffc9be..ec5091f5ff 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00744_TheAlligatorHunterReturns/Q00744_TheAlligatorHunterReturns.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00744_TheAlligatorHunterReturns/Q00744_TheAlligatorHunterReturns.java
@@ -65,7 +65,7 @@ public final class Q00744_TheAlligatorHunterReturns extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00745_TheOutlawsAreIncoming/Q00745_TheOutlawsAreIncoming.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00745_TheOutlawsAreIncoming/Q00745_TheOutlawsAreIncoming.java
index a78b4b775a..2e896b781d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00745_TheOutlawsAreIncoming/Q00745_TheOutlawsAreIncoming.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00745_TheOutlawsAreIncoming/Q00745_TheOutlawsAreIncoming.java
@@ -74,7 +74,7 @@ public class Q00745_TheOutlawsAreIncoming extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00747_DefendingTheForsakenPlains/Q00747_DefendingTheForsakenPlains.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00747_DefendingTheForsakenPlains/Q00747_DefendingTheForsakenPlains.java
index 2bf41c5de2..2ce7479e4a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00747_DefendingTheForsakenPlains/Q00747_DefendingTheForsakenPlains.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00747_DefendingTheForsakenPlains/Q00747_DefendingTheForsakenPlains.java
@@ -69,7 +69,7 @@ public final class Q00747_DefendingTheForsakenPlains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00748_EndlessRevenge/Q00748_EndlessRevenge.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00748_EndlessRevenge/Q00748_EndlessRevenge.java
index b7a4d1bf37..c5186f1275 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00748_EndlessRevenge/Q00748_EndlessRevenge.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00748_EndlessRevenge/Q00748_EndlessRevenge.java
@@ -70,7 +70,7 @@ public final class Q00748_EndlessRevenge extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java
index 9161bfd4b9..31eace47ba 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java
@@ -72,7 +72,7 @@ public class Q00751_LiberatingTheSpirits extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java
index 3c5f3d9861..e22b624bc5 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java
@@ -70,7 +70,7 @@ public class Q00752_UncoverTheSecret extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java
index 6f5853054b..935c3a7c37 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java
@@ -78,7 +78,7 @@ public class Q00753_ReactingToACrisis extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00754_AssistingTheRebelForces/Q00754_AssistingTheRebelForces.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00754_AssistingTheRebelForces/Q00754_AssistingTheRebelForces.java
index efd21fd055..fbbb9eb5c6 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00754_AssistingTheRebelForces/Q00754_AssistingTheRebelForces.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00754_AssistingTheRebelForces/Q00754_AssistingTheRebelForces.java
@@ -54,7 +54,7 @@ public class Q00754_AssistingTheRebelForces extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00755_InNeedOfPetras/Q00755_InNeedOfPetras.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00755_InNeedOfPetras/Q00755_InNeedOfPetras.java
index 20aa2199c8..09d9216654 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00755_InNeedOfPetras/Q00755_InNeedOfPetras.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00755_InNeedOfPetras/Q00755_InNeedOfPetras.java
@@ -67,7 +67,7 @@ public class Q00755_InNeedOfPetras extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java
index 40e84f4dd0..9038173a19 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java
@@ -48,7 +48,7 @@ public class Q00756_TopQualityPetra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java
index 1927ac253f..0b6815a166 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java
@@ -71,7 +71,7 @@ public class Q00757_TriolsMovement extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java
index 0578c5952a..c777c72641 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java
@@ -70,7 +70,7 @@ public class Q00758_TheFallenKingsMen extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00759_TheDwarvenNightmareContinues/Q00759_TheDwarvenNightmareContinues.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00759_TheDwarvenNightmareContinues/Q00759_TheDwarvenNightmareContinues.java
index e0db615674..4715b055c5 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00759_TheDwarvenNightmareContinues/Q00759_TheDwarvenNightmareContinues.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00759_TheDwarvenNightmareContinues/Q00759_TheDwarvenNightmareContinues.java
@@ -68,7 +68,7 @@ public class Q00759_TheDwarvenNightmareContinues extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java
index e163658293..33169c48a7 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java
@@ -47,7 +47,7 @@ public class Q00760_BlockTheExit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java
index bbe8918eef..42b3fd1c01 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java
@@ -87,7 +87,7 @@ public class Q00761_AssistingTheGoldenRamArmy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java
index 709817b6a5..ac13b91b3e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java
@@ -116,7 +116,7 @@ public class Q00762_AnOminousRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java
index b22bbfddc0..80637b644a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java
@@ -76,7 +76,7 @@ public class Q00763_ADauntingTask extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00764_WeakeningTheVarkaSilenosForces/Q00764_WeakeningTheVarkaSilenosForces.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00764_WeakeningTheVarkaSilenosForces/Q00764_WeakeningTheVarkaSilenosForces.java
index 5e10448397..fe404d0596 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00764_WeakeningTheVarkaSilenosForces/Q00764_WeakeningTheVarkaSilenosForces.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00764_WeakeningTheVarkaSilenosForces/Q00764_WeakeningTheVarkaSilenosForces.java
@@ -73,7 +73,7 @@ public class Q00764_WeakeningTheVarkaSilenosForces extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00765_WeakeningTheKetraOrcForces/Q00765_WeakeningTheKetraOrcForces.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00765_WeakeningTheKetraOrcForces/Q00765_WeakeningTheKetraOrcForces.java
index c700da56d0..84017857a4 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00765_WeakeningTheKetraOrcForces/Q00765_WeakeningTheKetraOrcForces.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00765_WeakeningTheKetraOrcForces/Q00765_WeakeningTheKetraOrcForces.java
@@ -73,7 +73,7 @@ public class Q00765_WeakeningTheKetraOrcForces extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00772_PurifyingSouls/Q00772_PurifyingSouls.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00772_PurifyingSouls/Q00772_PurifyingSouls.java
index e0ef1a907d..7da7d40be7 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00772_PurifyingSouls/Q00772_PurifyingSouls.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00772_PurifyingSouls/Q00772_PurifyingSouls.java
@@ -69,7 +69,7 @@ public class Q00772_PurifyingSouls extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00773_ToCalmTheFlood/Q00773_ToCalmTheFlood.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00773_ToCalmTheFlood/Q00773_ToCalmTheFlood.java
index 85752c60d6..6cca3d7ec1 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00773_ToCalmTheFlood/Q00773_ToCalmTheFlood.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00773_ToCalmTheFlood/Q00773_ToCalmTheFlood.java
@@ -87,7 +87,7 @@ public class Q00773_ToCalmTheFlood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00774_DreamingOfPeace/Q00774_DreamingOfPeace.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00774_DreamingOfPeace/Q00774_DreamingOfPeace.java
index 51271afc55..26216ab6ef 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00774_DreamingOfPeace/Q00774_DreamingOfPeace.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00774_DreamingOfPeace/Q00774_DreamingOfPeace.java
@@ -88,7 +88,7 @@ public class Q00774_DreamingOfPeace extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java
index e33b22d08f..c93e137b2c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java
@@ -82,7 +82,7 @@ public class Q00775_RetrievingTheChaosFragment extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java
index ac2f54fa8d..18b9f67179 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java
@@ -49,7 +49,7 @@ public class Q00776_SlayDarkLordEkimus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java
index dad6a31213..ff385c026f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java
@@ -50,7 +50,7 @@ public class Q00777_SlayDarkLordTiat extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java
index c2266256c4..9cf140a913 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java
@@ -76,7 +76,7 @@ public class Q00778_OperationRoaringFlame extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00779_UtilizeTheDarknessSeedOfDestruction/Q00779_UtilizeTheDarknessSeedOfDestruction.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00779_UtilizeTheDarknessSeedOfDestruction/Q00779_UtilizeTheDarknessSeedOfDestruction.java
index 15fa0b1e53..c6fac96851 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00779_UtilizeTheDarknessSeedOfDestruction/Q00779_UtilizeTheDarknessSeedOfDestruction.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00779_UtilizeTheDarknessSeedOfDestruction/Q00779_UtilizeTheDarknessSeedOfDestruction.java
@@ -72,7 +72,7 @@ public class Q00779_UtilizeTheDarknessSeedOfDestruction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00780_UtilizeTheDarknessSeedOfInfinity/Q00780_UtilizeTheDarknessSeedOfInfinity.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00780_UtilizeTheDarknessSeedOfInfinity/Q00780_UtilizeTheDarknessSeedOfInfinity.java
index a71bdf61dc..3820918c63 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00780_UtilizeTheDarknessSeedOfInfinity/Q00780_UtilizeTheDarknessSeedOfInfinity.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00780_UtilizeTheDarknessSeedOfInfinity/Q00780_UtilizeTheDarknessSeedOfInfinity.java
@@ -61,7 +61,7 @@ public class Q00780_UtilizeTheDarknessSeedOfInfinity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00781_UtilizeTheDarknessSeedOfAnnihilation/Q00781_UtilizeTheDarknessSeedOfAnnihilation.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00781_UtilizeTheDarknessSeedOfAnnihilation/Q00781_UtilizeTheDarknessSeedOfAnnihilation.java
index 190b971f36..d662d9fc6d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00781_UtilizeTheDarknessSeedOfAnnihilation/Q00781_UtilizeTheDarknessSeedOfAnnihilation.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00781_UtilizeTheDarknessSeedOfAnnihilation/Q00781_UtilizeTheDarknessSeedOfAnnihilation.java
@@ -78,7 +78,7 @@ public class Q00781_UtilizeTheDarknessSeedOfAnnihilation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00782_UtilizeTheDarknessSeedOfHellfire/Q00782_UtilizeTheDarknessSeedOfHellfire.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00782_UtilizeTheDarknessSeedOfHellfire/Q00782_UtilizeTheDarknessSeedOfHellfire.java
index 7feaaf443e..3b181f5417 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00782_UtilizeTheDarknessSeedOfHellfire/Q00782_UtilizeTheDarknessSeedOfHellfire.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00782_UtilizeTheDarknessSeedOfHellfire/Q00782_UtilizeTheDarknessSeedOfHellfire.java
@@ -79,7 +79,7 @@ public class Q00782_UtilizeTheDarknessSeedOfHellfire extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java
index f72f39a08d..0f9c11b687 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java
@@ -71,7 +71,7 @@ public class Q00783_VestigeOfTheMagicPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
@@ -175,17 +175,17 @@ public class Q00783_VestigeOfTheMagicPower extends Quest
 					else if (qs.isCond(5))
 					{
 						htmltext = "31595-05b.htm";
-						onAdvEvent(htmltext, npc, player);
+						onEvent(htmltext, npc, player);
 					}
 					else if (qs.isCond(6))
 					{
 						htmltext = "31595-06b.htm";
-						onAdvEvent(htmltext, npc, player);
+						onEvent(htmltext, npc, player);
 					}
 					else if (qs.isCond(7))
 					{
 						htmltext = "31595-07b.htm";
-						onAdvEvent(htmltext, npc, player);
+						onEvent(htmltext, npc, player);
 					}
 					else if (qs.isCond(2) || qs.isCond(3) || qs.isCond(4))
 					{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java
index 5f840ead5d..449c163fad 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java
@@ -77,7 +77,7 @@ public class Q00787_TheRoleOfAWatcher extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00789_WaitingForPaagrio/Q00789_WaitingForPaagrio.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00789_WaitingForPaagrio/Q00789_WaitingForPaagrio.java
index ab35b9c767..ea6997ed3a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00789_WaitingForPaagrio/Q00789_WaitingForPaagrio.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00789_WaitingForPaagrio/Q00789_WaitingForPaagrio.java
@@ -75,7 +75,7 @@ public final class Q00789_WaitingForPaagrio extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00790_ObtainingFerinsTrust/Q00790_ObtainingFerinsTrust.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00790_ObtainingFerinsTrust/Q00790_ObtainingFerinsTrust.java
index 7056a05ab3..a12633bddd 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00790_ObtainingFerinsTrust/Q00790_ObtainingFerinsTrust.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00790_ObtainingFerinsTrust/Q00790_ObtainingFerinsTrust.java
@@ -73,7 +73,7 @@ public class Q00790_ObtainingFerinsTrust extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00792_TheSuperionGiants/Q00792_TheSuperionGiants.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00792_TheSuperionGiants/Q00792_TheSuperionGiants.java
index a494fa2d3a..1f8af8f813 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00792_TheSuperionGiants/Q00792_TheSuperionGiants.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00792_TheSuperionGiants/Q00792_TheSuperionGiants.java
@@ -70,7 +70,7 @@ public class Q00792_TheSuperionGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00816_PlansToRepairTheStronghold/Q00816_PlansToRepairTheStronghold.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00816_PlansToRepairTheStronghold/Q00816_PlansToRepairTheStronghold.java
index 0507702506..2427136f91 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00816_PlansToRepairTheStronghold/Q00816_PlansToRepairTheStronghold.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00816_PlansToRepairTheStronghold/Q00816_PlansToRepairTheStronghold.java
@@ -65,7 +65,7 @@ public class Q00816_PlansToRepairTheStronghold extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00817_BlackAteliaResearch/Q00817_BlackAteliaResearch.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00817_BlackAteliaResearch/Q00817_BlackAteliaResearch.java
index 7296ee314b..e4de6eff53 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00817_BlackAteliaResearch/Q00817_BlackAteliaResearch.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00817_BlackAteliaResearch/Q00817_BlackAteliaResearch.java
@@ -58,7 +58,7 @@ public class Q00817_BlackAteliaResearch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00823_DisappearedRaceNewFairy/Q00823_DisappearedRaceNewFairy.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00823_DisappearedRaceNewFairy/Q00823_DisappearedRaceNewFairy.java
index cd55044b35..62d5dafe62 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00823_DisappearedRaceNewFairy/Q00823_DisappearedRaceNewFairy.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00823_DisappearedRaceNewFairy/Q00823_DisappearedRaceNewFairy.java
@@ -66,7 +66,7 @@ public class Q00823_DisappearedRaceNewFairy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00824_AttackTheCommandPost/Q00824_AttackTheCommandPost.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00824_AttackTheCommandPost/Q00824_AttackTheCommandPost.java
index db25590de0..c89f2abb8a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00824_AttackTheCommandPost/Q00824_AttackTheCommandPost.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00824_AttackTheCommandPost/Q00824_AttackTheCommandPost.java
@@ -51,7 +51,7 @@ public class Q00824_AttackTheCommandPost extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java
index 33c9979b4a..4f6a1dd284 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java
@@ -68,7 +68,7 @@ public class Q00826_InSearchOfTheSecretWeapon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java
index 8b7399c41e..739655c72f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java
@@ -89,7 +89,7 @@ public class Q00827_EinhasadsOrder extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00828_EvasBlessing/Q00828_EvasBlessing.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00828_EvasBlessing/Q00828_EvasBlessing.java
index 202e0fc3ca..72b34bd5f9 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00828_EvasBlessing/Q00828_EvasBlessing.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00828_EvasBlessing/Q00828_EvasBlessing.java
@@ -95,7 +95,7 @@ public class Q00828_EvasBlessing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00829_MaphrsSalvation/Q00829_MaphrsSalvation.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00829_MaphrsSalvation/Q00829_MaphrsSalvation.java
index 977c610974..457faaa28c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00829_MaphrsSalvation/Q00829_MaphrsSalvation.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00829_MaphrsSalvation/Q00829_MaphrsSalvation.java
@@ -54,7 +54,7 @@ public class Q00829_MaphrsSalvation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00830_TheWayOfTheGiantsPawn/Q00830_TheWayOfTheGiantsPawn.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00830_TheWayOfTheGiantsPawn/Q00830_TheWayOfTheGiantsPawn.java
index 1bac202074..64715ee4c7 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00830_TheWayOfTheGiantsPawn/Q00830_TheWayOfTheGiantsPawn.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00830_TheWayOfTheGiantsPawn/Q00830_TheWayOfTheGiantsPawn.java
@@ -89,7 +89,7 @@ public class Q00830_TheWayOfTheGiantsPawn extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java
index 9584d686bc..cb7bae51ab 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java
@@ -55,7 +55,7 @@ public class Q00831_SayhasScheme extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
index 755ff509f8..42c14d342e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
@@ -65,7 +65,7 @@ public class Q00833_DevilsTreasureTauti extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
index 6448125f2f..d2db3dae19 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
@@ -61,7 +61,7 @@ public class Q00835_PitiableMelisa extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00841_ContaminationContainment/Q00841_ContaminationContainment.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00841_ContaminationContainment/Q00841_ContaminationContainment.java
index d2e0a5f339..f11476f789 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00841_ContaminationContainment/Q00841_ContaminationContainment.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00841_ContaminationContainment/Q00841_ContaminationContainment.java
@@ -86,7 +86,7 @@ public final class Q00841_ContaminationContainment extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00842_CaptiveDemons/Q00842_CaptiveDemons.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00842_CaptiveDemons/Q00842_CaptiveDemons.java
index 6a3f793adb..7c93c26cf7 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00842_CaptiveDemons/Q00842_CaptiveDemons.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00842_CaptiveDemons/Q00842_CaptiveDemons.java
@@ -67,7 +67,7 @@ public class Q00842_CaptiveDemons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00843_GiantEvolutionControl/Q00843_GiantEvolutionControl.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00843_GiantEvolutionControl/Q00843_GiantEvolutionControl.java
index 17fbceb090..f66b6c4eec 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00843_GiantEvolutionControl/Q00843_GiantEvolutionControl.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00843_GiantEvolutionControl/Q00843_GiantEvolutionControl.java
@@ -80,7 +80,7 @@ public final class Q00843_GiantEvolutionControl extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00844_GiantsTreasure/Q00844_GiantsTreasure.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00844_GiantsTreasure/Q00844_GiantsTreasure.java
index ea0d277f7d..06827de98e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00844_GiantsTreasure/Q00844_GiantsTreasure.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00844_GiantsTreasure/Q00844_GiantsTreasure.java
@@ -63,7 +63,7 @@ public class Q00844_GiantsTreasure extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00845_SabotageTheEmbryoSupplies/Q00845_SabotageTheEmbryoSupplies.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00845_SabotageTheEmbryoSupplies/Q00845_SabotageTheEmbryoSupplies.java
index e4a2ecd1e9..c81c7e73bf 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00845_SabotageTheEmbryoSupplies/Q00845_SabotageTheEmbryoSupplies.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00845_SabotageTheEmbryoSupplies/Q00845_SabotageTheEmbryoSupplies.java
@@ -72,7 +72,7 @@ public class Q00845_SabotageTheEmbryoSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00846_BuildingUpStrength/Q00846_BuildingUpStrength.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00846_BuildingUpStrength/Q00846_BuildingUpStrength.java
index c003dafa91..69c93caa37 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00846_BuildingUpStrength/Q00846_BuildingUpStrength.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00846_BuildingUpStrength/Q00846_BuildingUpStrength.java
@@ -75,7 +75,7 @@ public final class Q00846_BuildingUpStrength extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
index 1140fc7490..2a6c62bb48 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
@@ -58,7 +58,7 @@ public class Q00901_HowLavasaurusesAreMade extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java
index b16bc679ac..d9d162c9f1 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java
@@ -77,7 +77,7 @@ public class Q00902_ReclaimOurEra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
index 8587c2f741..d15889aad7 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
@@ -55,7 +55,7 @@ public class Q00903_TheCallOfAntharas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
index 79522f8309..73589e1dbb 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
@@ -103,7 +103,7 @@ public class Q00905_RefinedDragonBlood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
index 3f6c9f9a30..4494d2a115 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
@@ -65,7 +65,7 @@ public class Q00906_TheCallOfValakas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00923_ShinedustExtraction/Q00923_ShinedustExtraction.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00923_ShinedustExtraction/Q00923_ShinedustExtraction.java
index 23a188fedb..a68c027b2a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00923_ShinedustExtraction/Q00923_ShinedustExtraction.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00923_ShinedustExtraction/Q00923_ShinedustExtraction.java
@@ -69,7 +69,7 @@ public class Q00923_ShinedustExtraction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00924_GiantOfTheRestorationRoom/Q00924_GiantOfTheRestorationRoom.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00924_GiantOfTheRestorationRoom/Q00924_GiantOfTheRestorationRoom.java
index de9e6695cc..5fe6d77b8b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00924_GiantOfTheRestorationRoom/Q00924_GiantOfTheRestorationRoom.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00924_GiantOfTheRestorationRoom/Q00924_GiantOfTheRestorationRoom.java
@@ -66,7 +66,7 @@ public class Q00924_GiantOfTheRestorationRoom extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java
index 0c68f67f34..9c53c37390 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java
@@ -58,7 +58,7 @@ public class Q00926_30DaySearchOperation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java
index 18391c86e3..a162ef4426 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java
@@ -65,7 +65,7 @@ public class Q00928_100DaySubjugationOperation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00930_DisparagingThePhantoms/Q00930_DisparagingThePhantoms.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00930_DisparagingThePhantoms/Q00930_DisparagingThePhantoms.java
index 28bb494903..755b411c57 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00930_DisparagingThePhantoms/Q00930_DisparagingThePhantoms.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00930_DisparagingThePhantoms/Q00930_DisparagingThePhantoms.java
@@ -80,7 +80,7 @@ public class Q00930_DisparagingThePhantoms extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00931_MemoriesOfTheWind/Q00931_MemoriesOfTheWind.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00931_MemoriesOfTheWind/Q00931_MemoriesOfTheWind.java
index 5f92dba5cd..31ffff4f32 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00931_MemoriesOfTheWind/Q00931_MemoriesOfTheWind.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00931_MemoriesOfTheWind/Q00931_MemoriesOfTheWind.java
@@ -78,7 +78,7 @@ public class Q00931_MemoriesOfTheWind extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00932_SayhasEnergy/Q00932_SayhasEnergy.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00932_SayhasEnergy/Q00932_SayhasEnergy.java
index 374f7566ba..2682626efb 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00932_SayhasEnergy/Q00932_SayhasEnergy.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00932_SayhasEnergy/Q00932_SayhasEnergy.java
@@ -68,7 +68,7 @@ public class Q00932_SayhasEnergy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java
index 7e36a436ae..ceb13a9c48 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java
@@ -78,7 +78,7 @@ public class Q00937_ToReviveTheFishingGuild extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java
index fcaea628f2..14766f9216 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java
@@ -73,7 +73,7 @@ public class Q00938_TheFishermansOtherHobby extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
index 2fbbe388b7..f5e61c063c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
@@ -54,7 +54,7 @@ public class Q10273_GoodDayToFly extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
index 92298a9598..c5cf9c1ed5 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
@@ -64,7 +64,7 @@ public class Q10274_CollectingInTheAir extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
index 80b9cdef66..f0eae3e565 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
@@ -60,7 +60,7 @@ public class Q10275_ContainingTheAttributePower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
index aea1e23329..adb2982ac1 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
@@ -48,7 +48,7 @@ public class Q10282_ToTheSeedOfAnnihilation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
index e5310632bd..dc9e9a1de4 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
@@ -51,7 +51,7 @@ public class Q10283_RequestOfIceMerchant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java
index c8822c8a8a..fb0cefa677 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java
@@ -54,7 +54,7 @@ public class Q10284_AcquisitionOfDivineSword extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
index a5a7eaace6..d0294d0369 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
@@ -55,7 +55,7 @@ public class Q10285_MeetingSirra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
index b9a00e8388..94f82457bd 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
@@ -56,7 +56,7 @@ public class Q10286_ReunionWithSirra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
index c072297d38..d98cd117bd 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
@@ -50,7 +50,7 @@ public class Q10287_StoryOfThoseLeft extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
index 6603c62c8f..88a4a9ebb4 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
@@ -48,7 +48,7 @@ public class Q10288_SecretMission extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java
index ebc3b15a3a..19e9c7f984 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java
@@ -48,7 +48,7 @@ public class Q10289_FadeToBlack extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
index 8ae5f96306..fe0e24dfe8 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
@@ -54,7 +54,7 @@ public class Q10290_LandDragonConqueror extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
index 093062bde0..554a7ac150 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
@@ -52,7 +52,7 @@ public class Q10291_FireDragonDestroyer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
index 4f42181d0b..38e346b1cd 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
@@ -65,7 +65,7 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java
index 9578509dc1..f80fbdc02b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java
@@ -57,7 +57,7 @@ public class Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java
index 72d0ca7ed5..0ddc585beb 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java
@@ -95,7 +95,7 @@ public class Q10294_SevenSignsToTheMonasteryOfSilence extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java
index 747a9b8e55..fff91fc378 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java
@@ -105,7 +105,7 @@ public class Q10295_SevenSignsSolinasTomb extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java
index e4cf9dbdf6..f350112a68 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java
@@ -60,7 +60,7 @@ public class Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java
index fbcd6311a7..990366217f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java
@@ -50,7 +50,7 @@ public class Q10297_GrandOpeningComeToOurPub extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java
index c7a0f3a27b..44f2de8a14 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java
@@ -71,7 +71,7 @@ public class Q10301_ShadowOfTerrorBlackishRedFog extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10302_UnsettlingShadowAndRumors/Q10302_UnsettlingShadowAndRumors.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10302_UnsettlingShadowAndRumors/Q10302_UnsettlingShadowAndRumors.java
index 35634b2208..0ef255822a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10302_UnsettlingShadowAndRumors/Q10302_UnsettlingShadowAndRumors.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10302_UnsettlingShadowAndRumors/Q10302_UnsettlingShadowAndRumors.java
@@ -51,7 +51,7 @@ public class Q10302_UnsettlingShadowAndRumors extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java
index 075ada8600..77e10de1fd 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java
@@ -75,7 +75,7 @@ public class Q10303_CrossroadsBetweenLightAndDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java
index 66cd2f1407..331fdb471c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java
@@ -75,7 +75,7 @@ public class Q10304_ForForgottenHeroes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java
index 679a617f05..f1df52055e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java
@@ -53,7 +53,7 @@ public class Q10305_UnstoppableFutileEfforts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10306_TheCorruptedLeader/Q10306_TheCorruptedLeader.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10306_TheCorruptedLeader/Q10306_TheCorruptedLeader.java
index 6c34bbf0ec..e400458693 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10306_TheCorruptedLeader/Q10306_TheCorruptedLeader.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10306_TheCorruptedLeader/Q10306_TheCorruptedLeader.java
@@ -59,7 +59,7 @@ public class Q10306_TheCorruptedLeader extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java
index 836ba2610b..b557c0b277 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java
@@ -56,7 +56,7 @@ public class Q10307_TheCorruptedLeaderHisTruth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10310_TwistedCreationTree/Q10310_TwistedCreationTree.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10310_TwistedCreationTree/Q10310_TwistedCreationTree.java
index 9a5f3e93df..6eb9953cdc 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10310_TwistedCreationTree/Q10310_TwistedCreationTree.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10310_TwistedCreationTree/Q10310_TwistedCreationTree.java
@@ -56,7 +56,7 @@ public class Q10310_TwistedCreationTree extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java
index 9e2c35dd09..8971512507 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java
@@ -46,7 +46,7 @@ public class Q10311_PeacefulDaysAreOver extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java
index c7dc807cdf..40c76b9e2f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java
@@ -55,7 +55,7 @@ public class Q10312_AbandonedGodsCreature extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java
index 8f25603bcc..a17c3ebaf6 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java
@@ -49,7 +49,7 @@ public class Q10315_ToThePrisonOfDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java
index 9c05b1f86e..eed57ef8dc 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java
@@ -56,7 +56,7 @@ public class Q10316_UndecayingMemoryOfThePast extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java
index a92657082e..cb331da1d7 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java
@@ -46,7 +46,7 @@ public class Q10317_OrbisWitch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java
index b92fa5339e..d79519ea24 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java
@@ -68,7 +68,7 @@ public class Q10318_DecayingDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java
index 3b176ffac6..44f9b10068 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java
@@ -58,7 +58,7 @@ public class Q10320_LetsGoToTheCentralSquare extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java
index 47ecc55def..8934685d09 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java
@@ -47,7 +47,7 @@ public class Q10321_QualificationsOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java
index 4f48c0b900..b374578bd5 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java
@@ -58,7 +58,7 @@ public class Q10330_ToTheRuinsOfYeSagira extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java
index 23babca5f8..6675e7090b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java
@@ -71,7 +71,7 @@ public class Q10331_StartOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10332_ToughRoad/Q10332_ToughRoad.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10332_ToughRoad/Q10332_ToughRoad.java
index 64f3357d45..1251f64744 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10332_ToughRoad/Q10332_ToughRoad.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10332_ToughRoad/Q10332_ToughRoad.java
@@ -57,7 +57,7 @@ public class Q10332_ToughRoad extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java
index 4e03c773a8..6a7dbf118d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java
@@ -65,7 +65,7 @@ public class Q10333_DisappearedSakum extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10334_ReportingTheStatusOfTheWindmillHill/Q10334_ReportingTheStatusOfTheWindmillHill.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10334_ReportingTheStatusOfTheWindmillHill/Q10334_ReportingTheStatusOfTheWindmillHill.java
index 48650b1ce0..da883a8f14 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10334_ReportingTheStatusOfTheWindmillHill/Q10334_ReportingTheStatusOfTheWindmillHill.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10334_ReportingTheStatusOfTheWindmillHill/Q10334_ReportingTheStatusOfTheWindmillHill.java
@@ -49,7 +49,7 @@ public class Q10334_ReportingTheStatusOfTheWindmillHill extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java
index 3e39536a87..46e88abfab 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java
@@ -58,7 +58,7 @@ public class Q10335_RequestToFindSakum extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10336_DividedSakumKanilov/Q10336_DividedSakumKanilov.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10336_DividedSakumKanilov/Q10336_DividedSakumKanilov.java
index aa5e5614ce..488bc68fca 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10336_DividedSakumKanilov/Q10336_DividedSakumKanilov.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10336_DividedSakumKanilov/Q10336_DividedSakumKanilov.java
@@ -56,7 +56,7 @@ public class Q10336_DividedSakumKanilov extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java
index f2e21d8f93..19c5ac1817 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java
@@ -58,7 +58,7 @@ public class Q10337_SakumsImpact extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
index edc0bdf638..b92033f3e6 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
@@ -66,7 +66,7 @@ public class Q10338_SeizeYourDestiny extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java
index a8277707fa..1d6eeab187 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java
@@ -66,7 +66,7 @@ public class Q10339_FightingTheForgotten extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java
index 9bb47bafb8..718b70bbcd 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java
@@ -48,7 +48,7 @@ public class Q10341_DayOfDestinyHumansFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10341_DayOfDestinyHumansFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java
index 715453f3bb..071deb3562 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java
@@ -48,7 +48,7 @@ public class Q10342_DayOfDestinyElvenFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10342_DayOfDestinyElvenFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java
index b958ae1683..5701012e2c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java
@@ -48,7 +48,7 @@ public class Q10343_DayOfDestinyDarkElfsFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10343_DayOfDestinyDarkElfsFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java
index 3a9540d6f0..ff5519a3f1 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java
@@ -48,7 +48,7 @@ public class Q10344_DayOfDestinyOrcsFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10344_DayOfDestinyOrcsFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java
index f0b38f0d8f..9ad485a695 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java
@@ -48,7 +48,7 @@ public class Q10345_DayOfDestinyDwarfsFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10345_DayOfDestinyDwarfsFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java
index 0f3195f574..5690e3622f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java
@@ -48,7 +48,7 @@ public class Q10346_DayOfDestinyKamaelsFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10346_DayOfDestinyKamaelsFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java
index 2874c31889..6a7bf0c265 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java
@@ -51,7 +51,7 @@ public class Q10351_OwnerOfHall extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java
index 1175e2cdd1..18cd204fc0 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java
@@ -94,7 +94,7 @@ public class Q10353_CertificationOfValue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java
index ea20f5fe52..c1723c3065 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java
@@ -51,7 +51,7 @@ public class Q10354_ResurrectedOwnerOfHall extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10355_BlacksmithsSoul1/Q10355_BlacksmithsSoul1.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10355_BlacksmithsSoul1/Q10355_BlacksmithsSoul1.java
index 16e5c07fbf..28629cd353 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10355_BlacksmithsSoul1/Q10355_BlacksmithsSoul1.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10355_BlacksmithsSoul1/Q10355_BlacksmithsSoul1.java
@@ -73,7 +73,7 @@ public class Q10355_BlacksmithsSoul1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10356_BlacksmithsSoul2/Q10356_BlacksmithsSoul2.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10356_BlacksmithsSoul2/Q10356_BlacksmithsSoul2.java
index 34ddbeb550..92d621ebe8 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10356_BlacksmithsSoul2/Q10356_BlacksmithsSoul2.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10356_BlacksmithsSoul2/Q10356_BlacksmithsSoul2.java
@@ -65,7 +65,7 @@ public class Q10356_BlacksmithsSoul2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java
index d180f6cc32..3f55b11c38 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java
@@ -59,7 +59,7 @@ public class Q10358_DividedSakumPoslof extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10359_TracesOfEvil/Q10359_TracesOfEvil.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10359_TracesOfEvil/Q10359_TracesOfEvil.java
index 06b030511a..be3a0cd2a8 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10359_TracesOfEvil/Q10359_TracesOfEvil.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10359_TracesOfEvil/Q10359_TracesOfEvil.java
@@ -69,7 +69,7 @@ public class Q10359_TracesOfEvil extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java
index 9f01a049cf..56eaa948f2 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java
@@ -89,7 +89,7 @@ public class Q10360_CertificationOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java
index de64b241ea..8080af8df8 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java
@@ -59,7 +59,7 @@ public class Q10362_CertificationOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java
index 52a0d77960..e7071d4011 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java
@@ -61,7 +61,7 @@ public class Q10363_RequestOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java
index a3f167bb3b..2cad7041b8 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java
@@ -59,7 +59,7 @@ public class Q10364_ObligationsOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/Q10365_ForTheSearchdogKing.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/Q10365_ForTheSearchdogKing.java
index e121324c80..fa5575aaba 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/Q10365_ForTheSearchdogKing.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/Q10365_ForTheSearchdogKing.java
@@ -57,7 +57,7 @@ public class Q10365_ForTheSearchdogKing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java
index affa7852ba..f4baa88fde 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java
@@ -62,7 +62,7 @@ public class Q10366_ReportOnTheSituationAtTheRuins extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10369_NoblesseSoulTesting/Q10369_NoblesseSoulTesting.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10369_NoblesseSoulTesting/Q10369_NoblesseSoulTesting.java
index 236fe0146e..511af97acc 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10369_NoblesseSoulTesting/Q10369_NoblesseSoulTesting.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10369_NoblesseSoulTesting/Q10369_NoblesseSoulTesting.java
@@ -122,11 +122,11 @@ public class Q10369_NoblesseSoulTesting extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player == null)
 		{
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
@@ -321,7 +321,7 @@ public class Q10369_NoblesseSoulTesting extends Quest
 									final Quest instance = QuestManager.getInstance().getQuest(EvasHiddenSpace.class.getSimpleName());
 									if (instance != null)
 									{
-										instance.onAdvEvent("enterInstance", npc, player);
+										instance.onEvent("enterInstance", npc, player);
 									}
 									htmltext = null;
 									break;
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10370_MenacingTimes/Q10370_MenacingTimes.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10370_MenacingTimes/Q10370_MenacingTimes.java
index dc213da234..4763dba885 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10370_MenacingTimes/Q10370_MenacingTimes.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10370_MenacingTimes/Q10370_MenacingTimes.java
@@ -65,7 +65,7 @@ public class Q10370_MenacingTimes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10371_GraspThyPower/Q10371_GraspThyPower.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10371_GraspThyPower/Q10371_GraspThyPower.java
index a3a431ae90..f19d9a6240 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10371_GraspThyPower/Q10371_GraspThyPower.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10371_GraspThyPower/Q10371_GraspThyPower.java
@@ -61,7 +61,7 @@ public class Q10371_GraspThyPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10372_PurgatoryVolvere/Q10372_PurgatoryVolvere.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10372_PurgatoryVolvere/Q10372_PurgatoryVolvere.java
index 34e367af3f..73c9586552 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10372_PurgatoryVolvere/Q10372_PurgatoryVolvere.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10372_PurgatoryVolvere/Q10372_PurgatoryVolvere.java
@@ -58,7 +58,7 @@ public class Q10372_PurgatoryVolvere extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10373_ExploringTheDimensionSealingTheDimension/Q10373_ExploringTheDimensionSealingTheDimension.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10373_ExploringTheDimensionSealingTheDimension/Q10373_ExploringTheDimensionSealingTheDimension.java
index 7056e8b72a..425b0c979d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10373_ExploringTheDimensionSealingTheDimension/Q10373_ExploringTheDimensionSealingTheDimension.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10373_ExploringTheDimensionSealingTheDimension/Q10373_ExploringTheDimensionSealingTheDimension.java
@@ -44,7 +44,7 @@ public class Q10373_ExploringTheDimensionSealingTheDimension extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10374_ThatPlaceSuccubus/Q10374_ThatPlaceSuccubus.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10374_ThatPlaceSuccubus/Q10374_ThatPlaceSuccubus.java
index 8d91352295..44d4e50656 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10374_ThatPlaceSuccubus/Q10374_ThatPlaceSuccubus.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10374_ThatPlaceSuccubus/Q10374_ThatPlaceSuccubus.java
@@ -65,7 +65,7 @@ public class Q10374_ThatPlaceSuccubus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10375_SuccubusDisciples/Q10375_SuccubusDisciples.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10375_SuccubusDisciples/Q10375_SuccubusDisciples.java
index 2bbdfeff18..f14f026f93 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10375_SuccubusDisciples/Q10375_SuccubusDisciples.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10375_SuccubusDisciples/Q10375_SuccubusDisciples.java
@@ -64,7 +64,7 @@ public class Q10375_SuccubusDisciples extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java
index 965d1d06dd..8d6af4cb2d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java
@@ -66,7 +66,7 @@ public class Q10376_BloodyGoodTime extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java
index 255a3ce354..6a38565c9f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java
@@ -59,7 +59,7 @@ public class Q10377_TheInvadedExecutionGrounds extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10378_WeedingWork/Q10378_WeedingWork.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10378_WeedingWork/Q10378_WeedingWork.java
index e55058d9a5..cc498e2821 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10378_WeedingWork/Q10378_WeedingWork.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10378_WeedingWork/Q10378_WeedingWork.java
@@ -57,7 +57,7 @@ public class Q10378_WeedingWork extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10379_AnUninvitedGuest/Q10379_AnUninvitedGuest.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10379_AnUninvitedGuest/Q10379_AnUninvitedGuest.java
index 8502410bee..e227de28c7 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10379_AnUninvitedGuest/Q10379_AnUninvitedGuest.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10379_AnUninvitedGuest/Q10379_AnUninvitedGuest.java
@@ -69,7 +69,7 @@ public class Q10379_AnUninvitedGuest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10380_TheExecutionersExecution/Q10380_TheExecutionersExecution.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10380_TheExecutionersExecution/Q10380_TheExecutionersExecution.java
index 7b59d40bcb..5b4910c43e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10380_TheExecutionersExecution/Q10380_TheExecutionersExecution.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10380_TheExecutionersExecution/Q10380_TheExecutionersExecution.java
@@ -67,7 +67,7 @@ public class Q10380_TheExecutionersExecution extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java
index 3fdb1d2625..1a0550ce7a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java
@@ -49,7 +49,7 @@ public class Q10381_ToTheSeedOfHellfire extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10382_DayOfLiberation/Q10382_DayOfLiberation.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10382_DayOfLiberation/Q10382_DayOfLiberation.java
index 29de22db80..bf7a89cbc4 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10382_DayOfLiberation/Q10382_DayOfLiberation.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10382_DayOfLiberation/Q10382_DayOfLiberation.java
@@ -48,7 +48,7 @@ public class Q10382_DayOfLiberation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java
index 5a50c186ec..97fd290cdb 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java
@@ -61,7 +61,7 @@ public class Q10383_FergasonsOffer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java
index 11188fdada..9aba58dd1e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java
@@ -52,7 +52,7 @@ public class Q10384_AnAudienceWithTauti extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10385_RedThreadOfFate/Q10385_RedThreadOfFate.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10385_RedThreadOfFate/Q10385_RedThreadOfFate.java
index e16cde08bf..1a97e6d7de 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10385_RedThreadOfFate/Q10385_RedThreadOfFate.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10385_RedThreadOfFate/Q10385_RedThreadOfFate.java
@@ -120,7 +120,7 @@ public class Q10385_RedThreadOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -756,7 +756,7 @@ public class Q10385_RedThreadOfFate extends Quest
 						final Quest instance = QuestManager.getInstance().getQuest(TalkingIslandPast.class.getSimpleName());
 						if (instance != null)
 						{
-							instance.onAdvEvent("enterInstance", npc, player);
+							instance.onEvent("enterInstance", npc, player);
 						}
 					}
 					break;
@@ -844,7 +844,7 @@ public class Q10385_RedThreadOfFate extends Quest
 							final Quest instance = QuestManager.getInstance().getQuest(TalkingIslandPast.class.getSimpleName());
 							if (instance != null)
 							{
-								instance.onAdvEvent("enterInstance", npc, player);
+								instance.onEvent("enterInstance", npc, player);
 							}
 							break;
 						}
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10386_MysteriousJourney/Q10386_MysteriousJourney.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10386_MysteriousJourney/Q10386_MysteriousJourney.java
index 199681b2fa..51a014c8bf 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10386_MysteriousJourney/Q10386_MysteriousJourney.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10386_MysteriousJourney/Q10386_MysteriousJourney.java
@@ -50,7 +50,7 @@ public class Q10386_MysteriousJourney extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10387_SoullessOne/Q10387_SoullessOne.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10387_SoullessOne/Q10387_SoullessOne.java
index 3b4e70d070..90284f0de9 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10387_SoullessOne/Q10387_SoullessOne.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10387_SoullessOne/Q10387_SoullessOne.java
@@ -54,7 +54,7 @@ public class Q10387_SoullessOne extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java
index 174ea1a300..e5a8517a69 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java
@@ -46,7 +46,7 @@ public class Q10388_ConspiracyBehindDoor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java
index 6d60016a06..619cf89fa5 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java
@@ -66,7 +66,7 @@ public class Q10389_TheVoiceOfAuthority extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10390_KekropusLetter/Q10390_KekropusLetter.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10390_KekropusLetter/Q10390_KekropusLetter.java
index 915a4d309d..a918b736f6 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10390_KekropusLetter/Q10390_KekropusLetter.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10390_KekropusLetter/Q10390_KekropusLetter.java
@@ -67,7 +67,7 @@ public class Q10390_KekropusLetter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10391_ASuspiciousHelper/Q10391_ASuspiciousHelper.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10391_ASuspiciousHelper/Q10391_ASuspiciousHelper.java
index 52f96af258..e9ad07b210 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10391_ASuspiciousHelper/Q10391_ASuspiciousHelper.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10391_ASuspiciousHelper/Q10391_ASuspiciousHelper.java
@@ -51,7 +51,7 @@ public class Q10391_ASuspiciousHelper extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10392_FailureAndItsConsequences/Q10392_FailureAndItsConsequences.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10392_FailureAndItsConsequences/Q10392_FailureAndItsConsequences.java
index bf10758dda..7fb2e89ae5 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10392_FailureAndItsConsequences/Q10392_FailureAndItsConsequences.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10392_FailureAndItsConsequences/Q10392_FailureAndItsConsequences.java
@@ -59,7 +59,7 @@ public class Q10392_FailureAndItsConsequences extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10393_KekropusLetterAClueCompleted/Q10393_KekropusLetterAClueCompleted.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10393_KekropusLetterAClueCompleted/Q10393_KekropusLetterAClueCompleted.java
index 04512a9f0a..ab6418df20 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10393_KekropusLetterAClueCompleted/Q10393_KekropusLetterAClueCompleted.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10393_KekropusLetterAClueCompleted/Q10393_KekropusLetterAClueCompleted.java
@@ -58,7 +58,7 @@ public class Q10393_KekropusLetterAClueCompleted extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java
index 4156426b80..ac75f9b6c9 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java
@@ -54,7 +54,7 @@ public class Q10394_MutualBenefit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java
index 04995ac069..8b1026ccb4 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java
@@ -63,7 +63,7 @@ public class Q10395_NotATraitor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10397_KekropusLetterASuspiciousBadge/Q10397_KekropusLetterASuspiciousBadge.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10397_KekropusLetterASuspiciousBadge/Q10397_KekropusLetterASuspiciousBadge.java
index 3f4fccb723..46a0ff46f6 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10397_KekropusLetterASuspiciousBadge/Q10397_KekropusLetterASuspiciousBadge.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10397_KekropusLetterASuspiciousBadge/Q10397_KekropusLetterASuspiciousBadge.java
@@ -58,7 +58,7 @@ public class Q10397_KekropusLetterASuspiciousBadge extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10398_ASuspiciousBadge/Q10398_ASuspiciousBadge.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10398_ASuspiciousBadge/Q10398_ASuspiciousBadge.java
index b4623adf0f..0f443aa463 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10398_ASuspiciousBadge/Q10398_ASuspiciousBadge.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10398_ASuspiciousBadge/Q10398_ASuspiciousBadge.java
@@ -59,7 +59,7 @@ public class Q10398_ASuspiciousBadge extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10399_TheAlphabetOfTheGiants/Q10399_TheAlphabetOfTheGiants.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10399_TheAlphabetOfTheGiants/Q10399_TheAlphabetOfTheGiants.java
index c2fe1e2e38..8e72951a3a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10399_TheAlphabetOfTheGiants/Q10399_TheAlphabetOfTheGiants.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10399_TheAlphabetOfTheGiants/Q10399_TheAlphabetOfTheGiants.java
@@ -57,7 +57,7 @@ public class Q10399_TheAlphabetOfTheGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10401_KekropusLetterDecodingTheBadge/Q10401_KekropusLetterDecodingTheBadge.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10401_KekropusLetterDecodingTheBadge/Q10401_KekropusLetterDecodingTheBadge.java
index ee768f1311..2febeca461 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10401_KekropusLetterDecodingTheBadge/Q10401_KekropusLetterDecodingTheBadge.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10401_KekropusLetterDecodingTheBadge/Q10401_KekropusLetterDecodingTheBadge.java
@@ -58,7 +58,7 @@ public class Q10401_KekropusLetterDecodingTheBadge extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java
index bb9e1f69a1..2b13d94da7 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java
@@ -63,7 +63,7 @@ public class Q10402_NowhereToTurn extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10403_TheGuardianGiant/Q10403_TheGuardianGiant.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10403_TheGuardianGiant/Q10403_TheGuardianGiant.java
index 6a5e799879..b2b97e99b2 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10403_TheGuardianGiant/Q10403_TheGuardianGiant.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10403_TheGuardianGiant/Q10403_TheGuardianGiant.java
@@ -63,7 +63,7 @@ public class Q10403_TheGuardianGiant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10404_KekropusLetterAHiddenMeaning/Q10404_KekropusLetterAHiddenMeaning.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10404_KekropusLetterAHiddenMeaning/Q10404_KekropusLetterAHiddenMeaning.java
index c7fa63f4ba..94d0ec3aaf 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10404_KekropusLetterAHiddenMeaning/Q10404_KekropusLetterAHiddenMeaning.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10404_KekropusLetterAHiddenMeaning/Q10404_KekropusLetterAHiddenMeaning.java
@@ -58,7 +58,7 @@ public class Q10404_KekropusLetterAHiddenMeaning extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10405_KartiasSeed/Q10405_KartiasSeed.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10405_KartiasSeed/Q10405_KartiasSeed.java
index 42291ddcaf..ef7e7396db 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10405_KartiasSeed/Q10405_KartiasSeed.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10405_KartiasSeed/Q10405_KartiasSeed.java
@@ -66,7 +66,7 @@ public class Q10405_KartiasSeed extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java
index 327c51112a..f4ede19821 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java
@@ -55,7 +55,7 @@ public class Q10406_BeforeDarknessBearsFruit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10407_LetsGoFishing/Q10407_LetsGoFishing.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10407_LetsGoFishing/Q10407_LetsGoFishing.java
index 6be6ce07fc..ed6967b6a7 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10407_LetsGoFishing/Q10407_LetsGoFishing.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10407_LetsGoFishing/Q10407_LetsGoFishing.java
@@ -81,7 +81,7 @@ public class Q10407_LetsGoFishing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10408_KekropusLetterTheSwampOfScreams/Q10408_KekropusLetterTheSwampOfScreams.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10408_KekropusLetterTheSwampOfScreams/Q10408_KekropusLetterTheSwampOfScreams.java
index 4878a4ecf7..107f94dcb7 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10408_KekropusLetterTheSwampOfScreams/Q10408_KekropusLetterTheSwampOfScreams.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10408_KekropusLetterTheSwampOfScreams/Q10408_KekropusLetterTheSwampOfScreams.java
@@ -58,7 +58,7 @@ public class Q10408_KekropusLetterTheSwampOfScreams extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java
index f5af9f664d..dce8f9986b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java
@@ -48,7 +48,7 @@ public class Q10409_ASuspiciousVagabondInTheSwamp extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java
index 77b3ca56b2..49f9797292 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java
@@ -73,7 +73,7 @@ public class Q10410_EmbryoInTheSwampOfScreams extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10411_KekropusLetterTheForestOfTheDead/Q10411_KekropusLetterTheForestOfTheDead.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10411_KekropusLetterTheForestOfTheDead/Q10411_KekropusLetterTheForestOfTheDead.java
index 3a77058cbd..a454850c0e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10411_KekropusLetterTheForestOfTheDead/Q10411_KekropusLetterTheForestOfTheDead.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10411_KekropusLetterTheForestOfTheDead/Q10411_KekropusLetterTheForestOfTheDead.java
@@ -58,7 +58,7 @@ public class Q10411_KekropusLetterTheForestOfTheDead extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java
index 2bcc230a31..79c93ddebe 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java
@@ -48,7 +48,7 @@ public class Q10412_ASuspiciousVagabondInTheForest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java
index 368315d6d6..1260efb4f7 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java
@@ -102,7 +102,7 @@ public class Q10413_EmbryoInTheForestOfTheDead extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10414_KekropusLetterWithCourage/Q10414_KekropusLetterWithCourage.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10414_KekropusLetterWithCourage/Q10414_KekropusLetterWithCourage.java
index d32089dcd4..3ce34bc9a6 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10414_KekropusLetterWithCourage/Q10414_KekropusLetterWithCourage.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10414_KekropusLetterWithCourage/Q10414_KekropusLetterWithCourage.java
@@ -58,7 +58,7 @@ public class Q10414_KekropusLetterWithCourage extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10415_KekropusLetterWithWisdom/Q10415_KekropusLetterWithWisdom.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10415_KekropusLetterWithWisdom/Q10415_KekropusLetterWithWisdom.java
index b2c5ad0214..9ebbb60f2c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10415_KekropusLetterWithWisdom/Q10415_KekropusLetterWithWisdom.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10415_KekropusLetterWithWisdom/Q10415_KekropusLetterWithWisdom.java
@@ -59,7 +59,7 @@ public class Q10415_KekropusLetterWithWisdom extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java
index 59961329d7..3436179c13 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java
@@ -67,7 +67,7 @@ public class Q10416_InSearchOfTheEyeOfArgos extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java
index 030668ee81..0e978c24df 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java
@@ -51,7 +51,7 @@ public class Q10417_DaimonTheWhiteEyed extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10418_TheImmortalPirateKing/Q10418_TheImmortalPirateKing.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10418_TheImmortalPirateKing/Q10418_TheImmortalPirateKing.java
index 239ef8a3a7..d6d93746c2 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10418_TheImmortalPirateKing/Q10418_TheImmortalPirateKing.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10418_TheImmortalPirateKing/Q10418_TheImmortalPirateKing.java
@@ -48,7 +48,7 @@ public class Q10418_TheImmortalPirateKing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10419_KekropusLetterKampfsWhereabouts/Q10419_KekropusLetterKampfsWhereabouts.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10419_KekropusLetterKampfsWhereabouts/Q10419_KekropusLetterKampfsWhereabouts.java
index 2ef4ad7cf8..ded7781932 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10419_KekropusLetterKampfsWhereabouts/Q10419_KekropusLetterKampfsWhereabouts.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10419_KekropusLetterKampfsWhereabouts/Q10419_KekropusLetterKampfsWhereabouts.java
@@ -58,7 +58,7 @@ public class Q10419_KekropusLetterKampfsWhereabouts extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10420_TheVarkaSilenosSupporters/Q10420_TheVarkaSilenosSupporters.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10420_TheVarkaSilenosSupporters/Q10420_TheVarkaSilenosSupporters.java
index d7bd1e9006..2e9aeebde8 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10420_TheVarkaSilenosSupporters/Q10420_TheVarkaSilenosSupporters.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10420_TheVarkaSilenosSupporters/Q10420_TheVarkaSilenosSupporters.java
@@ -75,7 +75,7 @@ public class Q10420_TheVarkaSilenosSupporters extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10421_AssassinationOfTheVarkaSilenosCommander/Q10421_AssassinationOfTheVarkaSilenosCommander.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10421_AssassinationOfTheVarkaSilenosCommander/Q10421_AssassinationOfTheVarkaSilenosCommander.java
index b466969c97..2d6adc18da 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10421_AssassinationOfTheVarkaSilenosCommander/Q10421_AssassinationOfTheVarkaSilenosCommander.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10421_AssassinationOfTheVarkaSilenosCommander/Q10421_AssassinationOfTheVarkaSilenosCommander.java
@@ -51,7 +51,7 @@ public class Q10421_AssassinationOfTheVarkaSilenosCommander extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java
index 080ce0ebad..d68989ef8a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java
@@ -55,7 +55,7 @@ public class Q10422_AssassinationOfTheVarkaSilenosChief extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10424_KekropusLetterBelosWhereabouts/Q10424_KekropusLetterBelosWhereabouts.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10424_KekropusLetterBelosWhereabouts/Q10424_KekropusLetterBelosWhereabouts.java
index a36ccde18b..08211d3c9e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10424_KekropusLetterBelosWhereabouts/Q10424_KekropusLetterBelosWhereabouts.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10424_KekropusLetterBelosWhereabouts/Q10424_KekropusLetterBelosWhereabouts.java
@@ -58,7 +58,7 @@ public class Q10424_KekropusLetterBelosWhereabouts extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10425_TheKetraOrcSupporters/Q10425_TheKetraOrcSupporters.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10425_TheKetraOrcSupporters/Q10425_TheKetraOrcSupporters.java
index 2fd6da992d..ae30164989 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10425_TheKetraOrcSupporters/Q10425_TheKetraOrcSupporters.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10425_TheKetraOrcSupporters/Q10425_TheKetraOrcSupporters.java
@@ -78,7 +78,7 @@ public class Q10425_TheKetraOrcSupporters extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10426_AssassinationOfTheKetraOrcCommander/Q10426_AssassinationOfTheKetraOrcCommander.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10426_AssassinationOfTheKetraOrcCommander/Q10426_AssassinationOfTheKetraOrcCommander.java
index 094dcd36c3..1ed6ed4388 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10426_AssassinationOfTheKetraOrcCommander/Q10426_AssassinationOfTheKetraOrcCommander.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10426_AssassinationOfTheKetraOrcCommander/Q10426_AssassinationOfTheKetraOrcCommander.java
@@ -53,7 +53,7 @@ public class Q10426_AssassinationOfTheKetraOrcCommander extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java
index ccd9df0ad1..56f5951419 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java
@@ -55,7 +55,7 @@ public class Q10427_AssassinationOfTheKetraOrcChief extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10442_TheAnnihilatedPlains1/Q10442_TheAnnihilatedPlains1.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10442_TheAnnihilatedPlains1/Q10442_TheAnnihilatedPlains1.java
index 5d9569f1bc..cfa2532708 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10442_TheAnnihilatedPlains1/Q10442_TheAnnihilatedPlains1.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10442_TheAnnihilatedPlains1/Q10442_TheAnnihilatedPlains1.java
@@ -43,7 +43,7 @@ public class Q10442_TheAnnihilatedPlains1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10443_TheAnnihilatedPlains2/Q10443_TheAnnihilatedPlains2.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10443_TheAnnihilatedPlains2/Q10443_TheAnnihilatedPlains2.java
index a17b25f237..4a8eacfbf6 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10443_TheAnnihilatedPlains2/Q10443_TheAnnihilatedPlains2.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10443_TheAnnihilatedPlains2/Q10443_TheAnnihilatedPlains2.java
@@ -52,7 +52,7 @@ public class Q10443_TheAnnihilatedPlains2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10444_TheOriginOfMonsters/Q10444_TheOriginOfMonsters.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10444_TheOriginOfMonsters/Q10444_TheOriginOfMonsters.java
index ad98ec175b..e52d6f6c4f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10444_TheOriginOfMonsters/Q10444_TheOriginOfMonsters.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10444_TheOriginOfMonsters/Q10444_TheOriginOfMonsters.java
@@ -57,7 +57,7 @@ public class Q10444_TheOriginOfMonsters extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10445_AnImpendingThreat/Q10445_AnImpendingThreat.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10445_AnImpendingThreat/Q10445_AnImpendingThreat.java
index c78d904936..dac215a5b1 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10445_AnImpendingThreat/Q10445_AnImpendingThreat.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10445_AnImpendingThreat/Q10445_AnImpendingThreat.java
@@ -53,7 +53,7 @@ public class Q10445_AnImpendingThreat extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java
index bb70f87faa..4649f7548e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java
@@ -58,7 +58,7 @@ public class Q10446_HitAndRun extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java
index c49b98c92d..c173bf24b6 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java
@@ -74,7 +74,7 @@ public class Q10447_TimingIsEverything extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10450_ADarkAmbition/Q10450_ADarkAmbition.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10450_ADarkAmbition/Q10450_ADarkAmbition.java
index c3f232b499..8f085a2197 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10450_ADarkAmbition/Q10450_ADarkAmbition.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10450_ADarkAmbition/Q10450_ADarkAmbition.java
@@ -49,7 +49,7 @@ public class Q10450_ADarkAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10452_IsItEdible/Q10452_IsItEdible.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10452_IsItEdible/Q10452_IsItEdible.java
index 921c507a44..751de64b84 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10452_IsItEdible/Q10452_IsItEdible.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10452_IsItEdible/Q10452_IsItEdible.java
@@ -53,7 +53,7 @@ public class Q10452_IsItEdible extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10453_StoppingTheWindDragon/Q10453_StoppingTheWindDragon.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10453_StoppingTheWindDragon/Q10453_StoppingTheWindDragon.java
index 3b567c5d04..6a74beb026 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10453_StoppingTheWindDragon/Q10453_StoppingTheWindDragon.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10453_StoppingTheWindDragon/Q10453_StoppingTheWindDragon.java
@@ -46,7 +46,7 @@ public class Q10453_StoppingTheWindDragon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java
index 133390e3ed..b58a5b6e94 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java
@@ -49,7 +49,7 @@ public class Q10454_FinalEmbryoApostle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java
index b6cec7570e..7268e0de45 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java
@@ -50,7 +50,7 @@ public class Q10455_ElikiasLetter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10456_OperationRescue/Q10456_OperationRescue.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10456_OperationRescue/Q10456_OperationRescue.java
index f38ae9e388..7da35bc35f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10456_OperationRescue/Q10456_OperationRescue.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10456_OperationRescue/Q10456_OperationRescue.java
@@ -66,7 +66,7 @@ public class Q10456_OperationRescue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10457_KefensisIllusion/Q10457_KefensisIllusion.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10457_KefensisIllusion/Q10457_KefensisIllusion.java
index 907cca5e98..32d56eba4b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10457_KefensisIllusion/Q10457_KefensisIllusion.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10457_KefensisIllusion/Q10457_KefensisIllusion.java
@@ -65,7 +65,7 @@ public class Q10457_KefensisIllusion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java
index fc5b941631..11718fe3dc 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java
@@ -54,7 +54,7 @@ public class Q10459_ASickAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10460_ReturnOfTheAlligatorHunter/Q10460_ReturnOfTheAlligatorHunter.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10460_ReturnOfTheAlligatorHunter/Q10460_ReturnOfTheAlligatorHunter.java
index e8890d2fdb..5220e36a95 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10460_ReturnOfTheAlligatorHunter/Q10460_ReturnOfTheAlligatorHunter.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10460_ReturnOfTheAlligatorHunter/Q10460_ReturnOfTheAlligatorHunter.java
@@ -60,7 +60,7 @@ public class Q10460_ReturnOfTheAlligatorHunter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10462_TemperARustingBlade/Q10462_TemperARustingBlade.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10462_TemperARustingBlade/Q10462_TemperARustingBlade.java
index 26bd532b3f..4d2fdb9690 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10462_TemperARustingBlade/Q10462_TemperARustingBlade.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10462_TemperARustingBlade/Q10462_TemperARustingBlade.java
@@ -56,7 +56,7 @@ public class Q10462_TemperARustingBlade extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10465_SoulFrostSword/Q10465_SoulFrostSword.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10465_SoulFrostSword/Q10465_SoulFrostSword.java
index c5e88e36f4..3cdb6e09b2 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10465_SoulFrostSword/Q10465_SoulFrostSword.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10465_SoulFrostSword/Q10465_SoulFrostSword.java
@@ -52,7 +52,7 @@ public class Q10465_SoulFrostSword extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10472_WindsOfFateEncroachingShadows/Q10472_WindsOfFateEncroachingShadows.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10472_WindsOfFateEncroachingShadows/Q10472_WindsOfFateEncroachingShadows.java
index c4e70d36b7..a4733734be 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10472_WindsOfFateEncroachingShadows/Q10472_WindsOfFateEncroachingShadows.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10472_WindsOfFateEncroachingShadows/Q10472_WindsOfFateEncroachingShadows.java
@@ -109,7 +109,7 @@ public class Q10472_WindsOfFateEncroachingShadows extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
index bacbb7058b..ad79a5980b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
@@ -73,7 +73,7 @@ public class Q10501_ZakenEmbroideredSoulCloak extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (player.getLevel() >= MIN_LEVEL) && event.equals("32612-04.html"))
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
index d1678a7601..38f4514197 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
@@ -73,7 +73,7 @@ public class Q10502_FreyaEmbroideredSoulCloak extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (player.getLevel() >= MIN_LEVEL) && event.equals("32612-04.html"))
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
index 224940ecd9..08aa62d532 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
@@ -74,7 +74,7 @@ public class Q10503_FrintezzaEmbroideredSoulCloak extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (player.getLevel() >= MIN_LEVEL) && event.equals("32612-04.html"))
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java
index b150a02b38..d81d398014 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java
@@ -66,7 +66,7 @@ public class Q10504_JewelOfAntharas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java
index 0c9360d9b7..e598298776 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java
@@ -66,7 +66,7 @@ public class Q10505_JewelOfValakas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java
index e0639edb57..ab717c3cf8 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java
@@ -59,7 +59,7 @@ public class Q10521_QueenNavarisLetterVarkaSilenosBarracks extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10522_TheDarkSecretOfVarkaSilenos/Q10522_TheDarkSecretOfVarkaSilenos.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10522_TheDarkSecretOfVarkaSilenos/Q10522_TheDarkSecretOfVarkaSilenos.java
index 703a1ac8bc..9564458b27 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10522_TheDarkSecretOfVarkaSilenos/Q10522_TheDarkSecretOfVarkaSilenos.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10522_TheDarkSecretOfVarkaSilenos/Q10522_TheDarkSecretOfVarkaSilenos.java
@@ -73,7 +73,7 @@ public class Q10522_TheDarkSecretOfVarkaSilenos extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10523_TheAssassinationOfTheVarkaSilenosCommander/Q10523_TheAssassinationOfTheVarkaSilenosCommander.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10523_TheAssassinationOfTheVarkaSilenosCommander/Q10523_TheAssassinationOfTheVarkaSilenosCommander.java
index bc88c09827..66a58918c5 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10523_TheAssassinationOfTheVarkaSilenosCommander/Q10523_TheAssassinationOfTheVarkaSilenosCommander.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10523_TheAssassinationOfTheVarkaSilenosCommander/Q10523_TheAssassinationOfTheVarkaSilenosCommander.java
@@ -55,7 +55,7 @@ public class Q10523_TheAssassinationOfTheVarkaSilenosCommander extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief.java
index 73761de539..f501b9bbee 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief.java
@@ -58,7 +58,7 @@ public class Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief extends Ques
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10525_QueenNavarisLetterKetraOrcOutpost/Q10525_QueenNavarisLetterKetraOrcOutpost.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10525_QueenNavarisLetterKetraOrcOutpost/Q10525_QueenNavarisLetterKetraOrcOutpost.java
index 46a7f23edc..65507c0cc1 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10525_QueenNavarisLetterKetraOrcOutpost/Q10525_QueenNavarisLetterKetraOrcOutpost.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10525_QueenNavarisLetterKetraOrcOutpost/Q10525_QueenNavarisLetterKetraOrcOutpost.java
@@ -58,7 +58,7 @@ public class Q10525_QueenNavarisLetterKetraOrcOutpost extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10526_TheDarkSecretOfTheKetraOrcs/Q10526_TheDarkSecretOfTheKetraOrcs.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10526_TheDarkSecretOfTheKetraOrcs/Q10526_TheDarkSecretOfTheKetraOrcs.java
index 95b5d6c43d..038e8661b8 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10526_TheDarkSecretOfTheKetraOrcs/Q10526_TheDarkSecretOfTheKetraOrcs.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10526_TheDarkSecretOfTheKetraOrcs/Q10526_TheDarkSecretOfTheKetraOrcs.java
@@ -78,7 +78,7 @@ public class Q10526_TheDarkSecretOfTheKetraOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10527_TheAssassinationOfTheKetraOrcCommander/Q10527_TheAssassinationOfTheKetraOrcCommander.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10527_TheAssassinationOfTheKetraOrcCommander/Q10527_TheAssassinationOfTheKetraOrcCommander.java
index 7cca4304fb..16beb3437e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10527_TheAssassinationOfTheKetraOrcCommander/Q10527_TheAssassinationOfTheKetraOrcCommander.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10527_TheAssassinationOfTheKetraOrcCommander/Q10527_TheAssassinationOfTheKetraOrcCommander.java
@@ -56,7 +56,7 @@ public class Q10527_TheAssassinationOfTheKetraOrcCommander extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10528_TheAssassinationOfTheKetraOrcChief/Q10528_TheAssassinationOfTheKetraOrcChief.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10528_TheAssassinationOfTheKetraOrcChief/Q10528_TheAssassinationOfTheKetraOrcChief.java
index 02307626f3..713ac08316 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10528_TheAssassinationOfTheKetraOrcChief/Q10528_TheAssassinationOfTheKetraOrcChief.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10528_TheAssassinationOfTheKetraOrcChief/Q10528_TheAssassinationOfTheKetraOrcChief.java
@@ -59,7 +59,7 @@ public class Q10528_TheAssassinationOfTheKetraOrcChief extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10530_KekropusLetterTheDragonsTransition/Q10530_KekropusLetterTheDragonsTransition.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10530_KekropusLetterTheDragonsTransition/Q10530_KekropusLetterTheDragonsTransition.java
index bf96758064..52178a9817 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10530_KekropusLetterTheDragonsTransition/Q10530_KekropusLetterTheDragonsTransition.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10530_KekropusLetterTheDragonsTransition/Q10530_KekropusLetterTheDragonsTransition.java
@@ -61,7 +61,7 @@ public class Q10530_KekropusLetterTheDragonsTransition extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10531_OddHappeningsAtDragonValley/Q10531_OddHappeningsAtDragonValley.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10531_OddHappeningsAtDragonValley/Q10531_OddHappeningsAtDragonValley.java
index 0b6cb61f4c..b366a824aa 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10531_OddHappeningsAtDragonValley/Q10531_OddHappeningsAtDragonValley.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10531_OddHappeningsAtDragonValley/Q10531_OddHappeningsAtDragonValley.java
@@ -72,7 +72,7 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java
index f8f9d1af2c..c67fbd555d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java
@@ -68,7 +68,7 @@ public class Q10532_UncoveringTheConspiracy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10534_HatchlingResearch/Q10534_HatchlingResearch.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10534_HatchlingResearch/Q10534_HatchlingResearch.java
index ca8ea7ebfa..32a839c147 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10534_HatchlingResearch/Q10534_HatchlingResearch.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10534_HatchlingResearch/Q10534_HatchlingResearch.java
@@ -52,7 +52,7 @@ public class Q10534_HatchlingResearch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10537_KamaelDisarray/Q10537_KamaelDisarray.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10537_KamaelDisarray/Q10537_KamaelDisarray.java
index 3f641802c2..63def42cfb 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10537_KamaelDisarray/Q10537_KamaelDisarray.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10537_KamaelDisarray/Q10537_KamaelDisarray.java
@@ -82,7 +82,7 @@ public class Q10537_KamaelDisarray extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10538_GiantsEvolution/Q10538_GiantsEvolution.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10538_GiantsEvolution/Q10538_GiantsEvolution.java
index f237fe9262..5b4da4cac7 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10538_GiantsEvolution/Q10538_GiantsEvolution.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10538_GiantsEvolution/Q10538_GiantsEvolution.java
@@ -60,7 +60,7 @@ public class Q10538_GiantsEvolution extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10539_EnergySupplyCutoffPlan/Q10539_EnergySupplyCutoffPlan.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10539_EnergySupplyCutoffPlan/Q10539_EnergySupplyCutoffPlan.java
index f97a6b1c21..4be23c454e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10539_EnergySupplyCutoffPlan/Q10539_EnergySupplyCutoffPlan.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10539_EnergySupplyCutoffPlan/Q10539_EnergySupplyCutoffPlan.java
@@ -61,7 +61,7 @@ public class Q10539_EnergySupplyCutoffPlan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10540_ThwartingMimirsPlan/Q10540_ThwartingMimirsPlan.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10540_ThwartingMimirsPlan/Q10540_ThwartingMimirsPlan.java
index aa8e864fb4..6462015e4a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10540_ThwartingMimirsPlan/Q10540_ThwartingMimirsPlan.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10540_ThwartingMimirsPlan/Q10540_ThwartingMimirsPlan.java
@@ -49,7 +49,7 @@ public class Q10540_ThwartingMimirsPlan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java
index bda659ba08..1b69a7359f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java
@@ -78,7 +78,7 @@ public class Q10541_TrainLikeTheRealThing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java
index 6ed762a459..36c84dbc26 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java
@@ -64,7 +64,7 @@ public class Q10542_SearchingForNewPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java
index 8890107015..626e44166f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java
@@ -61,7 +61,7 @@ public class Q10543_SheddingWeight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10544_SeekerSupplies/Q10544_SeekerSupplies.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10544_SeekerSupplies/Q10544_SeekerSupplies.java
index 3c2f520f5b..02fcd6edca 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10544_SeekerSupplies/Q10544_SeekerSupplies.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10544_SeekerSupplies/Q10544_SeekerSupplies.java
@@ -71,7 +71,7 @@ public class Q10544_SeekerSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/Q10658_MakkumInTheDimension.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/Q10658_MakkumInTheDimension.java
index 4345dfeba7..1f1ee2e21d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/Q10658_MakkumInTheDimension.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/Q10658_MakkumInTheDimension.java
@@ -50,7 +50,7 @@ public class Q10658_MakkumInTheDimension extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java
index 593c0d4936..e2bb80f5e5 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java
@@ -46,7 +46,7 @@ public class Q10701_TheRoadToDestruction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java
index 1ede0c4ba5..ba1153cd88 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java
@@ -46,7 +46,7 @@ public class Q10702_TheRoadToInfinity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java
index 2ee25d6af7..253b12cda4 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java
@@ -48,7 +48,7 @@ public class Q10703_BottleOfIstinasSoul extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java
index 23bae467b4..9e799c2fcb 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java
@@ -48,7 +48,7 @@ public class Q10704_BottleOfOctavisSoul extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java
index 94c10b561b..4c8ae1432b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java
@@ -48,7 +48,7 @@ public class Q10705_BottleOfTautisSoul extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java
index 331cc791c9..b9bbf6f7a1 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java
@@ -62,7 +62,7 @@ public class Q10707_FlamesOfSorrow extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java
index 4416c7807d..c804d64c68 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java
@@ -52,7 +52,7 @@ public class Q10708_StrengthenTheBarrier extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (event.equals("activateKey"))
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10709_TheStolenSeed/Q10709_TheStolenSeed.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10709_TheStolenSeed/Q10709_TheStolenSeed.java
index 603b4e995a..2fc9af07d5 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10709_TheStolenSeed/Q10709_TheStolenSeed.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10709_TheStolenSeed/Q10709_TheStolenSeed.java
@@ -61,7 +61,7 @@ public class Q10709_TheStolenSeed extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (event.equals("action"))
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10710_LifeEnergyRepository/Q10710_LifeEnergyRepository.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10710_LifeEnergyRepository/Q10710_LifeEnergyRepository.java
index 8d8e2f2b35..62d33a8141 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10710_LifeEnergyRepository/Q10710_LifeEnergyRepository.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10710_LifeEnergyRepository/Q10710_LifeEnergyRepository.java
@@ -63,7 +63,7 @@ public class Q10710_LifeEnergyRepository extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (event.equals("action"))
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java
index e662e0d273..50a2043683 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java
@@ -46,7 +46,7 @@ public class Q10732_AForeignLand extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java
index 1949b35c17..38ed540728 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java
@@ -51,7 +51,7 @@ public class Q10733_TheTestForSurvival extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java
index 1c5fae4ba6..126a371c0b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java
@@ -68,7 +68,7 @@ public class Q10734_DoOrDie extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java
index 6d51149018..fa1ffbfa27 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java
@@ -64,7 +64,7 @@ public class Q10735_ASpecialPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("33942-02.htm"))
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java
index 0712537c40..acc37c20ee 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java
@@ -63,7 +63,7 @@ public class Q10736_ASpecialPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("33943-02.htm"))
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java
index f33149141a..b53a83826d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java
@@ -57,7 +57,7 @@ public class Q10737_GrakonsWarehouse extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java
index 18f6b4c6f8..f521e5f773 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java
@@ -51,7 +51,7 @@ public class Q10738_AnInnerBeauty extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java
index 4be8b937de..de9928d437 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java
@@ -65,7 +65,7 @@ public class Q10739_SupplyAndDemand extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java
index 051ea28cf9..d0313db269 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java
@@ -66,7 +66,7 @@ public class Q10740_NeverForget extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java
index 012d6a6263..fbf1a8b449 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java
@@ -57,7 +57,7 @@ public class Q10741_ADraughtForTheCold extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java
index e8c5f68163..ce6111db32 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java
@@ -62,7 +62,7 @@ public class Q10742_AFurryFriend extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java
index 51d978fd10..09456b6da9 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java
@@ -64,7 +64,7 @@ public class Q10743_StrangeFungus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java
index d81ff1fbc5..557934c425 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java
@@ -53,7 +53,7 @@ public class Q10744_StrongerThanSteel extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java
index 779a5affd6..dc292e67e4 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java
@@ -60,7 +60,7 @@ public class Q10745_TheSecretIngredients extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java
index 3774d264f0..811ce0b27c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java
@@ -57,7 +57,7 @@ public class Q10746_SeeTheWorld extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10748_MysteriousSuggestion1/Q10748_MysteriousSuggestion1.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10748_MysteriousSuggestion1/Q10748_MysteriousSuggestion1.java
index bf24739d4a..1db27a83de 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10748_MysteriousSuggestion1/Q10748_MysteriousSuggestion1.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10748_MysteriousSuggestion1/Q10748_MysteriousSuggestion1.java
@@ -54,7 +54,7 @@ public final class Q10748_MysteriousSuggestion1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10749_MysteriousSuggestion2/Q10749_MysteriousSuggestion2.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10749_MysteriousSuggestion2/Q10749_MysteriousSuggestion2.java
index 2e1b4f7932..fe683bb978 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10749_MysteriousSuggestion2/Q10749_MysteriousSuggestion2.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10749_MysteriousSuggestion2/Q10749_MysteriousSuggestion2.java
@@ -54,7 +54,7 @@ public final class Q10749_MysteriousSuggestion2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java
index 3cda144c48..f14723434f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java
@@ -98,7 +98,7 @@ public class Q10751_WindsOfFateEncounters extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java
index 6f75ff5ee7..b5d2e9720e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java
@@ -88,7 +88,7 @@ public class Q10752_WindsOfFateAPromise extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java
index 9802c626ae..8e72c775cf 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java
@@ -134,7 +134,7 @@ public class Q10753_WindsOfFateChoices extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10755_LettersFromTheQueenWindyHill/Q10755_LettersFromTheQueenWindyHill.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10755_LettersFromTheQueenWindyHill/Q10755_LettersFromTheQueenWindyHill.java
index a18e6668da..01e7d3187c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10755_LettersFromTheQueenWindyHill/Q10755_LettersFromTheQueenWindyHill.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10755_LettersFromTheQueenWindyHill/Q10755_LettersFromTheQueenWindyHill.java
@@ -55,7 +55,7 @@ public class Q10755_LettersFromTheQueenWindyHill extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java
index 54f0924c8c..9addb06f6a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java
@@ -62,7 +62,7 @@ public class Q10756_AnInterdimensionalDraft extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java
index 145db2ec08..dc432da6f6 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java
@@ -59,7 +59,7 @@ public class Q10757_QuietingTheStorm extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10758_TheOathOfTheWind/Q10758_TheOathOfTheWind.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10758_TheOathOfTheWind/Q10758_TheOathOfTheWind.java
index 3782633f40..e8dbe9f291 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10758_TheOathOfTheWind/Q10758_TheOathOfTheWind.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10758_TheOathOfTheWind/Q10758_TheOathOfTheWind.java
@@ -54,7 +54,7 @@ public class Q10758_TheOathOfTheWind extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10760_LettersFromTheQueenOrcBarracks/Q10760_LettersFromTheQueenOrcBarracks.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10760_LettersFromTheQueenOrcBarracks/Q10760_LettersFromTheQueenOrcBarracks.java
index a2898fc9db..6b0b9fca1e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10760_LettersFromTheQueenOrcBarracks/Q10760_LettersFromTheQueenOrcBarracks.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10760_LettersFromTheQueenOrcBarracks/Q10760_LettersFromTheQueenOrcBarracks.java
@@ -55,7 +55,7 @@ public class Q10760_LettersFromTheQueenOrcBarracks extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java
index 74e8a89490..03a6b4b178 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java
@@ -65,7 +65,7 @@ public class Q10761_AnOrcInLove extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10762_MarionetteSpirit/Q10762_MarionetteSpirit.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10762_MarionetteSpirit/Q10762_MarionetteSpirit.java
index 0279f9aef0..ac750884a2 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10762_MarionetteSpirit/Q10762_MarionetteSpirit.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10762_MarionetteSpirit/Q10762_MarionetteSpirit.java
@@ -55,7 +55,7 @@ public class Q10762_MarionetteSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java
index 6bc6ed9b18..eb9e67177a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java
@@ -54,7 +54,7 @@ public class Q10763_TerrifyingChertuba extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java
index 54e982a6cd..dead250e0c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java
@@ -62,7 +62,7 @@ public class Q10764_FreeSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10766_ANewCraft/Q10766_ANewCraft.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10766_ANewCraft/Q10766_ANewCraft.java
index c9bc545a1a..708268cf05 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10766_ANewCraft/Q10766_ANewCraft.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10766_ANewCraft/Q10766_ANewCraft.java
@@ -63,7 +63,7 @@ public class Q10766_ANewCraft extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java
index 6fb43e4cd6..a82c8271e6 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java
@@ -60,7 +60,7 @@ public class Q10767_AWholeNewLevelOfAlchemy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10769_LettersFromTheQueenCrumaTowerPart1/Q10769_LettersFromTheQueenCrumaTowerPart1.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10769_LettersFromTheQueenCrumaTowerPart1/Q10769_LettersFromTheQueenCrumaTowerPart1.java
index 4b95d82775..23f3075922 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10769_LettersFromTheQueenCrumaTowerPart1/Q10769_LettersFromTheQueenCrumaTowerPart1.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10769_LettersFromTheQueenCrumaTowerPart1/Q10769_LettersFromTheQueenCrumaTowerPart1.java
@@ -57,7 +57,7 @@ public class Q10769_LettersFromTheQueenCrumaTowerPart1 extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java
index 11ac5492a7..9b878bd1a3 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java
@@ -60,7 +60,7 @@ public class Q10770_InSearchOfTheGrail extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java
index 4fe64a9f90..73772df5d2 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java
@@ -59,7 +59,7 @@ public class Q10771_VolatilePower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java
index a50cba337e..ebffb6b105 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java
@@ -58,7 +58,7 @@ public class Q10772_ReportsFromCrumaTowerPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java
index b41ae7982f..fc92f66796 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java
@@ -55,7 +55,7 @@ public class Q10774_LettersFromTheQueenCrumaTowerPart2 extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java
index 9d8bfdd905..7776d3ba24 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java
@@ -63,7 +63,7 @@ public class Q10775_InSearchOfAnAncientGiant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java
index b478cf4b28..066e5d1c57 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java
@@ -69,7 +69,7 @@ public class Q10776_TheWrathOfTheGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java
index a4a45eac5e..b2abbf2973 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java
@@ -58,7 +58,7 @@ public class Q10777_ReportsFromCrumaTowerPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10779_LettersFromTheQueenSeaOfSpores/Q10779_LettersFromTheQueenSeaOfSpores.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10779_LettersFromTheQueenSeaOfSpores/Q10779_LettersFromTheQueenSeaOfSpores.java
index ead65c1be8..943577fdd2 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10779_LettersFromTheQueenSeaOfSpores/Q10779_LettersFromTheQueenSeaOfSpores.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10779_LettersFromTheQueenSeaOfSpores/Q10779_LettersFromTheQueenSeaOfSpores.java
@@ -55,7 +55,7 @@ public class Q10779_LettersFromTheQueenSeaOfSpores extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java
index 8748c7c7f9..b3d2f0c99a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java
@@ -64,7 +64,7 @@ public class Q10780_AWeakenedBarrier extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10781_IngredientsToEnforcements/Q10781_IngredientsToEnforcements.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10781_IngredientsToEnforcements/Q10781_IngredientsToEnforcements.java
index 911dd56221..cb8ee37442 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10781_IngredientsToEnforcements/Q10781_IngredientsToEnforcements.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10781_IngredientsToEnforcements/Q10781_IngredientsToEnforcements.java
@@ -60,7 +60,7 @@ public class Q10781_IngredientsToEnforcements extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java
index b8545acff6..9fcd1b0d1b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java
@@ -55,7 +55,7 @@ public class Q10782_LettersFromTheQueenForsakenPlains extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java
index e139190757..913846a551 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java
@@ -78,7 +78,7 @@ public class Q10783_TracesOfAnAmbush extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java
index 0c281d9f3d..27e9b309e3 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java
@@ -66,7 +66,7 @@ public class Q10784_TheBrokenDevice extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java
index 6aedda431e..9bf857c817 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java
@@ -55,7 +55,7 @@ public class Q10785_LettersFromTheQueenFieldsOfMassacre extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java
index e4aeb0a6c5..2a4efba6af 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java
@@ -72,7 +72,7 @@ public class Q10786_ResidentProblemSolver extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java
index a7cb5255a2..9e9e5ca51c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java
@@ -57,7 +57,7 @@ public class Q10787_ASpyMission extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java
index e38be23d02..ea00924d78 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java
@@ -55,7 +55,7 @@ public class Q10789_LettersFromTheQueenSwampOfScreams extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java
index afdcde07a8..33df51f29a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java
@@ -73,7 +73,7 @@ public class Q10790_AMercenaryHelper extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java
index 2feff9b2af..d2c915008b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java
@@ -64,7 +64,7 @@ public class Q10791_TheManOfMystery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java
index 96ef17fc8e..e9b50abf68 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java
@@ -55,7 +55,7 @@ public class Q10792_LettersFromTheQueenForestOfTheDead extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java
index b4aed022a7..353be489ac 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java
@@ -70,7 +70,7 @@ public class Q10793_SaveTheSouls extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java
index 0b66df0e5c..97425eba70 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java
@@ -94,7 +94,7 @@ public class Q10794_InvestigateTheForest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java
index 45f84f0d03..760cb95201 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java
@@ -40,7 +40,7 @@ public class Q10795_LettersFromTheQueenWallOfAgros extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java
index 26b6a34591..29464f9357 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java
@@ -66,7 +66,7 @@ public class Q10796_TheEyeThatDefiedTheGods extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
index 95fb61323c..34b86f9dc1 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
@@ -71,7 +71,7 @@ public class Q10797_CrossingFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java
index c165abd9ae..e33e81f767 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java
@@ -56,7 +56,7 @@ public class Q10798_LettersFromTheQueenDragonValley extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java
index 092c19afb8..21165874a3 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java
@@ -69,7 +69,7 @@ public class Q10799_StrangeThingsAfootInTheValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java
index 6355ffa405..b72f3e4a66 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java
@@ -69,7 +69,7 @@ public class Q10800_ReconnaissanceAtDragonValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
index b1dca4d5b3..15fc371c1a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
@@ -55,7 +55,7 @@ public class Q10801_TheDimensionalWarpPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
index 1339720830..1b0c8d74d0 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
@@ -56,7 +56,7 @@ public class Q10802_TheDimensionalWarpPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
index 117f5cc53e..4cae513e93 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
@@ -57,7 +57,7 @@ public class Q10803_TheDimensionalWarpPart3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
index 124823783a..f16e276a8f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
@@ -57,7 +57,7 @@ public class Q10804_TheDimensionalWarpPart4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
index a6796e0c63..b80b2b6ae5 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
@@ -57,7 +57,7 @@ public class Q10805_TheDimensionalWarpPart5 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
index d6ecba6b8e..5a8d67d930 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
@@ -56,7 +56,7 @@ public class Q10806_TheDimensionalWarpPart6 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
index 12462309a1..393bbe074c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
@@ -56,7 +56,7 @@ public class Q10807_TheDimensionalWarpPart7 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
index df74301aed..67b8bcfb10 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
@@ -55,7 +55,7 @@ public class Q10811_ExaltedOneWhoFacesTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java
index 21c4b65b62..e9c6af4628 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java
@@ -113,7 +113,7 @@ public class Q10812_FacingSadness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10813_ForGlory/Q10813_ForGlory.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10813_ForGlory/Q10813_ForGlory.java
index 76fd620dde..89b572a2cc 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10813_ForGlory/Q10813_ForGlory.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10813_ForGlory/Q10813_ForGlory.java
@@ -58,7 +58,7 @@ public class Q10813_ForGlory extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java
index e487e06324..f583c8098b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java
@@ -75,7 +75,7 @@ public class Q10814_BefittingOfTheStatus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java
index e389fbdfcc..7f9ac0bd7d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java
@@ -66,7 +66,7 @@ public class Q10815_StepUp extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
index d508360581..d7790a8516 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
@@ -57,7 +57,7 @@ public class Q10817_ExaltedOneWhoOvercomesTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java
index 22cbb61194..0f898acae0 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java
@@ -64,7 +64,7 @@ public class Q10818_ConfrontingAGiantMonster extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10819_ForHonor/Q10819_ForHonor.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10819_ForHonor/Q10819_ForHonor.java
index d3d25867b9..250f860227 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10819_ForHonor/Q10819_ForHonor.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10819_ForHonor/Q10819_ForHonor.java
@@ -62,7 +62,7 @@ public class Q10819_ForHonor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10820_RelationshipsBefittingOfTheStatus/Q10820_RelationshipsBefittingOfTheStatus.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10820_RelationshipsBefittingOfTheStatus/Q10820_RelationshipsBefittingOfTheStatus.java
index d23b38f64a..126444e4a6 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10820_RelationshipsBefittingOfTheStatus/Q10820_RelationshipsBefittingOfTheStatus.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10820_RelationshipsBefittingOfTheStatus/Q10820_RelationshipsBefittingOfTheStatus.java
@@ -58,7 +58,7 @@ public class Q10820_RelationshipsBefittingOfTheStatus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10821_HelpingOthers/Q10821_HelpingOthers.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10821_HelpingOthers/Q10821_HelpingOthers.java
index 0ad084443b..bdbb8b5edb 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10821_HelpingOthers/Q10821_HelpingOthers.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10821_HelpingOthers/Q10821_HelpingOthers.java
@@ -55,7 +55,7 @@ public class Q10821_HelpingOthers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
index 783687b68a..068d0313dd 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
@@ -59,7 +59,7 @@ public class Q10823_ExaltedOneWhoShattersTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java
index 68dd1f489a..b9d8b3ecb3 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java
@@ -55,7 +55,7 @@ public class Q10824_ConfrontingTheGreatestDanger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java
index d9982218ab..f62d1ec44d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java
@@ -61,7 +61,7 @@ public class Q10825_ForVictory extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10826_LuckBefittingOfTheStatus/Q10826_LuckBefittingOfTheStatus.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10826_LuckBefittingOfTheStatus/Q10826_LuckBefittingOfTheStatus.java
index 5a01415cd2..9a969561c5 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10826_LuckBefittingOfTheStatus/Q10826_LuckBefittingOfTheStatus.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10826_LuckBefittingOfTheStatus/Q10826_LuckBefittingOfTheStatus.java
@@ -76,7 +76,7 @@ public class Q10826_LuckBefittingOfTheStatus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10827_StepUpToLead/Q10827_StepUpToLead.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10827_StepUpToLead/Q10827_StepUpToLead.java
index 35fcab2537..73a3168454 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10827_StepUpToLead/Q10827_StepUpToLead.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10827_StepUpToLead/Q10827_StepUpToLead.java
@@ -58,7 +58,7 @@ public class Q10827_StepUpToLead extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10829_InSearchOfTheCause/Q10829_InSearchOfTheCause.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10829_InSearchOfTheCause/Q10829_InSearchOfTheCause.java
index 8f4b8ea015..8d961007e0 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10829_InSearchOfTheCause/Q10829_InSearchOfTheCause.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10829_InSearchOfTheCause/Q10829_InSearchOfTheCause.java
@@ -49,7 +49,7 @@ public class Q10829_InSearchOfTheCause extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/Q10830_TheLostGardenOfSpirits.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/Q10830_TheLostGardenOfSpirits.java
index f5a77a8c46..f1e8fcac8e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/Q10830_TheLostGardenOfSpirits.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/Q10830_TheLostGardenOfSpirits.java
@@ -63,7 +63,7 @@ public class Q10830_TheLostGardenOfSpirits extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10831_UnbelievableSight/Q10831_UnbelievableSight.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10831_UnbelievableSight/Q10831_UnbelievableSight.java
index 292e487dbb..09e8f8bffb 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10831_UnbelievableSight/Q10831_UnbelievableSight.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10831_UnbelievableSight/Q10831_UnbelievableSight.java
@@ -64,7 +64,7 @@ public class Q10831_UnbelievableSight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10832_EnergyOfSadnessAndAnger/Q10832_EnergyOfSadnessAndAnger.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10832_EnergyOfSadnessAndAnger/Q10832_EnergyOfSadnessAndAnger.java
index c3ba629f61..69125c3c8e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10832_EnergyOfSadnessAndAnger/Q10832_EnergyOfSadnessAndAnger.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10832_EnergyOfSadnessAndAnger/Q10832_EnergyOfSadnessAndAnger.java
@@ -79,7 +79,7 @@ public class Q10832_EnergyOfSadnessAndAnger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10833_PutTheQueenOfSpiritsToSleep/Q10833_PutTheQueenOfSpiritsToSleep.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10833_PutTheQueenOfSpiritsToSleep/Q10833_PutTheQueenOfSpiritsToSleep.java
index f139198949..0072e5d723 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10833_PutTheQueenOfSpiritsToSleep/Q10833_PutTheQueenOfSpiritsToSleep.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10833_PutTheQueenOfSpiritsToSleep/Q10833_PutTheQueenOfSpiritsToSleep.java
@@ -56,7 +56,7 @@ public class Q10833_PutTheQueenOfSpiritsToSleep extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10836_DisappearedClanMember/Q10836_DisappearedClanMember.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10836_DisappearedClanMember/Q10836_DisappearedClanMember.java
index 3b3f852c70..3230d13891 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10836_DisappearedClanMember/Q10836_DisappearedClanMember.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10836_DisappearedClanMember/Q10836_DisappearedClanMember.java
@@ -59,7 +59,7 @@ public class Q10836_DisappearedClanMember extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10837_LookingForTheBlackbirdClanMember/Q10837_LookingForTheBlackbirdClanMember.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10837_LookingForTheBlackbirdClanMember/Q10837_LookingForTheBlackbirdClanMember.java
index 217cabf9fb..a83cf4e3fa 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10837_LookingForTheBlackbirdClanMember/Q10837_LookingForTheBlackbirdClanMember.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10837_LookingForTheBlackbirdClanMember/Q10837_LookingForTheBlackbirdClanMember.java
@@ -54,7 +54,7 @@ public class Q10837_LookingForTheBlackbirdClanMember extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java
index 2ef2a3e32e..6b0de70720 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java
@@ -64,7 +64,7 @@ public class Q10838_TheReasonForNotBeingAbleToGetOut extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java
index 248d9275e5..c4ba15bb8f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java
@@ -61,7 +61,7 @@ public class Q10839_BlackbirdsNameValue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java
index 218f86f996..1a12c524a9 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java
@@ -63,7 +63,7 @@ public class Q10840_TimeToRecover extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java
index 8cf3b7506e..cae50c4972 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java
@@ -53,7 +53,7 @@ public class Q10841_DeepInsideAteliaFortress extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10843_AnomalyInTheEnchantedValley/Q10843_AnomalyInTheEnchantedValley.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10843_AnomalyInTheEnchantedValley/Q10843_AnomalyInTheEnchantedValley.java
index e1712c2ba9..ae707e925f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10843_AnomalyInTheEnchantedValley/Q10843_AnomalyInTheEnchantedValley.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10843_AnomalyInTheEnchantedValley/Q10843_AnomalyInTheEnchantedValley.java
@@ -48,7 +48,7 @@ public class Q10843_AnomalyInTheEnchantedValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10844_BloodyBattleSeizingSupplies/Q10844_BloodyBattleSeizingSupplies.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10844_BloodyBattleSeizingSupplies/Q10844_BloodyBattleSeizingSupplies.java
index 3a18492bfa..95e9f265f1 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10844_BloodyBattleSeizingSupplies/Q10844_BloodyBattleSeizingSupplies.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10844_BloodyBattleSeizingSupplies/Q10844_BloodyBattleSeizingSupplies.java
@@ -56,7 +56,7 @@ public class Q10844_BloodyBattleSeizingSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10845_BloodyBattleRescueTheSmiths/Q10845_BloodyBattleRescueTheSmiths.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10845_BloodyBattleRescueTheSmiths/Q10845_BloodyBattleRescueTheSmiths.java
index 262fbdc4b5..632574f511 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10845_BloodyBattleRescueTheSmiths/Q10845_BloodyBattleRescueTheSmiths.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10845_BloodyBattleRescueTheSmiths/Q10845_BloodyBattleRescueTheSmiths.java
@@ -62,7 +62,7 @@ public final class Q10845_BloodyBattleRescueTheSmiths extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = event;
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10846_BloodyBattleMeetingTheCommander/Q10846_BloodyBattleMeetingTheCommander.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10846_BloodyBattleMeetingTheCommander/Q10846_BloodyBattleMeetingTheCommander.java
index 6a229188da..e3d0e59e43 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10846_BloodyBattleMeetingTheCommander/Q10846_BloodyBattleMeetingTheCommander.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10846_BloodyBattleMeetingTheCommander/Q10846_BloodyBattleMeetingTheCommander.java
@@ -53,7 +53,7 @@ public class Q10846_BloodyBattleMeetingTheCommander extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10848_TrialsBeforeTheBattle/Q10848_TrialsBeforeTheBattle.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10848_TrialsBeforeTheBattle/Q10848_TrialsBeforeTheBattle.java
index 868ecb9bdc..cad927beb2 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10848_TrialsBeforeTheBattle/Q10848_TrialsBeforeTheBattle.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10848_TrialsBeforeTheBattle/Q10848_TrialsBeforeTheBattle.java
@@ -58,7 +58,7 @@ public final class Q10848_TrialsBeforeTheBattle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10849_TrialsForAdaptation/Q10849_TrialsForAdaptation.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10849_TrialsForAdaptation/Q10849_TrialsForAdaptation.java
index 8f77ff4caf..437e5c9a8e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10849_TrialsForAdaptation/Q10849_TrialsForAdaptation.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10849_TrialsForAdaptation/Q10849_TrialsForAdaptation.java
@@ -76,7 +76,7 @@ public class Q10849_TrialsForAdaptation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10851_ElvenBotany/Q10851_ElvenBotany.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10851_ElvenBotany/Q10851_ElvenBotany.java
index d22f5130b5..e74becd0de 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10851_ElvenBotany/Q10851_ElvenBotany.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10851_ElvenBotany/Q10851_ElvenBotany.java
@@ -58,7 +58,7 @@ public class Q10851_ElvenBotany extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10852_TheMotherTreeRevivalProject/Q10852_TheMotherTreeRevivalProject.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10852_TheMotherTreeRevivalProject/Q10852_TheMotherTreeRevivalProject.java
index 650f2a8248..ea67637b49 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10852_TheMotherTreeRevivalProject/Q10852_TheMotherTreeRevivalProject.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10852_TheMotherTreeRevivalProject/Q10852_TheMotherTreeRevivalProject.java
@@ -82,7 +82,7 @@ public class Q10852_TheMotherTreeRevivalProject extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10853_ToWeakenTheGiants/Q10853_ToWeakenTheGiants.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10853_ToWeakenTheGiants/Q10853_ToWeakenTheGiants.java
index d631d47348..70eddc1c55 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10853_ToWeakenTheGiants/Q10853_ToWeakenTheGiants.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10853_ToWeakenTheGiants/Q10853_ToWeakenTheGiants.java
@@ -60,7 +60,7 @@ public final class Q10853_ToWeakenTheGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10854_ToSeizeTheFortress/Q10854_ToSeizeTheFortress.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10854_ToSeizeTheFortress/Q10854_ToSeizeTheFortress.java
index 0f131cd3d9..dbdc97fc8b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10854_ToSeizeTheFortress/Q10854_ToSeizeTheFortress.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10854_ToSeizeTheFortress/Q10854_ToSeizeTheFortress.java
@@ -77,7 +77,7 @@ public final class Q10854_ToSeizeTheFortress extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = event;
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10856_SuperionAppears/Q10856_SuperionAppears.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10856_SuperionAppears/Q10856_SuperionAppears.java
index 6beea62bcf..37c5a21afe 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10856_SuperionAppears/Q10856_SuperionAppears.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10856_SuperionAppears/Q10856_SuperionAppears.java
@@ -45,7 +45,7 @@ public class Q10856_SuperionAppears extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10857_SecretTeleport/Q10857_SecretTeleport.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10857_SecretTeleport/Q10857_SecretTeleport.java
index 80fce78d5e..8db2ad22a1 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10857_SecretTeleport/Q10857_SecretTeleport.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10857_SecretTeleport/Q10857_SecretTeleport.java
@@ -69,7 +69,7 @@ public class Q10857_SecretTeleport extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10858_QueenRamonaControllerOfTheVessel/Q10858_QueenRamonaControllerOfTheVessel.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10858_QueenRamonaControllerOfTheVessel/Q10858_QueenRamonaControllerOfTheVessel.java
index 8343b8e737..6adf4b1901 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10858_QueenRamonaControllerOfTheVessel/Q10858_QueenRamonaControllerOfTheVessel.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10858_QueenRamonaControllerOfTheVessel/Q10858_QueenRamonaControllerOfTheVessel.java
@@ -50,7 +50,7 @@ public class Q10858_QueenRamonaControllerOfTheVessel extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10859_OwnTheEarthAndTheHeavens/Q10859_OwnTheEarthAndTheHeavens.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10859_OwnTheEarthAndTheHeavens/Q10859_OwnTheEarthAndTheHeavens.java
index d4ac9e202b..f5e36c2340 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10859_OwnTheEarthAndTheHeavens/Q10859_OwnTheEarthAndTheHeavens.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10859_OwnTheEarthAndTheHeavens/Q10859_OwnTheEarthAndTheHeavens.java
@@ -50,7 +50,7 @@ public class Q10859_OwnTheEarthAndTheHeavens extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
index 9fbdc244ba..88771cce29 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
@@ -57,7 +57,7 @@ public class Q10873_ExaltedReachingAnotherLevel extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10874_AgainstTheNewEnemy/Q10874_AgainstTheNewEnemy.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10874_AgainstTheNewEnemy/Q10874_AgainstTheNewEnemy.java
index 3e4007dfe2..62cde0f803 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10874_AgainstTheNewEnemy/Q10874_AgainstTheNewEnemy.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10874_AgainstTheNewEnemy/Q10874_AgainstTheNewEnemy.java
@@ -103,7 +103,7 @@ public class Q10874_AgainstTheNewEnemy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10875_ForReputation/Q10875_ForReputation.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10875_ForReputation/Q10875_ForReputation.java
index f022445f8b..c4c5405e4a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10875_ForReputation/Q10875_ForReputation.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10875_ForReputation/Q10875_ForReputation.java
@@ -53,7 +53,7 @@ public class Q10875_ForReputation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10876_LeadersGrace/Q10876_LeadersGrace.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10876_LeadersGrace/Q10876_LeadersGrace.java
index 05cb70e278..db3a2b2c73 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10876_LeadersGrace/Q10876_LeadersGrace.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10876_LeadersGrace/Q10876_LeadersGrace.java
@@ -56,7 +56,7 @@ public class Q10876_LeadersGrace extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10877_BreakThroughCrisis/Q10877_BreakThroughCrisis.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10877_BreakThroughCrisis/Q10877_BreakThroughCrisis.java
index 8f0c4a3231..929436212f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10877_BreakThroughCrisis/Q10877_BreakThroughCrisis.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10877_BreakThroughCrisis/Q10877_BreakThroughCrisis.java
@@ -59,7 +59,7 @@ public class Q10877_BreakThroughCrisis extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java
index 9fa54a275d..a291386f62 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java
@@ -57,7 +57,7 @@ public class Q10879_ExaltedGuideToPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10880_TheLastOneStanding/Q10880_TheLastOneStanding.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10880_TheLastOneStanding/Q10880_TheLastOneStanding.java
index 68863fe158..d1ec1dac1d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10880_TheLastOneStanding/Q10880_TheLastOneStanding.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10880_TheLastOneStanding/Q10880_TheLastOneStanding.java
@@ -106,7 +106,7 @@ public class Q10880_TheLastOneStanding extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10881_ForThePride/Q10881_ForThePride.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10881_ForThePride/Q10881_ForThePride.java
index 60f565fe71..c3ccdaa708 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10881_ForThePride/Q10881_ForThePride.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10881_ForThePride/Q10881_ForThePride.java
@@ -56,7 +56,7 @@ public class Q10881_ForThePride extends Quest
 	private static final int MIN_LEVEL = 104;
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10882_VictoryCollection/Q10882_VictoryCollection.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10882_VictoryCollection/Q10882_VictoryCollection.java
index 0b64afccd2..8ae5ea873e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10882_VictoryCollection/Q10882_VictoryCollection.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10882_VictoryCollection/Q10882_VictoryCollection.java
@@ -78,7 +78,7 @@ public class Q10882_VictoryCollection extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10883_ImmortalHonor/Q10883_ImmortalHonor.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10883_ImmortalHonor/Q10883_ImmortalHonor.java
index ba80484f13..3bb1ae6dd2 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10883_ImmortalHonor/Q10883_ImmortalHonor.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10883_ImmortalHonor/Q10883_ImmortalHonor.java
@@ -57,7 +57,7 @@ public class Q10883_ImmortalHonor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/ThirdClassTransferQuest.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
index b230b12a5b..e0ee0b931a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
@@ -133,7 +133,7 @@ public abstract class ThirdClassTransferQuest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/vehicles/AirShipController.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/vehicles/AirShipController.java
index 682f3b238b..ee534c5f04 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/vehicles/AirShipController.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/vehicles/AirShipController.java
@@ -117,7 +117,7 @@ public abstract class AirShipController extends AbstractNpcAI
 	private static final SystemMessage SM_NEED_MORE = new SystemMessage(SystemMessageId.AN_AIRSHIP_CANNOT_BE_SUMMONED_BECAUSE_YOU_DON_T_HAVE_ENOUGH_S1).addItemName(STARSTONE);
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("summon".equalsIgnoreCase(event))
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
index a1ff9f0e0a..c5dc6f515f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
@@ -162,7 +162,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player.isTransformed())
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
index 7ff39fb0c0..8675a7ec2c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
@@ -51,7 +51,7 @@ public class AllianceMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!"9001-01.htm".equals(event) && (player.getClan() == null))
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
index 58c0e304f2..20648ef643 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
@@ -80,7 +80,7 @@ public class ClanMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LEADER_REQUIRED.containsKey(event) && !player.isClanLeader())
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/Quest.java
index 270725d319..09e6c336cc 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/Quest.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/Quest.java
@@ -247,7 +247,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -269,7 +269,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -560,7 +560,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 			{
 				player.setSimulatedTalking(false);
 			}
-			res = onAdvEvent(event, npc, player);
+			res = onEvent(event, npc, player);
 		}
 		catch (Exception e)
 		{
@@ -1038,12 +1038,11 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 */
 	public String onDeath(Creature killer, Creature victim, QuestState qs)
 	{
-		return onAdvEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
+		return onEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
 	}
 	
 	/**
 	 * This function is called whenever a player clicks on a link in a quest dialog and whenever a timer fires.<br>
-	 * If is not overridden by a subclass, then default to the returned value of the simpler (and older) {@link #onEvent(String, QuestState)} override.<br>
 	 * If the player has a quest state, use it as parameter in the next call, otherwise return null.
 	 * @param event this parameter contains a string identifier for the event.<br>
 	 *            Generally, this string is passed directly via the link.<br>
@@ -1062,35 +1061,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 *            This parameter may be {@code null} in certain circumstances.
 	 * @return the text returned by the event (may be {@code null}, a filename or just text)
 	 */
-	public String onAdvEvent(String event, Npc npc, Player player)
-	{
-		if (player != null)
-		{
-			final QuestState qs = player.getQuestState(getName());
-			if (qs != null)
-			{
-				return onEvent(event, qs);
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * This function is called in place of {@link #onAdvEvent(String, Npc, Player)} if the former is not implemented.<br>
-	 * If a script contains both {@link #onAdvEvent(String, Npc, Player)} and this implementation, then this method will never be called unless the script's {@link #onAdvEvent(String, Npc, Player)} explicitly calls this method.
-	 * @param event this parameter contains a string identifier for the event.<br>
-	 *            Generally, this string is passed directly via the link.<br>
-	 *            For example:<br>
-	 *            <code>
-	 *            &lt;a action="bypass -h Quest 626_ADarkTwilight 31517-01.htm"&gt;hello&lt;/a&gt;
-	 *            </code><br>
-	 *            The above link sets the event variable to "31517-01.htm" for the quest 626_ADarkTwilight.<br>
-	 *            In the case of timers, this will be the name of the timer.<br>
-	 *            This parameter serves as a sort of identifier.
-	 * @param qs this parameter contains a reference to the quest state of the player who used the link or started the timer.
-	 * @return the text returned by the event (may be {@code null}, a filename or just text)
-	 */
-	public String onEvent(String event, QuestState qs)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return null;
 	}
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java
index 3246831bf4..62d6ebb211 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java
@@ -47,7 +47,7 @@ public class Herphah extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java
index 235fd9d2a3..086f8aeab5 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java
@@ -47,7 +47,7 @@ public class Penny extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java
index 2ab35f83dc..6740fe6383 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java
@@ -46,7 +46,7 @@ public class Ruine extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
index e85df039b0..0ebae68471 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
@@ -73,7 +73,7 @@ public class AncientArcanCity extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CHANGE_STATE"))
 		{
@@ -107,7 +107,7 @@ public class AncientArcanCity extends AbstractNpcAI
 				cat.broadcastSocialAction(2);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
index d76c158f9e..d38ceb917e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
@@ -42,7 +42,7 @@ public class Lykus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
index 4fd3e87bb7..92979a713e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
@@ -39,7 +39,7 @@ public class Mumu extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
index 56ceed0cda..34c3cc9100 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
@@ -329,7 +329,7 @@ public class AteliaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/AteliaFortress/TeleportDevice/TeleportDevice.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/AteliaFortress/TeleportDevice/TeleportDevice.java
index 9ea87d2149..7ff361c8e1 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/AteliaFortress/TeleportDevice/TeleportDevice.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/AteliaFortress/TeleportDevice/TeleportDevice.java
@@ -45,7 +45,7 @@ public class TeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player.getFactionLevel(Faction.KINGDOM_ROYAL_GUARDS) < 3)
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
index c87c4e9224..a2a2891b57 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
@@ -56,7 +56,7 @@ public class BabyPets extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("HEAL") && (player != null))
 		{
@@ -78,7 +78,7 @@ public class BabyPets extends AbstractNpcAI
 				cancelQuestTimer("HEAL", null, player);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGOUT)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
index b0153ef5da..f0f610c8b9 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
@@ -56,7 +56,7 @@ public class ImprovedBabyPets extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player != null)
 		{
@@ -108,7 +108,7 @@ public class ImprovedBabyPets extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
index 6b4a147550..301899a76f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
@@ -42,7 +42,7 @@ public class Tunatun extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java
index f6485e07b4..2693ef7a00 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java
@@ -48,7 +48,7 @@ public class Alarm extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Player player0 = npc.getVariables().getObject("player0", Player.class);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
index a2b4810dfa..ad01bdba4a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
@@ -46,14 +46,14 @@ public class CrumaTower extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("MESSAGE") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_GO_TO_UNDERGROUND_LV_3_USING_THE_ELEVATOR_IN_THE_BACK);
 			startQuestTimer(event, 15000, npc, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
index 7cab0d9caf..9ac87f3024 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
@@ -77,7 +77,7 @@ public class FrightenedRagnaOrc extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
index ee5d44d59e..db9d7838fc 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
@@ -53,7 +53,7 @@ public class DragonVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("Spawn".equals(event))
 		{
@@ -104,7 +104,7 @@ public class DragonVortex extends AbstractNpcAI
 		{
 			npc.setScriptValue(0);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
index de54d68cf6..ce248d3f8f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
@@ -53,7 +53,7 @@ public class LairOfAntharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CHECK_HOME") && (npc != null) && !npc.isDead())
 		{
@@ -67,7 +67,7 @@ public class LairOfAntharas extends AbstractNpcAI
 				npc.broadcastPacket(new ValidateLocation(npc));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
index bf46d16542..c4e625c565 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
@@ -55,7 +55,7 @@ public class LeopardDragonHachling extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && event.equals("MOVE_TO_TRANSFORM"))
 		{
@@ -77,7 +77,7 @@ public class LeopardDragonHachling extends AbstractNpcAI
 				npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, nearestLocation(npc));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
index 04396d3683..6f794f4008 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
@@ -40,13 +40,13 @@ public class MercenaryCaptain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THE_EASTERN_PART_OF_DRAGON_VALLEY_IS_MUCH_MORE_DANGEROUS_THAN_THE_WEST_BE_CAREFUL));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
index 13dfbd313b..324120327b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
@@ -61,10 +61,10 @@ public class MercenaryTeleport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		player.teleToLocation(LOCATIONS.get(event), true);
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DragonValley/Namo.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
index 99057c816c..f21c497157 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
@@ -40,13 +40,13 @@ public class Namo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THIS_PLACE_SWARMS_WITH_DRAGONS_BY_DAY_AND_UNDEAD_BY_NIGHT));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
index 32c7beb400..c02404f76a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
@@ -40,13 +40,13 @@ public class Rakun extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THIS_PLACE_SWARMS_WITH_DRAGONS_BY_DAY_AND_UNDEAD_BY_NIGHT));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
index 349976c56b..cc5487971c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
@@ -72,7 +72,7 @@ public class SeparatedSoul extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LOCATIONS.containsKey(event))
 		{
@@ -98,7 +98,7 @@ public class SeparatedSoul extends AbstractNpcAI
 				return "no-items.htm";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java
index 2125fca0d8..870b8a5820 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java
@@ -50,7 +50,7 @@ public class Celestiel extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java
index 4cb6303606..8d927f12d2 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java
@@ -48,7 +48,7 @@ public class FlowerBud extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("spawn") && npc.isDead())
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
index 8ca5f0c7d4..a3b3d2da62 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
@@ -49,7 +49,7 @@ public class AltarOfSouls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -96,7 +96,7 @@ public class AltarOfSouls extends AbstractNpcAI
 				return "33920-9.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
index 47beace94a..c82e8969f1 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
@@ -41,7 +41,7 @@ public class RemembranceTower extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("action") && npc.isScriptValue(0))
 		{
@@ -54,7 +54,7 @@ public class RemembranceTower extends AbstractNpcAI
 			npc.setScriptValue(0);
 			npc.broadcastPacket(new OnEventTrigger(EMMITER_ID, false));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
index 39625630cd..0d3824cd68 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
@@ -60,7 +60,7 @@ public class LargeCocoon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -138,7 +138,7 @@ public class LargeCocoon extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
index d4a9137f8d..20aad104b0 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
@@ -41,7 +41,7 @@ public class KrateisCube extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
index 54f813c829..c1de7e5630 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
@@ -365,7 +365,7 @@ public class TalentShow extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((event == null) || event.isEmpty())
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
index 099500e9bb..8dea4780a1 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
@@ -41,7 +41,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -54,7 +54,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 				npc.deleteMe();
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_DAY_NIGHT_CHANGE)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
index 8029a17703..20dfae5ccf 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
@@ -88,7 +88,7 @@ public class ForgeOfTheGods extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
index ba045bd19c..39fcc5a8d7 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
@@ -84,7 +84,7 @@ public class Rooney extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport") && !npc.isDecayed())
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
index a3bc5828d9..40c8ad2e0d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
@@ -87,7 +87,7 @@ public class GainakSiege extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("GAINAK_WAR"))
 		{
@@ -129,7 +129,7 @@ public class GainakSiege extends AbstractNpcAI
 				ZoneManager.getInstance().getZoneById(GAINAK_TOWN_ZONE.getId(), PeaceZone.class).setEnabled(false);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
index 27e969e0c9..955c7ddd25 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
@@ -46,7 +46,7 @@ public class Lailly extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
index 35274b2de7..ca8919593a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
@@ -128,7 +128,7 @@ public class TavernEmployee extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
index c99c7cdf42..0ff79c4f5d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
@@ -76,7 +76,7 @@ public class Apherus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("buff"))
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
index 06a75493ac..d7944dd6f3 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
@@ -40,7 +40,7 @@ public class ApherusLookout extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		if (event.equals("open_bag"))
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
index e984558e2c..0d30623e93 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
@@ -48,7 +48,7 @@ public class GardenWatchman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -78,7 +78,7 @@ public class GardenWatchman extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
index 02b6a47091..42752aea0c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
@@ -42,7 +42,7 @@ public class GenesisVines extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CAST_SKILL") && npc.isScriptValue(1))
 		{
@@ -58,7 +58,7 @@ public class GenesisVines extends AbstractNpcAI
 			npc.setScriptValue(0);
 			npc.deleteMe();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
index 3216884d13..ab0d91e3cd 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
@@ -53,7 +53,7 @@ public class Statues extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("fight"))
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfSpirits/Belas/Belas.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfSpirits/Belas/Belas.java
index 526cfce78f..00cfa7a674 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfSpirits/Belas/Belas.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfSpirits/Belas/Belas.java
@@ -44,7 +44,7 @@ public class Belas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfSpirits/Dinford/Dinford.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfSpirits/Dinford/Dinford.java
index 6f9f40ec3c..742cc37560 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfSpirits/Dinford/Dinford.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfSpirits/Dinford/Dinford.java
@@ -46,7 +46,7 @@ public class Dinford extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java
index bdffef8294..386587cc49 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java
@@ -40,7 +40,7 @@ public class Eubina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
index 29ccfb6308..64246fbb51 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
@@ -46,7 +46,7 @@ public class FuryKiku extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -76,7 +76,7 @@ public class FuryKiku extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
index 7c2b546530..203f873b61 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
@@ -50,7 +50,7 @@ public class Isabella extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAWN"))
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java
index fab023bab3..5e9e8d3a57 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java
@@ -40,7 +40,7 @@ public class Rotoeh extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
index dc07df1c2f..a7ab45ea5e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
@@ -42,7 +42,7 @@ public class GiantsCave extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
index 50c14b79bb..20f3adf32d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
@@ -57,7 +57,7 @@ public class Kekropus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
index d4c54fcddd..9e41be2b4a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
@@ -82,7 +82,7 @@ public class Spirit extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -102,7 +102,7 @@ public class Spirit extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Heine/WrapGate.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
index eb934ee4dc..bd1d86a743 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
@@ -43,7 +43,7 @@ public class WrapGate extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("enter_hellbound".equals(event))
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java
index 245a039160..074991c7f8 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java
@@ -79,7 +79,7 @@ public class EnchantedMegaliths extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
index e49050b695..c4486b2670 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
@@ -39,7 +39,7 @@ public class LeonaBlackbird extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
index 888a2980ef..5923d188eb 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
@@ -60,7 +60,7 @@ public class Theorn extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
index e026f3cd57..5ef95aed5e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
@@ -47,7 +47,7 @@ public class Merlot extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/ImperialTomb/BloodySuccubus.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/ImperialTomb/BloodySuccubus.java
index 1f56178ded..2ab48d235a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/ImperialTomb/BloodySuccubus.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/ImperialTomb/BloodySuccubus.java
@@ -118,7 +118,7 @@ public class BloodySuccubus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
index 1879ece1c7..a69a2810f4 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
@@ -218,7 +218,7 @@ public class FourSepulchers extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
index 6ea0a0760f..14c4560f16 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
@@ -43,7 +43,7 @@ public class Zenya extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
index 2b048463f8..99e8fa6078 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
@@ -63,7 +63,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -135,7 +135,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 				npc.reduceCurrentHp(500, npc, null); // poison kills Fafurion if he is not healed
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
index 2a0a8014f8..d4dc25aab8 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
@@ -47,7 +47,7 @@ public class Rignos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -90,7 +90,7 @@ public class Rignos extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
index 43e2c64226..af4b116516 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
@@ -57,7 +57,7 @@ public class HillsOfGold extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -75,7 +75,7 @@ public class HillsOfGold extends AbstractNpcAI
 			});
 			startQuestTimer("SPICULA_AGGRO", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
index edf9416113..efaf6d6bf8 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
@@ -61,7 +61,7 @@ public class AvantGarde extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
index 37f35f00f8..ac8772d975 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
@@ -108,7 +108,7 @@ public class KetraOrcSupport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
index 6c1085f7d0..f253eadcb6 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
@@ -38,13 +38,13 @@ public class El extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_USE_THE_JUMP_BOARD_TO_GET_STRAIGHT_TO_THE_2ND_FLOOR, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
index 282d7a6326..debef79252 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
@@ -58,7 +58,7 @@ public class GeneralDilios extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("command_"))
 		{
@@ -87,7 +87,7 @@ public class GeneralDilios extends AbstractNpcAI
 				startQuestTimer("guard_animation_" + (value + 1), 1500, null, null);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
index 0a84cf47a0..b4dbbc74ae 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
@@ -47,7 +47,7 @@ public class Lekon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
index e4edb350d4..3cdddadb06 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
@@ -56,7 +56,7 @@ public class LindviorScene extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -109,7 +109,7 @@ public class LindviorScene extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public void scheduleNextLindviorVisit()
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
index 79aaecd2f1..9d38ce28a4 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
@@ -59,7 +59,7 @@ public class Nottingale extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
index 975e4a2614..b0ded82d61 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
@@ -38,13 +38,13 @@ public class Plenos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_BE_TELEPORTED_TO_EACH_SEED_IF_YOU_VOLUNTEER_WHY_NOT_TRY, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
index 18f2110178..7fc2284ccb 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
@@ -46,7 +46,7 @@ public class SeedTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -75,7 +75,7 @@ public class SeedTeleportDevice extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
index 23b5c50033..c8498cbee5 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
@@ -49,7 +49,7 @@ public class MithrilMinesTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int index = Integer.parseInt(event) - 1;
 		if (LOCS.length > index)
@@ -57,7 +57,7 @@ public class MithrilMinesTeleporter extends AbstractNpcAI
 			final Location loc = LOCS[index];
 			player.teleToLocation(loc, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
index d398cfc3b8..2901995fbe 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
@@ -82,7 +82,7 @@ public class MonasteryOfSilence extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -130,7 +130,7 @@ public class MonasteryOfSilence extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
index 9a2ee10f60..434807bd9e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
@@ -62,7 +62,7 @@ public class PaganTeleporters extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
index 7eed58ebec..1c6e6ba756 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
@@ -60,7 +60,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -90,7 +90,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI
 				instanceScript.notifyEvent(event, npc, player);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
index 9d4b3bde33..781bfa3af3 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
@@ -39,13 +39,13 @@ public class Fioren extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("startMovie"))
 		{
 			playMovie(player, Movie.SI_BARLOG_STORY);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java
index 9c52a15e19..2d6d808bad 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java
@@ -93,7 +93,7 @@ public class PlainsOfLizardman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("fantasy_mushroom") && (npc != null) && (player != null))
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
index 21ff72d2e7..c8747c6857 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
@@ -179,7 +179,7 @@ public class PrimevalIsle extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -239,7 +239,7 @@ public class PrimevalIsle extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
index 5ffc401682..6a166ec683 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
@@ -74,7 +74,7 @@ public class Kaysen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
index 619d9e57f4..ceb8d8a7b9 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
@@ -63,7 +63,7 @@ public class NervasTemporaryPrison extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
index b8b803e57f..43691cef06 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
@@ -38,14 +38,14 @@ public class RoAGuard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THIS_IS_RUINS_OF_AGONY_WHERE_KANILOV_IS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
index f3af67aba7..dd2a52bdc5 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
@@ -38,14 +38,14 @@ public class RoDGuard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THIS_IS_THE_RUINS_OF_AGONY_WHERE_POSLOF_IS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
index 5e57a9fb94..a19c1d4085 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
@@ -48,7 +48,7 @@ public class AltarOfSacrifice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("msg_text"))
 		{
@@ -68,7 +68,7 @@ public class AltarOfSacrifice extends AbstractNpcAI
 			startQuestTimer("msg_text", 135000, npc, null);
 			_jenas_guard.setScriptValue(0);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
index a025e62542..b50f530164 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
@@ -147,7 +147,7 @@ public class Venom extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
index ed4ce2d782..cd89ebcb9e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
@@ -43,7 +43,7 @@ public class Klemis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("portInside"))
 		{
@@ -56,7 +56,7 @@ public class Klemis extends AbstractNpcAI
 				return "32734-01.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
index d66782538a..c1db3c8180 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
@@ -80,7 +80,7 @@ public class Maguen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || (player == null))
 		{
@@ -163,7 +163,7 @@ public class Maguen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
index 344d65a44f..d5ab73ff74 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
@@ -48,7 +48,7 @@ public class Nemo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
index 251458ea98..ae26a6c701 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
@@ -297,7 +297,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("ChangeSeedsStatus"))
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
index d6f644fa86..765deb4a7d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
@@ -51,7 +51,7 @@ public class Seyo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (npc == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
index f213bbec6c..f62aa835e8 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
@@ -132,7 +132,7 @@ public class SelMahumDrill extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -188,7 +188,7 @@ public class SelMahumDrill extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
index 4d3891946f..4e0a01cea2 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
@@ -83,7 +83,7 @@ public class SelMahumSquad extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -189,7 +189,7 @@ public class SelMahumSquad extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java
index 1c47135e60..a38df65796 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java
@@ -70,7 +70,7 @@ public class SilentValley extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
index ebf70cc5ae..6ba58ffc8e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
@@ -197,7 +197,7 @@ public class StakatoNest extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || (player == null) || npc.isDead())
 		{
@@ -225,7 +225,7 @@ public class StakatoNest extends AbstractNpcAI
 			addAttackPlayerDesire(spawned, player);
 			npc.deleteMe();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private static Monster checkMinion(Npc npc)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
index 611b134c70..2469300cb4 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
@@ -49,7 +49,7 @@ public class StakatoNestTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int index = Integer.parseInt(event) - 1;
 		if (LOCS.length > index)
@@ -67,7 +67,7 @@ public class StakatoNestTeleporter extends AbstractNpcAI
 			}
 			player.teleToLocation(loc, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
index 4a64afbd00..ba580c2dad 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
@@ -44,7 +44,7 @@ public class Apprentice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("rideKukuru"))
 		{
@@ -61,7 +61,7 @@ public class Apprentice extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TRY_RIDING_A_KUKURI, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
index e09ab8270d..8c1824fe61 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
@@ -97,7 +97,7 @@ public class AwakeningMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
index cd6185a888..8ed7701c68 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
@@ -38,7 +38,7 @@ public class Banette extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
@@ -62,7 +62,7 @@ public class Banette extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
index 87e0629227..858331ae3e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
@@ -38,13 +38,13 @@ public class Bink extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TALKING_ISLAND_VILLAGE_IS_REALLY_BEAUTIFUL, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
index e439d986ad..5d231aa00d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
@@ -45,7 +45,7 @@ public class BoyAndGirl extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_CHANGEWEAP"))
 		{
@@ -66,7 +66,7 @@ public class BoyAndGirl extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, npc.getId() == BOY ? NpcStringId.WEEE : NpcStringId.BOYS_ARE_SO_ANNOYING);
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
index ff53080809..22d19b3496 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
@@ -41,7 +41,7 @@ public class Devno extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -74,7 +74,7 @@ public class Devno extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
index a4f08b8c99..18c04b2e7e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
@@ -42,7 +42,7 @@ public class DrillSergeant extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SOCIAL_SHOW"))
 		{
@@ -66,7 +66,7 @@ public class DrillSergeant extends AbstractNpcAI
 				npc.broadcastSocialAction(socialActionId);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
index 8e3f9e5943..83363ef157 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
@@ -41,7 +41,7 @@ public class Eleve extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Eleve extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
index b8863b9963..114728632b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
@@ -44,13 +44,13 @@ public class Gagabu extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, GAGABU_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
index 44dab7df42..d490504792 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
@@ -38,14 +38,14 @@ public class Galad extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSocialAction(3);
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.OCCASIONALLY_RARE_JEWELS_OF_GIANTS_ARE_DISCOVERED_IN_THE_BEACH, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
index a0c7f71816..3a56943e20 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
@@ -52,7 +52,7 @@ public class GiantSoldiers extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
index a703c40323..b94d2f9624 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
@@ -38,7 +38,7 @@ public class GuardSoldier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -49,7 +49,7 @@ public class GuardSoldier extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(2);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
index b26d9fd748..1b0dd65c82 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
@@ -43,7 +43,7 @@ public class Hadel extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
index bdb70d1f2d..d7ff70d9a0 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
@@ -38,7 +38,7 @@ public class Handermonkey extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE") && (npc != null))
 		{
@@ -54,7 +54,7 @@ public class Handermonkey extends AbstractNpcAI
 				npc.broadcastSocialAction(9);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
index b8370bffe7..5ea0569424 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
@@ -60,7 +60,7 @@ public class Hardin extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = getHtmlMessage(player);
 		if (htmltext != null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
index a8bded51f1..536ee7f5cd 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
@@ -58,7 +58,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("HARNAK_SPAWN"))
 		{
@@ -70,7 +70,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
 				_templates.forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName), null));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private static class zoneInfo
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
index 3c2080e85a..03dca71bb5 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
@@ -55,13 +55,13 @@ public class HurnakMobMsg extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("ATTACK"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomEntry(ON_ATTACK_MSG));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
index 81f6617329..7055381eab 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
@@ -38,14 +38,14 @@ public class Hera extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomBoolean() ? NpcStringId.DOES_THE_GODDESS_SEE_WHAT_SHE_HAS_DONE : NpcStringId.WHY_HAVE_THE_HEROES_ABANDONED_US);
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
index 7003ad014d..2b6a1a1e51 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
@@ -38,7 +38,7 @@ public class Heymond extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
@@ -62,7 +62,7 @@ public class Heymond extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
index 52ce99be7f..8033f3c1ec 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
@@ -38,7 +38,7 @@ public class Holly extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -48,7 +48,7 @@ public class Holly extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(6);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
index 3f9141b931..e11490debc 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
@@ -41,7 +41,7 @@ public class Karonf extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Karonf extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
index 597cfd80f2..c102b0cc4c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
@@ -44,7 +44,7 @@ public class Luderic extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -54,7 +54,7 @@ public class Luderic extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(1);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
index 0c07720a0a..08de6143f0 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
@@ -45,13 +45,13 @@ public class Lumi extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, LUMI_SHOUT[getRandom(3)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
index 68b2789416..3bdb8de60b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
@@ -38,13 +38,13 @@ public class Mahram extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.ALCHEMY_IS_A_SCIENCE_AND_AN_ART, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
index e00fd6c98c..85117713a0 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
@@ -38,13 +38,13 @@ public class Mai extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EVERY_RACE_BUILT_A_PIECE_OF_THIS_VILLAGE, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
index dcd47a9822..2d44f1568a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
@@ -38,13 +38,13 @@ public class MarinSmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.HMM_IS_THIS_STILL_A_DECENT_WEAPON, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
index d5e5496e16..0d4e8f79e3 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
@@ -41,7 +41,7 @@ public class Marsha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Marsha extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
index aa9eb0eb87..81bc246742 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
@@ -43,7 +43,7 @@ public class Milia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("gludioAirship"))
 		{
@@ -53,7 +53,7 @@ public class Milia extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SPEAK_WITH_ME_ABOUT_TRAVELING_AROUND_ADEN, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
index b1e037eb5a..933c139b8c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
@@ -64,7 +64,7 @@ public class MonkOfChaos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
index f6cd83883a..0bedb09eb6 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
@@ -41,7 +41,7 @@ public class Morgan extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Morgan extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
index e7ce45a4e5..fd5e025cd2 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
@@ -40,7 +40,7 @@ public class Oris extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SOCIAL_ACTION_1"))
 		{
@@ -55,7 +55,7 @@ public class Oris extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_HAVEN_T_FELT_THIS_GOOD_IN_AGES, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
index 328de6a4df..34ae4f55b6 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
@@ -49,7 +49,7 @@ public class Pantheon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
index 869ebf3119..e44fe2e373 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
@@ -152,7 +152,7 @@ public class Raina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
index 4c8862c733..8d66a71766 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
@@ -41,7 +41,7 @@ public class Rubentis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Rubentis extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
index d5c86cee97..87e1df4a6b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
@@ -38,14 +38,14 @@ public class Ruks extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomBoolean() ? NpcStringId.THE_SEVEN_SIGNS_ENDED : NpcStringId.WE_NEED_TO_FIND_HER_WEAKNESS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
index cc9a63c666..880532e52c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
@@ -38,13 +38,13 @@ public class Sebion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TIS_A_SCRATCH, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
index fa3cc06633..4b05120bde 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
@@ -38,13 +38,13 @@ public class Shannon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.LOOK_AT_ALL_THE_NEWBIES_HA_HA_HA, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
index 219ac48515..7fd067c374 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
@@ -44,13 +44,13 @@ public class Sodian extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, SODIAN_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
index e11dfb9aaf..8413c93bc8 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
@@ -44,13 +44,13 @@ public class Stiller extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, STILLER_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
index b10f044196..d196091a8e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
@@ -38,13 +38,13 @@ public class Theodore extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.AND_NOW_YOUR_JOURNEY_BEGINS, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
index 4290aa8fc6..8e4f8ed738 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
@@ -38,7 +38,7 @@ public class TomaJunior extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -49,7 +49,7 @@ public class TomaJunior extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(6);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java
index 219f1f4879..1e4bdb3ff1 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java
@@ -48,7 +48,7 @@ public class Toyron extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true);
 		if (event.equals("museum_teleport"))
@@ -62,7 +62,7 @@ public class Toyron extends AbstractNpcAI
 				player.teleToLocation(MUSEUM_OUT);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
index c3aa031317..78ce6f2c8c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
@@ -38,7 +38,7 @@ public class TrainningSoldier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -55,7 +55,7 @@ public class TrainningSoldier extends AbstractNpcAI
 			}
 			startQuestTimer("START_ATTACK", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
index 848196c047..b92e79413b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
@@ -63,7 +63,7 @@ public class Trandon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String[] substrings = event.split(" ");
 		if (substrings.length < 1)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
index 8cd3cd965d..b65bd9a7ad 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
@@ -42,7 +42,7 @@ public class YeSagiraGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -56,7 +56,7 @@ public class YeSagiraGuards extends AbstractNpcAI
 			}
 			startQuestTimer("GUARD_AGGRO", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
index 007d0e13d3..a4e0c941bd 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
@@ -88,7 +88,7 @@ public class YeSegiraTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LOCATIONS.containsKey(event))
 		{
@@ -111,7 +111,7 @@ public class YeSegiraTeleportDevice extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_PLAYER_CREATE)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java
index e546cbc086..be903e83d2 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java
@@ -87,7 +87,7 @@ public class ToIVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int npcId = npc.getId();
 		
@@ -133,7 +133,7 @@ public class ToIVortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TownOfGiran/Alexandria/Alexandria.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TownOfGiran/Alexandria/Alexandria.java
index 1a0064cbcd..8091ac70e6 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TownOfGiran/Alexandria/Alexandria.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TownOfGiran/Alexandria/Alexandria.java
@@ -82,7 +82,7 @@ public class Alexandria extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("30098-02.html"))
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
index 2c8e967539..4bb6be2086 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
@@ -40,7 +40,7 @@ public class Acateo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("give_circlet"))
 		{
@@ -51,7 +51,7 @@ public class Acateo extends AbstractNpcAI
 			giveItems(player, ACADEMY_CIRCLET, 1);
 			return "33905-2.html";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TownOfGoddard/Cerenas/Cerenas.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TownOfGoddard/Cerenas/Cerenas.java
index 4b87f5ec09..f2df150f21 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TownOfGoddard/Cerenas/Cerenas.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TownOfGoddard/Cerenas/Cerenas.java
@@ -41,7 +41,7 @@ public class Cerenas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(Q10369_NoblesseSoulTesting.class.getSimpleName());
 		String htmltext = null;
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
index 949fb8f279..48ca778074 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
@@ -108,7 +108,7 @@ public class VarkaSilenosSupport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
index b7fb571500..3a94d3d378 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
@@ -43,7 +43,7 @@ public class ElmoredenServantsGhost extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("teleport1") || event.equals("teleport2"))
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
index 427084ea7a..150fee7dfb 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
@@ -83,7 +83,7 @@ public class Wastelands extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || !npc.isSpawned())
 		{
@@ -184,7 +184,7 @@ public class Wastelands extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
index 61678a5cb2..5e24c8040c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
@@ -47,7 +47,7 @@ public class ZealotOfShilen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -75,7 +75,7 @@ public class ZealotOfShilen extends AbstractNpcAI
 			}
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
index 2da266ca0e..ab6a6ebc3e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
@@ -38,14 +38,14 @@ public class Commando extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.WE_RE_COLLECTING_SEEKER_OF_ADEN);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Anais/Anais.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Anais/Anais.java
index 74fe879672..823d08142f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Anais/Anais.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Anais/Anais.java
@@ -75,7 +75,7 @@ public class Anais extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -134,7 +134,7 @@ public class Anais extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
index 00ebb5f34f..6f04200e6f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
@@ -361,7 +361,7 @@ public class Anakim extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -475,7 +475,7 @@ public class Anakim extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index d236e19d43..a5157acfc7 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -193,7 +193,7 @@ public class Antharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -605,7 +605,7 @@ public class Antharas extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 0fea286d69..e6080d34c6 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -164,7 +164,7 @@ public class Baium extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -478,7 +478,7 @@ public class Baium extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
index 4760cc09ff..5f9d21108a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
@@ -105,7 +105,7 @@ public class BalokWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -115,7 +115,7 @@ public class BalokWarzone extends AbstractInstance
 				takeItems(player, PRISON_KEY, -1);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
index 6684b9b04c..ce39ed9b22 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
@@ -72,7 +72,7 @@ public class BaylorWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -124,7 +124,7 @@ public class BaylorWarzone extends AbstractInstance
 				player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index b5a24845bb..3748875859 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -126,7 +126,7 @@ public class Beleth extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -536,7 +536,7 @@ public class Beleth extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
index e2770b5bec..b768e563e9 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
@@ -49,7 +49,7 @@ public class Wormhole extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Core/Core.java
index 344ad52a0a..34584c31c3 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -143,7 +143,7 @@ public class Core extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
@@ -162,7 +162,7 @@ public class Core extends AbstractNpcAI
 			_minions.forEach(Attackable::decayMe);
 			_minions.clear();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
index 859e6fc695..ed664b4197 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
@@ -65,7 +65,7 @@ public class IceQueensCastle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class IceQueensCastle extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
index a07501ed22..9f3772a47d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
@@ -160,7 +160,7 @@ public class IceQueensCastleBattle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterEasy"))
 		{
@@ -700,7 +700,7 @@ public class IceQueensCastleBattle extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
index 7fa44d08d6..21e250c482 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
@@ -45,7 +45,7 @@ public class Jinia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
index 62de6736d0..3a3ddc74e7 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
@@ -165,7 +165,7 @@ public class LastImperialTomb extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
index 282b9f8fbc..254c891bc5 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
@@ -62,7 +62,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Helios/Helios.java
index d6de973ec6..8288e0626c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Helios/Helios.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Helios/Helios.java
@@ -320,7 +320,7 @@ public class Helios extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Helios/Helios1.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Helios/Helios1.java
index 7eb394719d..5d2364fbc0 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Helios/Helios1.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Helios/Helios1.java
@@ -45,7 +45,7 @@ public class Helios1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -58,7 +58,7 @@ public class Helios1 extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Helios/Helios2.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Helios/Helios2.java
index 2147bd52c0..abe0cc400e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Helios/Helios2.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Helios/Helios2.java
@@ -45,7 +45,7 @@ public class Helios2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -58,7 +58,7 @@ public class Helios2 extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Helios/Helios3.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Helios/Helios3.java
index 364dce85de..8e293ad2a4 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Helios/Helios3.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Helios/Helios3.java
@@ -46,7 +46,7 @@ public class Helios3 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -59,7 +59,7 @@ public class Helios3 extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java
index 404237e0fa..29b64fa20b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java
@@ -44,7 +44,7 @@ public class RoyalArchmageMinion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class RoyalArchmageMinion extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
index e4260628ce..d61884c91b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
@@ -92,7 +92,7 @@ public class IstinaCavern extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance instance = npc.getInstanceWorld();
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
index 27728f34c1..f1945e2def 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
@@ -40,7 +40,7 @@ public class Rumiese extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
index b94d17f47b..ae0e6aaef9 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
@@ -141,7 +141,7 @@ public class Kelbim extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -281,7 +281,7 @@ public class Kelbim extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
index 9f677053b2..c3e066a466 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
@@ -137,7 +137,7 @@ public class KimerianCommon extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance instance = npc.getInstanceWorld();
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
index 8d618ecd4f..f0d8652322 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
@@ -387,7 +387,7 @@ public class Lilith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -501,7 +501,7 @@ public class Lilith extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/LimitBarrier.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/LimitBarrier.java
index 3dd93360b3..6b9d8bf762 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/LimitBarrier.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/LimitBarrier.java
@@ -82,7 +82,7 @@ public class LimitBarrier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -111,7 +111,7 @@ public class LimitBarrier extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
index 5b16c333e2..ced833a889 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
@@ -49,7 +49,7 @@ public class KatoSicanus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
index 2bd8aeb2c6..7dacdd2c16 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
@@ -674,7 +674,7 @@ public class Lindvior extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
index 73d5d88407..f676f620a3 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
@@ -49,7 +49,7 @@ public class Vortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -110,7 +110,7 @@ public class Vortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java
index 190f1ce9ea..02f57b1bd5 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java
@@ -59,7 +59,7 @@ public class Lydia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
index 49a224c8bc..8c7d0eb77d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
@@ -122,7 +122,7 @@ public class OctavisWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -146,7 +146,7 @@ public class OctavisWarzone extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index e74bc817e6..11c8477773 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -180,7 +180,7 @@ public class Orfen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -263,7 +263,7 @@ public class Orfen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 93735c996b..72e174bb65 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -155,7 +155,7 @@ public class QueenAnt extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -239,7 +239,7 @@ public class QueenAnt extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
index 7a3322b68a..297948d172 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
@@ -53,7 +53,7 @@ public class QueenShyeed extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java
index 8304e07d78..80a048214d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java
@@ -149,7 +149,7 @@ public class Ramona extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -377,7 +377,7 @@ public class Ramona extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
index ad87d93fe0..20e1572d8a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
@@ -80,7 +80,7 @@ public class Sailren extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -249,7 +249,7 @@ public class Sailren extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
index 4eeb4da057..b11aa4de6a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
@@ -73,7 +73,7 @@ public class Cannon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
index f754206b22..45b4c89ee7 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
@@ -62,7 +62,7 @@ public class TautiWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -170,7 +170,7 @@ public class TautiWarzone extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
index 50da94c8b2..f973bf0e12 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
@@ -182,7 +182,7 @@ public class TeredorWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
index 7b07413999..63b2c0589a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
@@ -507,7 +507,7 @@ public class Stage1 extends AbstractInstance implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
index 70d36f9c61..d2abf63365 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
@@ -50,7 +50,7 @@ public class Daichir extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterEarthWyrnCave"))
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
index e69a688d77..2c365d7f61 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
@@ -570,7 +570,7 @@ public class Trasken extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -694,7 +694,7 @@ public class Trasken extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index 74f7b64063..4eaf667f0a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -191,7 +191,7 @@ public class Valakas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -380,7 +380,7 @@ public class Valakas extends AbstractNpcAI
 		{
 			BOSS_ZONE.oustAllPlayers();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
index a211f7bfc0..bae4d63898 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
@@ -172,7 +172,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter60"))
 		{
@@ -254,7 +254,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/AdenReconstructorManager.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
index efa4bfa6ca..65a08050b6 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
@@ -42,7 +42,7 @@ public class AdenReconstructorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -67,7 +67,7 @@ public class AdenReconstructorManager extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
index 2dec85bd94..c31f5c0175 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
@@ -141,7 +141,7 @@ public class AdventureGuildsman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
index 147014c5ca..6dd0539e41 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
@@ -63,7 +63,7 @@ public class AdventurersGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
index c5ed73b2c2..7d81da92e1 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
@@ -51,7 +51,7 @@ public class AlchemistManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index b939ece983..849ed827d3 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -63,7 +63,7 @@ public class ArenaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -128,7 +128,7 @@ public class ArenaManager extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/BalthusKnights/Monsters/GemDragon/GemDragon.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/BalthusKnights/Monsters/GemDragon/GemDragon.java
index 69554e90a1..de35fff281 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/BalthusKnights/Monsters/GemDragon/GemDragon.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/BalthusKnights/Monsters/GemDragon/GemDragon.java
@@ -88,7 +88,7 @@ public final class GemDragon extends AbstractNpcAI
 				{
 					ThreadPool.schedule(() ->
 					{
-						instance.onAdvEvent("continueGemDragonsAttack", npc, killer);
+						instance.onEvent("continueGemDragonsAttack", npc, killer);
 					}, 4000); // 4 sec
 					
 				}
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
index 1c51b94358..352c31c8fc 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
@@ -38,7 +38,7 @@ public class BlackJudge extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("weakenBreath"))
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
index d35adf8706..e203aecd5e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
@@ -42,7 +42,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equals("31092-01.html"))
@@ -79,7 +79,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 			giveAdena(player, count, false);
 			return "31092-04.html";
 		}
-		return super.onAdvEvent(htmltext, npc, player);
+		return super.onEvent(htmltext, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
index 6a44d63e0b..81e90f2d67 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
@@ -56,7 +56,7 @@ public class CastleAmbassador extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
index b07792cd2d..11b8786523 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
@@ -57,7 +57,7 @@ public class CastleBlacksmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return (event.equalsIgnoreCase(npc.getId() + "-02.html") && hasRights(player, npc)) ? event : null;
 	}
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
index 355012ffea..5385531356 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
@@ -393,7 +393,7 @@ public class CastleChamberlain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Castle castle = npc.getCastle();
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
index 3e2cd16930..4a8fac8c0e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
@@ -140,7 +140,7 @@ public class CastleCourtMagician extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player.getClan() == null) && (player.getClanId() != npc.getCastle().getOwnerId()))
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
index b9c1f3faf5..70bae86615 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
@@ -72,7 +72,7 @@ public class CastleDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
index bb32dde319..a319e3977f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
@@ -56,7 +56,7 @@ public class CastleMercenaryManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index ac71c1afad..0e8137bb1d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -78,7 +78,7 @@ public class CastleTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
@@ -168,7 +168,7 @@ public class CastleTeleporter extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
index bffed40bcc..ea1b40c41c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
@@ -52,7 +52,7 @@ public class CastleWarehouse extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final boolean isMyLord = player.isClanLeader() && (player.getClan().getCastleId() == (npc.getCastle() != null ? npc.getCastle().getResidenceId() : -1));
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index e8d1c84950..e84e7c9e49 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -64,7 +64,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
index a86581206e..afd7250ca4 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
@@ -57,7 +57,7 @@ public class ClanHallDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 8e2969fe49..188fe77edb 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -105,7 +105,7 @@ public class ClanHallManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
index 1d8e114daa..77845525b2 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
@@ -68,7 +68,7 @@ public class ClanTrader extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index ca48b6b231..551a1bd767 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -235,7 +235,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		if (!_isEnabled)
 		{
@@ -936,7 +936,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	{
 		if (event.getCommand().startsWith("Quest ClassMaster "))
 		{
-			final String html = onAdvEvent(event.getCommand().substring(18), null, event.getPlayer());
+			final String html = onEvent(event.getCommand().substring(18), null, event.getPlayer());
 			event.getPlayer().sendPacket(TutorialCloseHtml.STATIC_PACKET);
 			showResult(event.getPlayer(), html);
 		}
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
index 21aafa7e87..7b61214c91 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
@@ -43,7 +43,7 @@ public class CrimsonHatuOtis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -69,7 +69,7 @@ public class CrimsonHatuOtis extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java
index e1f6de3c80..c66ba04bfe 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java
@@ -73,7 +73,7 @@ public class DimensionalMerchant extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/DivineBeast.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/DivineBeast.java
index 1f247a7b35..3f3a076992 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/DivineBeast.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/DivineBeast.java
@@ -44,7 +44,7 @@ public class DivineBeast extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player == null) || !player.hasServitors())
 		{
@@ -55,7 +55,7 @@ public class DivineBeast extends AbstractNpcAI
 			cancelQuestTimer(event, npc, player);
 			player.getServitors().values().forEach(summon -> summon.unSummon(player));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/EnergySeeds.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/EnergySeeds.java
index 509c12bbeb..befbad7bff 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/EnergySeeds.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/EnergySeeds.java
@@ -196,7 +196,7 @@ public class EnergySeeds extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("StartSoDAi"))
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/FameManager/FameManager.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/FameManager/FameManager.java
index d4f16a9b96..b0a7bc0a20 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/FameManager/FameManager.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/FameManager/FameManager.java
@@ -49,7 +49,7 @@ public class FameManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
index 79742f7171..c5a075fbcf 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
@@ -69,7 +69,7 @@ public class FortressSiegeManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
index 344d4c5547..db32dd6f2b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
@@ -67,7 +67,7 @@ public class HealerTrainer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
index 94b2f5f16d..2b2e0d3c40 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
@@ -89,7 +89,7 @@ public class HermuncusMinion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(eventValue, " ");
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
index 2928fbd023..abe98a50e5 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
@@ -47,7 +47,7 @@ public class LaVieEnRose extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/Mammons/Mammons.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/Mammons/Mammons.java
index 3ff005b72b..f58c7b8b86 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/Mammons/Mammons.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/Mammons/Mammons.java
@@ -79,12 +79,12 @@ public class Mammons extends AbstractNpcAI
 		addTalkId(MAMMONS);
 		addFirstTalkId(MAMMONS);
 		
-		onAdvEvent("RESPAWN_MAMMONS", null, null);
+		onEvent("RESPAWN_MAMMONS", null, null);
 		startQuestTimer("RESPAWN_MAMMONS", TELEPORT_DELAY, null, null, true);
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
index 8d38a27541..6763b0367c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
@@ -71,7 +71,7 @@ public class ManorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
index 0aabff8144..33e539ee09 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
@@ -143,7 +143,7 @@ public class MentorGuide extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("exchange"))
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/Minigame/Minigame.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/Minigame/Minigame.java
index 14e3f84dbd..3971049085 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/Minigame/Minigame.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/Minigame/Minigame.java
@@ -68,7 +68,7 @@ public class Minigame extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final MinigameRoom room = getRoomByManager(npc);
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
index fe59e53b0b..a020799422 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
@@ -79,7 +79,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/MysteriousWizard/MysteriousWizard.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/MysteriousWizard/MysteriousWizard.java
index 2c423c6490..667463de4d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/MysteriousWizard/MysteriousWizard.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/MysteriousWizard/MysteriousWizard.java
@@ -41,7 +41,7 @@ public class MysteriousWizard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return event.equals("33980-01.html") ? event : null;
 	}
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
index 4ad7e0a2fc..d3576b9fff 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
@@ -48,14 +48,14 @@ public class NornilTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("teleport_"))
 		{
 			final int locId = Integer.parseInt(event.replace("teleport_", ""));
 			player.teleToLocation(LOCATIONS[locId - 1]);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
index 899c6a356f..66831c0e4e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
@@ -66,7 +66,7 @@ public class OlyBuffer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index be19fd9cce..0c71a54aa1 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -88,7 +88,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/PrisonGuards.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/PrisonGuards.java
index 4084beddca..c79356a1f0 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/PrisonGuards.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/PrisonGuards.java
@@ -53,7 +53,7 @@ public class PrisonGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CLEAR_STATUS"))
 		{
@@ -67,7 +67,7 @@ public class PrisonGuards extends AbstractNpcAI
 			}
 			startQuestTimer("CHECK_HOME", 30000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
index 21d281c6c9..435f293345 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
@@ -84,7 +84,7 @@ public class Proclaimer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("giveBuff"))
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
index 8b3515e12b..83098c1eaf 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
@@ -79,7 +79,7 @@ public class ProvisionalHalls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/Servitors/SinEater.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/Servitors/SinEater.java
index 1ed8d645a5..d7536614e8 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/Servitors/SinEater.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/Servitors/SinEater.java
@@ -48,7 +48,7 @@ public class SinEater extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TALK") && (player != null) && (player.getPet() != null))
 		{
@@ -79,7 +79,7 @@ public class SinEater extends AbstractNpcAI
 			}
 			startQuestTimer("TALK", 60000, null, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_CREATURE_DEATH)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
index ec177e537e..373c64200b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
@@ -128,7 +128,7 @@ public class SupportUnitCaptain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int fortOwner = npc.getFort().getOwnerClan() == null ? 0 : npc.getFort().getOwnerClan().getId();
 		if ((player.getClan() == null) || (player.getClanId() != fortOwner))
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
index f6d1e74529..a733b87dad 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
@@ -53,7 +53,7 @@ public class SymbolMaker extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
index f9cd32a0dd..82ec9274c2 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
@@ -94,7 +94,7 @@ public class TeleportToUndergroundColiseum extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.endsWith(".htm"))
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
index dbe26ae6a3..7052b10367 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
@@ -75,7 +75,7 @@ public class TersisHerald extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("giveBuff"))
 		{
@@ -87,7 +87,7 @@ public class TersisHerald extends AbstractNpcAI
 			npc.setTarget(player);
 			npc.doCast(DRAGON_BUFF.getSkill());
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java
index eed907ea32..08917d36e2 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java
@@ -58,7 +58,7 @@ public class TrainingCamp extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (!Config.TRAINING_CAMP_ENABLE || !checkConditions(player))
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
index 8e94950d76..520a057481 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
@@ -62,7 +62,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = "";
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
index 9924fb4ace..0a6b873028 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
@@ -85,7 +85,7 @@ public class ClassTransferTalk extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/WarriorFishingBlock.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
index 56b29fee5b..78e3d1c99e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
@@ -75,7 +75,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -104,7 +104,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
index b9439eb0ec..a1878b037b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
@@ -156,7 +156,7 @@ public class WeaverOlf extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.contains("_grade_"))
 		{
@@ -185,7 +185,7 @@ public class WeaverOlf extends AbstractNpcAI
 			}
 			else
 			{
-				return super.onAdvEvent(event, npc, player);
+				return super.onEvent(event, npc, player);
 			}
 			
 			if (hasQuestItems(player, itemIds[0]))
@@ -225,7 +225,7 @@ public class WeaverOlf extends AbstractNpcAI
 			{
 				return npc.getId() + "-no.htm";
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		return event;
 	}
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index 777998cde4..48bf41ab6d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -210,7 +210,7 @@ public class WyvernManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
index 0c2e7586c9..c49be5297b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
@@ -36,7 +36,7 @@ public class DelevelManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.DELEVEL_MANAGER_ENABLED)
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
index 5eaddb78ba..76b7f1e559 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
@@ -54,7 +54,7 @@ public class FactionSystem extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class FactionSystem extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
index 8b9c676ad5..771c8a9058 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
@@ -34,7 +34,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -77,7 +77,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 				npc.broadcastInfo(); // update flag status
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
index ee7151c9c2..36f2ef411d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
@@ -68,7 +68,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("AUTOBUFF") && (npc != null) && !npc.isDead())
 		{
@@ -96,7 +96,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
 			}
 			startQuestTimer("AUTOBUFF", 30000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
index f19aa0cb6f..447c512987 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
@@ -39,7 +39,7 @@ public class NoblessMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.NOBLESS_MASTER_ENABLED)
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
index 370e9a1ced..3488295c5a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
@@ -163,7 +163,7 @@ public class Deathmatch extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
index 1eb84eca93..b92bbe7f77 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
@@ -213,7 +213,7 @@ public class Rabbits extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/events/Race/Race.java
index ff9fc462f6..6ac325ca6f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/events/Race/Race.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/events/Race/Race.java
@@ -320,7 +320,7 @@ public class Race extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 2ceed8623e..85520805ac 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -180,7 +180,7 @@ public class TvT extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
index 77c055cc79..84a2d7763d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
@@ -45,7 +45,7 @@ public class BirthOfDraco extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
index 9bc0ff9c55..87ac868dc7 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
@@ -64,7 +64,7 @@ public class CharacterBirthday extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("despawn_npc"))
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index a966bdff3e..4648d78f95 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -56,7 +56,7 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
index 82f5cdc261..57cd81b41f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
@@ -73,7 +73,7 @@ public class FreyaCelebration extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("give_potion"))
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
index f4eab89c4e..174971ed84 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
@@ -86,7 +86,7 @@ public class GiftOfVitality extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/HappyHours/HappyHours.java
index ed84918716..9e0bc0ce91 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/HappyHours/HappyHours.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/HappyHours/HappyHours.java
@@ -49,7 +49,7 @@ public class HappyHours extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
index aa5419e179..76aaa4ab09 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
@@ -59,7 +59,7 @@ public class HeavyMedal extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		int level = checkLevel(player);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/HungryHorse/HungryHorse.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
index 646db8d92d..657ddb84b9 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
@@ -58,7 +58,7 @@ public class HungryHorse extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
index 6107af7f71..502fce9a30 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
@@ -55,7 +55,7 @@ public class HuntForSanta extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/LetterCollector/LetterCollector.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
index 744b1f2ae4..d87bd82b02 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
@@ -123,7 +123,7 @@ public class LetterCollector extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
index 2f60479b40..dafcd3e11c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
@@ -49,7 +49,7 @@ public class LoveYourGatekeeper extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
index c868fad2b3..6460eb4ab0 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
@@ -61,7 +61,7 @@ public class LoversJubilee extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmtext = event;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
index fcef497220..aa0ce383ae 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
@@ -68,7 +68,7 @@ public class MasterOfEnchanting extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("buy_staff"))
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/RedLibra/RedLibra.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/RedLibra/RedLibra.java
index 69414f20c6..693f2efd18 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/RedLibra/RedLibra.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/RedLibra/RedLibra.java
@@ -42,7 +42,7 @@ public class RedLibra extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
index f6c714eddc..7d3462224b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
@@ -58,7 +58,7 @@ public class RudolphsBlessing extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("rudolph_eat") && (player != null) && player.isOnline())
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
index 3f076fc92b..17ff961002 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
@@ -297,7 +297,7 @@ public class SavingSanta extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!isEventPeriod())
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
index 5c00677d25..862a8df578 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
@@ -51,7 +51,7 @@ public class ThePowerOfLove extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
index 6696dee542..a53ca2b3a0 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
@@ -130,7 +130,7 @@ public class AltarOfShilen extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (event.equals("enterInstance"))
@@ -266,7 +266,7 @@ public class AltarOfShilen extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
index 4fcc21b412..56b8393b3a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
@@ -154,7 +154,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -269,7 +269,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/AntharasNest.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/AntharasNest.java
index e56b9edbcf..9c3dafdc9c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/AntharasNest.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/AntharasNest.java
@@ -56,7 +56,7 @@ public final class AntharasNest extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/FaeronVillage/FaeronVillage.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/FaeronVillage/FaeronVillage.java
index 8783eafd87..8e65bcd851 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/FaeronVillage/FaeronVillage.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/FaeronVillage/FaeronVillage.java
@@ -63,7 +63,7 @@ public final class FaeronVillage extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/HatchlingCage.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/HatchlingCage.java
index 6dda2fe250..90a084d54b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/HatchlingCage.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/HatchlingCage.java
@@ -48,7 +48,7 @@ public final class HatchlingCage extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/HatchlingNest.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/HatchlingNest.java
index 351e59ac1a..e06ac8cc55 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/HatchlingNest.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/HatchlingNest.java
@@ -49,7 +49,7 @@ public final class HatchlingNest extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/PowerOfAbelius/PowerOfAbelius.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/PowerOfAbelius/PowerOfAbelius.java
index 60c1163aee..f6c80cbf2a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/PowerOfAbelius/PowerOfAbelius.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/PowerOfAbelius/PowerOfAbelius.java
@@ -67,7 +67,7 @@ public final class PowerOfAbelius extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/PowerOfCranigg/PowerOfCranigg.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/PowerOfCranigg/PowerOfCranigg.java
index 2599222ccb..4ba72749df 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/PowerOfCranigg/PowerOfCranigg.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/PowerOfCranigg/PowerOfCranigg.java
@@ -71,7 +71,7 @@ public final class PowerOfCranigg extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/PowerOfKashnaga/PowerOfKashnaga.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/PowerOfKashnaga/PowerOfKashnaga.java
index fb9d2efe48..331002322c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/PowerOfKashnaga/PowerOfKashnaga.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/PowerOfKashnaga/PowerOfKashnaga.java
@@ -71,7 +71,7 @@ public final class PowerOfKashnaga extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/PowerOfLakcis/PowerOfLakcis.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/PowerOfLakcis/PowerOfLakcis.java
index 9f7c19e8a5..ffc0317368 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/PowerOfLakcis/PowerOfLakcis.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/PowerOfLakcis/PowerOfLakcis.java
@@ -67,7 +67,7 @@ public final class PowerOfLakcis extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/PowerOfNaviarope/PowerOfNaviarope.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/PowerOfNaviarope/PowerOfNaviarope.java
index 97129f0610..3f11ac0f8d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/PowerOfNaviarope/PowerOfNaviarope.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/PowerOfNaviarope/PowerOfNaviarope.java
@@ -67,7 +67,7 @@ public final class PowerOfNaviarope extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/PowerOfRaister/PowerOfRaister.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/PowerOfRaister/PowerOfRaister.java
index 07bdeb9c97..06b0ebf5a9 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/PowerOfRaister/PowerOfRaister.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/PowerOfRaister/PowerOfRaister.java
@@ -71,7 +71,7 @@ public final class PowerOfRaister extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/PowerOfSapyros/PowerOfSapyros.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/PowerOfSapyros/PowerOfSapyros.java
index 8e02743187..6b5a2fb419 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/PowerOfSapyros/PowerOfSapyros.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/PowerOfSapyros/PowerOfSapyros.java
@@ -71,7 +71,7 @@ public final class PowerOfSapyros extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/PowerOfSoltkreig/PowerOfSoltkreig.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/PowerOfSoltkreig/PowerOfSoltkreig.java
index ebf516a97a..17fdebdbd0 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/PowerOfSoltkreig/PowerOfSoltkreig.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/BalthusKnights/PowerOfSoltkreig/PowerOfSoltkreig.java
@@ -71,7 +71,7 @@ public final class PowerOfSoltkreig extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
index 68c045e51c..e67fe76ff8 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
@@ -467,7 +467,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
index ca43ca6ba5..0575330716 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
@@ -72,7 +72,7 @@ public class ChamberOfProphecies extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
index 4f0f2f7a19..b815b5bae7 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
@@ -177,7 +177,7 @@ public class ChamberOfDelusion extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CommandPost/CommandPost.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CommandPost/CommandPost.java
index 23da57e021..4a68caa376 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CommandPost/CommandPost.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CommandPost/CommandPost.java
@@ -105,7 +105,7 @@ public class CommandPost extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
index ff860c70bb..c8bed455cc 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
@@ -114,13 +114,13 @@ public class CrystalCavernsCoralGarden extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
index 6db8525e11..46f3d2fdf6 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
@@ -79,13 +79,13 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
index c51b5d7887..121e3a89f4 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
@@ -135,13 +135,13 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
index 72d2fe0f6f..58eec2329b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
@@ -122,7 +122,7 @@ public class DarkCloudMansion extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
index 00241b7b77..4f4fade41e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
@@ -45,7 +45,7 @@ public class DimensionMakkum extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = getPlayerInstance(player);
 		switch (event)
@@ -69,7 +69,7 @@ public class DimensionMakkum extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
index 605b8ebdf8..981a91d4a7 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
@@ -53,13 +53,13 @@ public class DimensionalArchon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), getRandomEntry(ARCHON_MSG)));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
index 176ee5b803..9243451cde 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
@@ -53,7 +53,7 @@ public class DimensionalTrap extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || npc.isAlikeDead())
 		{
@@ -102,7 +102,7 @@ public class DimensionalTrap extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
index 2bbbc27dea..e034bb7f04 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
@@ -115,7 +115,7 @@ public class DimensionalWrap extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
index 8211e90098..4d937103a7 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
@@ -45,7 +45,7 @@ public class EvasHiddenSpace extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = player.getQuestState(Q10369_NoblesseSoulTesting.class.getSimpleName());
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
index 98e2ac0c8b..a40e7e3c88 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
@@ -195,12 +195,12 @@ public class EvilIncubator extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player);
 		if ((st == null) || !st.isStarted())
 		{
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java
index 634da69955..ef4b29846d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java
@@ -69,7 +69,7 @@ public class FaeronTrainingGrounds1 extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(Q10735_ASpecialPower.class.getSimpleName());
 		String htmltext = null;
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java
index 32eb0526b8..4dd64ac3fb 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java
@@ -68,7 +68,7 @@ public class FaeronTrainingGrounds2 extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(Q10736_ASpecialPower.class.getSimpleName());
 		String htmltext = null;
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
index 6d58bd6eb4..1477e297c5 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
@@ -59,7 +59,7 @@ public class FortressOfTheDead extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/Fortuna/Fortuna.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/Fortuna/Fortuna.java
index 339328eea4..ef7b65659f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/Fortuna/Fortuna.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/Fortuna/Fortuna.java
@@ -51,7 +51,7 @@ public class Fortuna extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -472,7 +472,7 @@ public class Fortuna extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
index ef73cf3920..a205145189 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
@@ -119,7 +119,7 @@ public class HarnakUndergroundRuins extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
index 598a7460c7..c7180064eb 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
@@ -642,7 +642,7 @@ public class Kamaloka extends AbstractInstance
 	 * Handles only player's enter, single parameter - integer kamaloka index
 	 */
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java
index 7a8f1aa4b3..ef3b1ae1ba 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java
@@ -48,7 +48,7 @@ public class KaraphonHabitat extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(Q10745_TheSecretIngredients.class.getSimpleName());
 		if (qs != null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
index cccdf5d51f..4db13d5b98 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
@@ -195,7 +195,7 @@ public class KartiasLabyrinth extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -268,7 +268,7 @@ public class KartiasLabyrinth extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java
index defddc2e63..4a871ec80d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java
@@ -95,7 +95,7 @@ public class LabyrinthOfBelis extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter_instance"))
 		{
@@ -209,7 +209,7 @@ public class LabyrinthOfBelis extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java
index 0284ac988f..7f88562bc4 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java
@@ -61,7 +61,7 @@ public class MithrilMine extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -108,7 +108,7 @@ public class MithrilMine extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java
index 8477e30897..7a34ab8b3c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java
@@ -127,13 +127,13 @@ public class MuseumDungeon extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter_instance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
index f83f2fcec1..024065f4e9 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
@@ -83,7 +83,7 @@ public class MysticTavern extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
index 48ee563ff5..56d62a42d1 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
@@ -81,7 +81,7 @@ public class StoryOfFreya extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance world = npc.getInstanceWorld();
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
index e21d937eb6..d1d82fe8d7 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
@@ -107,7 +107,7 @@ public class StoryOfTauti extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		switch (event)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
index 150d8f3496..acd2b4b1f7 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
@@ -67,7 +67,7 @@ public class NightmareKamaloka extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -132,7 +132,7 @@ public class NightmareKamaloka extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
index 9911bb8d70..429a76107e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
@@ -93,7 +93,7 @@ public class NornilsGarden extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (isInInstance(world))
@@ -157,7 +157,7 @@ public class NornilsGarden extends AbstractInstance
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/Nursery/Nursery.java
index 2e394a7446..9042632611 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/Nursery/Nursery.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/Nursery/Nursery.java
@@ -192,7 +192,7 @@ public class Nursery extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance instance = npc.getInstanceWorld();
 		if (isInInstance(instance))
@@ -269,7 +269,7 @@ public class Nursery extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
index 8ddaa9cd0f..f78f43a9dc 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
@@ -101,7 +101,7 @@ public class PailakaDevilsLegacy extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter"))
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java
index b9b2064a77..07fcb7c67b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java
@@ -139,7 +139,7 @@ public class PailakaInjuredDragon extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = player.getQuestState(Q00144_PailakaInjuredDragon.class.getSimpleName());
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
index 5f1d771719..64f2155310 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
@@ -105,7 +105,7 @@ public class PailakaRuneCastle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
index 00fb1c9096..7b25c61e9d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
@@ -63,7 +63,7 @@ public class PailakaSongOfIceAndFire extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -102,7 +102,7 @@ public class PailakaSongOfIceAndFire extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
index 422cbc96a0..48039ff29e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
@@ -173,7 +173,7 @@ public class PrisonOfDarkness extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -313,7 +313,7 @@ public class PrisonOfDarkness extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java
index c72d9b8646..da8c6e785c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java
@@ -162,7 +162,7 @@ public class SSQDisciplesNecropolisPast extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = player.getInstanceWorld();
 		if (world != null)
@@ -264,7 +264,7 @@ public class SSQDisciplesNecropolisPast extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java
index be0450dd2e..b4d398e7d9 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java
@@ -63,7 +63,7 @@ public class SSQLibraryOfSages extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = player.getInstanceWorld();
 		if (world != null)
@@ -103,7 +103,7 @@ public class SSQLibraryOfSages extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java
index e378631253..4b2f28016a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java
@@ -126,7 +126,7 @@ public class SSQMonasteryOfSilence extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = player.getInstanceWorld();
 		if (world != null)
@@ -218,7 +218,7 @@ public class SSQMonasteryOfSilence extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/SSQSanctumOftheLordsOfDawn/SSQSanctumOftheLordsOfDawn.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/SSQSanctumOftheLordsOfDawn/SSQSanctumOftheLordsOfDawn.java
index 9a84142109..863594e558 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/SSQSanctumOftheLordsOfDawn/SSQSanctumOftheLordsOfDawn.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/SSQSanctumOftheLordsOfDawn/SSQSanctumOftheLordsOfDawn.java
@@ -89,7 +89,7 @@ public class SSQSanctumOftheLordsOfDawn extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -126,7 +126,7 @@ public class SSQSanctumOftheLordsOfDawn extends AbstractInstance
 				player.teleToLocation(SAVE_POINT[npc.getScriptValue()]);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java
index dfb00caae2..d5bece244e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java
@@ -196,13 +196,13 @@ public class TaintedDimension extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java
index b0f641adfe..1c74f89fdf 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java
@@ -60,7 +60,7 @@ public class TalkingIslandPast extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -74,7 +74,7 @@ public class TalkingIslandPast extends AbstractInstance
 				teleportPlayerOut(player, world);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
index e4f0fea409..0aa8f7b0be 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
@@ -46,7 +46,7 @@ public class Q00013_ParcelDelivery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
index a9332344fe..5772a2064d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
@@ -44,7 +44,7 @@ public class Q00015_SweetWhispers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
index d825925804..37d92fabd2 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
@@ -53,7 +53,7 @@ public class Q00016_TheComingDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
index 4a1a62c19a..0e0ef5512d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
@@ -52,7 +52,7 @@ public class Q00017_LightAndDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
index c8de373b1f..cb246e0b70 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
@@ -47,7 +47,7 @@ public class Q00019_GoToThePastureland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
index 8467c0a18f..b161006570 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
@@ -44,7 +44,7 @@ public class Q00020_BringUpWithLove extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
index c1ede03985..b885fa960d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
@@ -56,7 +56,7 @@ public class Q00031_SecretBuriedInTheSwamp extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
index ab85113705..02fd7814dd 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
@@ -64,7 +64,7 @@ public class Q00032_AnObviousLie extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
index 346e21ba51..3e17f3d69c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
@@ -53,7 +53,7 @@ public class Q00033_MakeAPairOfDressShoes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
index 30988810b7..32c4a3f461 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
@@ -61,7 +61,7 @@ public class Q00034_InSearchOfCloth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
index c9b8b6e19c..c2d6566765 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
@@ -57,7 +57,7 @@ public class Q00035_FindGlitteringJewelry extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
index e3bd0e5753..73ae6c433d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
@@ -53,7 +53,7 @@ public class Q00036_MakeASewingKit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
index 78660c7498..29c1bd2863 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
@@ -54,7 +54,7 @@ public class Q00037_MakeFormalWear extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
index 5c4d3d5074..c4274aa035 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
@@ -50,7 +50,7 @@ public class Q00040_ASpecialOrder extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
index 100213b849..fe31a6ab4e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
@@ -54,7 +54,7 @@ public class Q00042_HelpTheUncle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
index 9d5f9265df..a5d1225fca 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
@@ -60,7 +60,7 @@ public class Q00043_HelpTheSister extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
index 7cc6c0f337..a13197fc21 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
@@ -55,7 +55,7 @@ public class Q00044_HelpTheSon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java
index 5768b389fd..4e93e4e1bb 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java
@@ -55,7 +55,7 @@ public class Q00061_LawEnforcement extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
index 9cdc614440..8ac70695cd 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
@@ -47,7 +47,7 @@ public class Q00109_InSearchOfTheNest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
index 8dfcd422ca..82e6fe12d2 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
@@ -46,7 +46,7 @@ public class Q00110_ToThePrimevalIsle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java
index 8727edab49..00fa0933e5 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java
@@ -87,7 +87,7 @@ public class Q00111_ElrokianHuntersProof extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
index 40a4965112..c29eaa83b6 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
@@ -55,7 +55,7 @@ public class Q00115_TheOtherSideOfTruth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
index 720f90157c..7701c4bef7 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
@@ -44,7 +44,7 @@ public class Q00119_LastImperialPrince extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
index 84e03ee2a4..cdaa5c33f0 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
@@ -46,7 +46,7 @@ public class Q00124_MeetingTheElroki extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
index 0f59ea74d7..34b0e7404d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
@@ -77,7 +77,7 @@ public class Q00125_TheNameOfEvil1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
index c880bfcd78..2cdaa0aa91 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
@@ -55,7 +55,7 @@ public class Q00126_TheNameOfEvil2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
index 452b42393c..e923610ac9 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
@@ -82,7 +82,7 @@ public class Q00128_PailakaSongOfIceAndFire extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java
index 8afec644ae..f60ce01f79 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java
@@ -68,7 +68,7 @@ public class Q00129_PailakaDevilsLegacy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
index 3b340ac633..7d7eeb1bf5 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
@@ -72,7 +72,7 @@ public class Q00134_TempleMissionary extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
index b16e0481cc..c9771f6f78 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
@@ -70,7 +70,7 @@ public class Q00135_TempleExecutor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
index 62a45e847c..7e8051404a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
@@ -82,7 +82,7 @@ public class Q00136_MoreThanMeetsTheEye extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
index bd8fa776f8..786030dbaa 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
@@ -66,7 +66,7 @@ public class Q00137_TempleChampionPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
index ca37a25537..6d1b504de8 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
@@ -64,7 +64,7 @@ public class Q00138_TempleChampionPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
index df1521d00e..ff220cfb81 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
@@ -59,7 +59,7 @@ public class Q00139_ShadowFoxPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
index 2a37d17413..a168e639b0 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
@@ -68,7 +68,7 @@ public class Q00140_ShadowFoxPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
index c9b1f579f9..0df4d73fda 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
@@ -63,7 +63,7 @@ public class Q00141_ShadowFoxPart3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player, false);
 		if (st == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
index 0c1af718d5..78fb0e0b32 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
@@ -73,7 +73,7 @@ public class Q00142_FallenAngelRequestOfDawn extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
index 78a954764d..9d44b1bc42 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
@@ -52,7 +52,7 @@ public class Q00143_FallenAngelRequestOfDusk extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java
index 8f024cd03b..686696b998 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java
@@ -99,7 +99,7 @@ public class Q00144_PailakaInjuredDragon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java
index e22a0075dd..856ecd88b0 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java
@@ -53,7 +53,7 @@ public class Q00146_TheZeroHour extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java
index f197dee99a..44145d4eed 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java
@@ -50,7 +50,7 @@ public class Q00149_PrimalMotherIstina extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java
index 04ab71a2eb..2d50cdf25e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java
@@ -49,7 +49,7 @@ public class Q00150_ExtremeChallengePrimalMotherResurrected extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
index 22ae037b8c..55261fadf8 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
@@ -69,7 +69,7 @@ public class Q00177_SplitDestiny extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00180_InfernalFlamesBurningInCrystalPrison/Q00180_InfernalFlamesBurningInCrystalPrison.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00180_InfernalFlamesBurningInCrystalPrison/Q00180_InfernalFlamesBurningInCrystalPrison.java
index 3aadc906fe..7a005c6b00 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00180_InfernalFlamesBurningInCrystalPrison/Q00180_InfernalFlamesBurningInCrystalPrison.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00180_InfernalFlamesBurningInCrystalPrison/Q00180_InfernalFlamesBurningInCrystalPrison.java
@@ -53,7 +53,7 @@ public class Q00180_InfernalFlamesBurningInCrystalPrison extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java
index a325fcb987..d44207205c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java
@@ -54,7 +54,7 @@ public class Q00181_DevilsStrikeBackAdventOfBalok extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java
index 2c9337e950..cf6321781b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java
@@ -47,7 +47,7 @@ public class Q00183_RelicExploration extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java
index 56fa89ac7f..416ef1fbd8 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java
@@ -54,7 +54,7 @@ public class Q00184_ArtOfPersuasion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java
index f98dd20667..5a3e22a29c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java
@@ -54,7 +54,7 @@ public class Q00185_NikolasCooperation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java
index e02899fc82..bc04a591e4 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java
@@ -68,7 +68,7 @@ public class Q00186_ContractExecution extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java
index 9c540f6338..a2460cb6c8 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java
@@ -49,7 +49,7 @@ public class Q00187_NikolasHeart extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java
index 1c1777caec..47b0cf65fc 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java
@@ -52,7 +52,7 @@ public class Q00188_SealRemoval extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java
index 5af9afe0fd..68da52d09c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java
@@ -49,7 +49,7 @@ public class Q00189_ContractCompletion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java
index 898d20eee3..45237f5fde 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java
@@ -46,7 +46,7 @@ public class Q00190_LostDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java
index ebc1748aa6..5fcd0f8944 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java
@@ -49,7 +49,7 @@ public class Q00191_VainConclusion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java
index 07c28bdb93..88b7048a5f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java
@@ -52,7 +52,7 @@ public class Q00192_SevenSignsSeriesOfDoubt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
index f81be2e67f..78a292d3d9 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
@@ -66,7 +66,7 @@ public class Q00193_SevenSignsDyingMessage extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == SHILENS_EVIL_THOUGHTS) && "despawn".equals(event))
 		{
@@ -76,7 +76,7 @@ public class Q00193_SevenSignsDyingMessage extends Quest
 				npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.NEXT_TIME_YOU_WILL_NOT_ESCAPE);
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
index 63ec681f3e..1420f8b7af 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
@@ -63,7 +63,7 @@ public class Q00194_SevenSignsMammonsContract extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java
index 4c400a55b1..122ede966b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java
@@ -62,7 +62,7 @@ public class Q00195_SevenSignsSecretRitualOfThePriests extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java
index 5320deacab..129c02898e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java
@@ -60,14 +60,14 @@ public class Q00196_SevenSignsSealOfTheEmperor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == MERCHANT_OF_MAMMON) && "DESPAWN".equals(event))
 		{
 			isBusy = false;
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THE_ANCIENT_PROMISE_TO_THE_EMPEROR_HAS_BEEN_FULFILLED);
 			npc.deleteMe();
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
index 5dab25e1e5..092819fee0 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
@@ -62,7 +62,7 @@ public class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == SHILENS_EVIL_THOUGHTS) && "despawn".equals(event))
 		{
@@ -72,7 +72,7 @@ public class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
 				npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.NEXT_TIME_YOU_WILL_NOT_ESCAPE);
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
index c026781542..c1400b2fe9 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
@@ -65,7 +65,7 @@ public class Q00198_SevenSignsEmbryo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == SHILENS_EVIL_THOUGHTS) && "despawn".equals(event))
 		{
@@ -75,7 +75,7 @@ public class Q00198_SevenSignsEmbryo extends Quest
 				npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.NEXT_TIME_YOU_WILL_NOT_ESCAPE);
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java
index aaf98cd2ae..3495505fb2 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java
@@ -47,7 +47,7 @@ public class Q00210_ObtainAWolfPet extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java
index d0ea67a785..87a060a1c1 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java
@@ -56,7 +56,7 @@ public class Q00237_WindsOfChange extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java
index 31a6cd6c0f..006525cd6f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java
@@ -58,7 +58,7 @@ public class Q00238_SuccessFailureOfBusiness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java
index 1318b53727..e31a6f3e4f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java
@@ -58,7 +58,7 @@ public class Q00239_WontYouJoinUs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
index b8e21a687e..631714d268 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
@@ -65,7 +65,7 @@ public class Q00240_ImTheOnlyOneYouCanTrust extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java
index d563a46c8c..282ad1a84b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java
@@ -135,7 +135,7 @@ public class Q00254_LegendaryTales extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java
index 5ff293f59c..69d9549a06 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java
@@ -61,7 +61,7 @@ public class Q00270_TheOneWhoEndsSilence extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java
index 74b891182a..812619fff6 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java
@@ -50,7 +50,7 @@ public class Q00278_HomeSecurity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
index 0680c8e1ac..8002b57df8 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
@@ -73,7 +73,7 @@ public class Q00310_OnlyWhatRemains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
index a5a6fafea2..edae9395ac 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
@@ -113,7 +113,7 @@ public class Q00337_AudienceWithTheLandDragon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
index c8a74d6b71..0bbbc76a1c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
@@ -87,7 +87,7 @@ public class Q00344_1000YearsTheEndOfLamentation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java
index ffe42d334e..be857602fe 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java
@@ -86,7 +86,7 @@ public class Q00371_ShrieksOfGhosts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
index e61f3448e2..d5d9f396a3 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
@@ -124,7 +124,7 @@ public class Q00386_StolenDignity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (npc.getId() == WAREHOUSE_KEEPER_ROMP))
@@ -259,7 +259,7 @@ public class Q00386_StolenDignity extends Quest
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private String takeHtml(Player player, QuestState qs, int num)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
index 7726a3df5d..3e481e9b26 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
@@ -126,7 +126,7 @@ public class Q00420_LittleWing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
index 6390601ce2..14cbad6537 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
@@ -86,7 +86,7 @@ public class Q00421_LittleWingsBigAdventure extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
index 47fc9d7da4..ee9504f119 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
@@ -54,7 +54,7 @@ public class Q00450_GraveRobberRescue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
index 47e03b544f..e38e415a0a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
@@ -61,7 +61,7 @@ public class Q00451_LuciensAltar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
index 946e2fb51d..be55660c3e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
@@ -50,7 +50,7 @@ public class Q00452_FindingtheLostSoldiers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
index 76ba1205f5..18e37daee3 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
@@ -174,7 +174,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java
index 507820dc6a..0fd000078b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java
@@ -63,7 +63,7 @@ public class Q00454_CompletelyLost extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
index 6daf2a37e3..f67b20750b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
@@ -91,7 +91,7 @@ public class Q00455_WingsOfSand extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
index 10f2f47f73..cabd56f883 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
@@ -230,7 +230,7 @@ public class Q00456_DontKnowDontCare extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java
index 524655a0ae..3aa766a77b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java
@@ -65,7 +65,7 @@ public class Q00457_LostAndFound extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java
index 05ac4029e1..baf20da08a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java
@@ -83,7 +83,7 @@ public class Q00458_PerfectForm extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String noQuest = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00459_TheVillainOfTheUndergroundMineTeredor/Q00459_TheVillainOfTheUndergroundMineTeredor.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00459_TheVillainOfTheUndergroundMineTeredor/Q00459_TheVillainOfTheUndergroundMineTeredor.java
index bcec6a35af..0cf6ea0dcb 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00459_TheVillainOfTheUndergroundMineTeredor/Q00459_TheVillainOfTheUndergroundMineTeredor.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00459_TheVillainOfTheUndergroundMineTeredor/Q00459_TheVillainOfTheUndergroundMineTeredor.java
@@ -51,7 +51,7 @@ public class Q00459_TheVillainOfTheUndergroundMineTeredor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00460_PreciousResearchMaterial/Q00460_PreciousResearchMaterial.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00460_PreciousResearchMaterial/Q00460_PreciousResearchMaterial.java
index fb020c3040..981ff3c14e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00460_PreciousResearchMaterial/Q00460_PreciousResearchMaterial.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00460_PreciousResearchMaterial/Q00460_PreciousResearchMaterial.java
@@ -52,7 +52,7 @@ public class Q00460_PreciousResearchMaterial extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java
index bdda5c0ff1..2092e40879 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java
@@ -71,7 +71,7 @@ public class Q00462_StuffedAncientHeroes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java
index f7dbd2b655..4b978752e6 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java
@@ -87,7 +87,7 @@ public class Q00464_Oath extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00465_WeAreFriends/Q00465_WeAreFriends.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00465_WeAreFriends/Q00465_WeAreFriends.java
index 52d86f67f3..af30a59f5d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00465_WeAreFriends/Q00465_WeAreFriends.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00465_WeAreFriends/Q00465_WeAreFriends.java
@@ -51,7 +51,7 @@ public class Q00465_WeAreFriends extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java
index c350641b85..3eb4b71954 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java
@@ -83,7 +83,7 @@ public class Q00466_PlacingMySmallPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00468_BeLostInTheMysteriousScent/Q00468_BeLostInTheMysteriousScent.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00468_BeLostInTheMysteriousScent/Q00468_BeLostInTheMysteriousScent.java
index d880c919e2..5b347e1276 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00468_BeLostInTheMysteriousScent/Q00468_BeLostInTheMysteriousScent.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00468_BeLostInTheMysteriousScent/Q00468_BeLostInTheMysteriousScent.java
@@ -53,7 +53,7 @@ public class Q00468_BeLostInTheMysteriousScent extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00469_SuspiciousGardener/Q00469_SuspiciousGardener.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00469_SuspiciousGardener/Q00469_SuspiciousGardener.java
index 77e00cc205..c739186b4d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00469_SuspiciousGardener/Q00469_SuspiciousGardener.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00469_SuspiciousGardener/Q00469_SuspiciousGardener.java
@@ -52,7 +52,7 @@ public class Q00469_SuspiciousGardener extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00470_DivinityProtector/Q00470_DivinityProtector.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00470_DivinityProtector/Q00470_DivinityProtector.java
index 73c7cefac0..4948dcf1ee 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00470_DivinityProtector/Q00470_DivinityProtector.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00470_DivinityProtector/Q00470_DivinityProtector.java
@@ -72,7 +72,7 @@ public class Q00470_DivinityProtector extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00471_BreakingThroughTheEmeraldSquare/Q00471_BreakingThroughTheEmeraldSquare.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00471_BreakingThroughTheEmeraldSquare/Q00471_BreakingThroughTheEmeraldSquare.java
index 78f677a640..c563bbad31 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00471_BreakingThroughTheEmeraldSquare/Q00471_BreakingThroughTheEmeraldSquare.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00471_BreakingThroughTheEmeraldSquare/Q00471_BreakingThroughTheEmeraldSquare.java
@@ -50,7 +50,7 @@ public class Q00471_BreakingThroughTheEmeraldSquare extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00472_ChallengeSteamCorridor/Q00472_ChallengeSteamCorridor.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00472_ChallengeSteamCorridor/Q00472_ChallengeSteamCorridor.java
index 69f96d292c..0d36fed463 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00472_ChallengeSteamCorridor/Q00472_ChallengeSteamCorridor.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00472_ChallengeSteamCorridor/Q00472_ChallengeSteamCorridor.java
@@ -50,7 +50,7 @@ public class Q00472_ChallengeSteamCorridor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00473_InTheCoralGarden/Q00473_InTheCoralGarden.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00473_InTheCoralGarden/Q00473_InTheCoralGarden.java
index 3331b4528f..7489bd9a3f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00473_InTheCoralGarden/Q00473_InTheCoralGarden.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00473_InTheCoralGarden/Q00473_InTheCoralGarden.java
@@ -50,7 +50,7 @@ public class Q00473_InTheCoralGarden extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00474_WaitingForTheSummer/Q00474_WaitingForTheSummer.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00474_WaitingForTheSummer/Q00474_WaitingForTheSummer.java
index 51691cc5ff..7d5a64da50 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00474_WaitingForTheSummer/Q00474_WaitingForTheSummer.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00474_WaitingForTheSummer/Q00474_WaitingForTheSummer.java
@@ -59,7 +59,7 @@ public class Q00474_WaitingForTheSummer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java
index 3890d7cd62..d98e0f6ace 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java
@@ -79,7 +79,7 @@ public class Q00476_PlainMission extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00482_RecertificationOfValue/Q00482_RecertificationOfValue.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00482_RecertificationOfValue/Q00482_RecertificationOfValue.java
index 62d524dfd3..35d3fa4406 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00482_RecertificationOfValue/Q00482_RecertificationOfValue.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00482_RecertificationOfValue/Q00482_RecertificationOfValue.java
@@ -131,7 +131,7 @@ public class Q00482_RecertificationOfValue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java
index e15e32b144..c10c564ffb 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java
@@ -68,7 +68,7 @@ public class Q00483_IntendedTactic extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00485_HotSpringWater/Q00485_HotSpringWater.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00485_HotSpringWater/Q00485_HotSpringWater.java
index a35badf96b..6b75b6753e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00485_HotSpringWater/Q00485_HotSpringWater.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00485_HotSpringWater/Q00485_HotSpringWater.java
@@ -62,7 +62,7 @@ public class Q00485_HotSpringWater extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00488_WondersOfCaring/Q00488_WondersOfCaring.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00488_WondersOfCaring/Q00488_WondersOfCaring.java
index a310d9ea60..7f6097ddf1 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00488_WondersOfCaring/Q00488_WondersOfCaring.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00488_WondersOfCaring/Q00488_WondersOfCaring.java
@@ -61,7 +61,7 @@ public class Q00488_WondersOfCaring extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00489_InThisQuietPlace/Q00489_InThisQuietPlace.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00489_InThisQuietPlace/Q00489_InThisQuietPlace.java
index 6da9fd75c7..12cf169210 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00489_InThisQuietPlace/Q00489_InThisQuietPlace.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00489_InThisQuietPlace/Q00489_InThisQuietPlace.java
@@ -58,7 +58,7 @@ public class Q00489_InThisQuietPlace extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00491_InNominePatris/Q00491_InNominePatris.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00491_InNominePatris/Q00491_InNominePatris.java
index 3090a9cabe..915b628983 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00491_InNominePatris/Q00491_InNominePatris.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00491_InNominePatris/Q00491_InNominePatris.java
@@ -63,7 +63,7 @@ public class Q00491_InNominePatris extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00492_TombRaiders/Q00492_TombRaiders.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00492_TombRaiders/Q00492_TombRaiders.java
index e45ffa88ae..78553efafa 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00492_TombRaiders/Q00492_TombRaiders.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00492_TombRaiders/Q00492_TombRaiders.java
@@ -59,7 +59,7 @@ public class Q00492_TombRaiders extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java
index 8380c30732..d8b8bd9e9e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java
@@ -53,7 +53,7 @@ public class Q00493_KickingOutUnwelcomeGuests extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java
index 0f9eb53194..4084aa0142 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java
@@ -49,7 +49,7 @@ public class Q00494_IncarnationOfGreedZellakaGroup extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java
index ccf3cd1614..e3fe44aa0f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java
@@ -49,7 +49,7 @@ public class Q00495_IncarnationOfJealousyPellineGroup extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java
index 366e0d572d..94df5d6174 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java
@@ -49,7 +49,7 @@ public class Q00496_IncarnationOfGluttonyKaliosGroup extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java
index 008f69dd2f..d1580e694f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java
@@ -49,7 +49,7 @@ public class Q00497_IncarnationOfGreedZellakaSolo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java
index fe6d1060e8..9585452d7d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java
@@ -49,7 +49,7 @@ public class Q00498_IncarnationOfJealousyPellineSolo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java
index 3023aa50c3..3c2e128522 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java
@@ -49,7 +49,7 @@ public class Q00499_IncarnationOfGluttonyKaliosSolo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
index 0bfb256a66..176b40ad56 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
@@ -69,7 +69,7 @@ public class Q00500_BrothersBoundInChains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
index 8facc4a8cd..6476fcc9c3 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
@@ -71,7 +71,7 @@ public class Q00511_AwlUnderFoot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
index eab4647ba2..31444f8866 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
@@ -58,7 +58,7 @@ public class Q00512_BladeUnderFoot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
index 0348f88e9b..f97ce90a8e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
@@ -50,7 +50,7 @@ public class Q00551_OlympiadStarter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
index 1a59edd6b7..b06358dc78 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
@@ -50,7 +50,7 @@ public class Q00553_OlympiadUndefeated extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00561_BasicMissionHarnakUndergroundRuins/Q00561_BasicMissionHarnakUndergroundRuins.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00561_BasicMissionHarnakUndergroundRuins/Q00561_BasicMissionHarnakUndergroundRuins.java
index 53f163366e..cfa2f5bc39 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00561_BasicMissionHarnakUndergroundRuins/Q00561_BasicMissionHarnakUndergroundRuins.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00561_BasicMissionHarnakUndergroundRuins/Q00561_BasicMissionHarnakUndergroundRuins.java
@@ -57,7 +57,7 @@ public class Q00561_BasicMissionHarnakUndergroundRuins extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/Q00562_BasicMissionAltarOfEvil.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/Q00562_BasicMissionAltarOfEvil.java
index caec736235..d8bd97e195 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/Q00562_BasicMissionAltarOfEvil.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/Q00562_BasicMissionAltarOfEvil.java
@@ -59,7 +59,7 @@ public class Q00562_BasicMissionAltarOfEvil extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00563_BasicMissionBloodySwampland/Q00563_BasicMissionBloodySwampland.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00563_BasicMissionBloodySwampland/Q00563_BasicMissionBloodySwampland.java
index 004f18a1af..d8dcecb501 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00563_BasicMissionBloodySwampland/Q00563_BasicMissionBloodySwampland.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00563_BasicMissionBloodySwampland/Q00563_BasicMissionBloodySwampland.java
@@ -52,7 +52,7 @@ public class Q00563_BasicMissionBloodySwampland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00564_BasicMissionKartiasLabyrinthSolo/Q00564_BasicMissionKartiasLabyrinthSolo.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00564_BasicMissionKartiasLabyrinthSolo/Q00564_BasicMissionKartiasLabyrinthSolo.java
index e7623f44b5..045a438def 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00564_BasicMissionKartiasLabyrinthSolo/Q00564_BasicMissionKartiasLabyrinthSolo.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00564_BasicMissionKartiasLabyrinthSolo/Q00564_BasicMissionKartiasLabyrinthSolo.java
@@ -52,7 +52,7 @@ public class Q00564_BasicMissionKartiasLabyrinthSolo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00565_BasicMissionFairySettlementWest/Q00565_BasicMissionFairySettlementWest.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00565_BasicMissionFairySettlementWest/Q00565_BasicMissionFairySettlementWest.java
index da8450a569..a71fac1255 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00565_BasicMissionFairySettlementWest/Q00565_BasicMissionFairySettlementWest.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00565_BasicMissionFairySettlementWest/Q00565_BasicMissionFairySettlementWest.java
@@ -60,7 +60,7 @@ public class Q00565_BasicMissionFairySettlementWest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00566_BasicMissionFairySettlementEast/Q00566_BasicMissionFairySettlementEast.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00566_BasicMissionFairySettlementEast/Q00566_BasicMissionFairySettlementEast.java
index b1dab8528f..13a04f411f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00566_BasicMissionFairySettlementEast/Q00566_BasicMissionFairySettlementEast.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00566_BasicMissionFairySettlementEast/Q00566_BasicMissionFairySettlementEast.java
@@ -60,7 +60,7 @@ public class Q00566_BasicMissionFairySettlementEast extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00567_BasicMissionIsleOfSouls/Q00567_BasicMissionIsleOfSouls.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00567_BasicMissionIsleOfSouls/Q00567_BasicMissionIsleOfSouls.java
index 94e73d544e..c0387e3227 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00567_BasicMissionIsleOfSouls/Q00567_BasicMissionIsleOfSouls.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00567_BasicMissionIsleOfSouls/Q00567_BasicMissionIsleOfSouls.java
@@ -55,7 +55,7 @@ public class Q00567_BasicMissionIsleOfSouls extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00568_SpecialMissionNornilsCave/Q00568_SpecialMissionNornilsCave.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00568_SpecialMissionNornilsCave/Q00568_SpecialMissionNornilsCave.java
index c2dda471f8..f55baea30c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00568_SpecialMissionNornilsCave/Q00568_SpecialMissionNornilsCave.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00568_SpecialMissionNornilsCave/Q00568_SpecialMissionNornilsCave.java
@@ -55,7 +55,7 @@ public class Q00568_SpecialMissionNornilsCave extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00569_BasicMissionSealOfShilen/Q00569_BasicMissionSealOfShilen.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00569_BasicMissionSealOfShilen/Q00569_BasicMissionSealOfShilen.java
index c2cc6249be..9ad439ff60 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00569_BasicMissionSealOfShilen/Q00569_BasicMissionSealOfShilen.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00569_BasicMissionSealOfShilen/Q00569_BasicMissionSealOfShilen.java
@@ -51,7 +51,7 @@ public class Q00569_BasicMissionSealOfShilen extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00570_SpecialMissionKartiasLabyrinthParty/Q00570_SpecialMissionKartiasLabyrinthParty.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00570_SpecialMissionKartiasLabyrinthParty/Q00570_SpecialMissionKartiasLabyrinthParty.java
index 0286f4afed..021dfd2334 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00570_SpecialMissionKartiasLabyrinthParty/Q00570_SpecialMissionKartiasLabyrinthParty.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00570_SpecialMissionKartiasLabyrinthParty/Q00570_SpecialMissionKartiasLabyrinthParty.java
@@ -49,7 +49,7 @@ public class Q00570_SpecialMissionKartiasLabyrinthParty extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00571_SpecialMissionProofOfUnityFieldRaid/Q00571_SpecialMissionProofOfUnityFieldRaid.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00571_SpecialMissionProofOfUnityFieldRaid/Q00571_SpecialMissionProofOfUnityFieldRaid.java
index 8bb700546b..1fa51e0924 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00571_SpecialMissionProofOfUnityFieldRaid/Q00571_SpecialMissionProofOfUnityFieldRaid.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00571_SpecialMissionProofOfUnityFieldRaid/Q00571_SpecialMissionProofOfUnityFieldRaid.java
@@ -74,7 +74,7 @@ public class Q00571_SpecialMissionProofOfUnityFieldRaid extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00572_SpecialMissionProofOfCourageFieldRaid/Q00572_SpecialMissionProofOfCourageFieldRaid.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00572_SpecialMissionProofOfCourageFieldRaid/Q00572_SpecialMissionProofOfCourageFieldRaid.java
index 600a2aba94..c1df40aa33 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00572_SpecialMissionProofOfCourageFieldRaid/Q00572_SpecialMissionProofOfCourageFieldRaid.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00572_SpecialMissionProofOfCourageFieldRaid/Q00572_SpecialMissionProofOfCourageFieldRaid.java
@@ -79,7 +79,7 @@ public class Q00572_SpecialMissionProofOfCourageFieldRaid extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00573_SpecialMissionProofOfStrengthFieldRaid/Q00573_SpecialMissionProofOfStrengthFieldRaid.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00573_SpecialMissionProofOfStrengthFieldRaid/Q00573_SpecialMissionProofOfStrengthFieldRaid.java
index a6f3ebf8bd..d25c7a7581 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00573_SpecialMissionProofOfStrengthFieldRaid/Q00573_SpecialMissionProofOfStrengthFieldRaid.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00573_SpecialMissionProofOfStrengthFieldRaid/Q00573_SpecialMissionProofOfStrengthFieldRaid.java
@@ -79,7 +79,7 @@ public class Q00573_SpecialMissionProofOfStrengthFieldRaid extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00574_SpecialMissionNornilsGarden/Q00574_SpecialMissionNornilsGarden.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00574_SpecialMissionNornilsGarden/Q00574_SpecialMissionNornilsGarden.java
index 7255a1d251..acf06ef049 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00574_SpecialMissionNornilsGarden/Q00574_SpecialMissionNornilsGarden.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00574_SpecialMissionNornilsGarden/Q00574_SpecialMissionNornilsGarden.java
@@ -53,7 +53,7 @@ public class Q00574_SpecialMissionNornilsGarden extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00576_SpecialMissionDefeatSpezion/Q00576_SpecialMissionDefeatSpezion.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00576_SpecialMissionDefeatSpezion/Q00576_SpecialMissionDefeatSpezion.java
index bea102f667..8843dd06d4 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00576_SpecialMissionDefeatSpezion/Q00576_SpecialMissionDefeatSpezion.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00576_SpecialMissionDefeatSpezion/Q00576_SpecialMissionDefeatSpezion.java
@@ -52,7 +52,7 @@ public class Q00576_SpecialMissionDefeatSpezion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00580_BeyondTheMemories/Q00580_BeyondTheMemories.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00580_BeyondTheMemories/Q00580_BeyondTheMemories.java
index 6a4cbc7cc8..1ffd6c1de5 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00580_BeyondTheMemories/Q00580_BeyondTheMemories.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00580_BeyondTheMemories/Q00580_BeyondTheMemories.java
@@ -87,7 +87,7 @@ public class Q00580_BeyondTheMemories extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00581_ThePurificationRitual/Q00581_ThePurificationRitual.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00581_ThePurificationRitual/Q00581_ThePurificationRitual.java
index ca81196dfe..5f925fce24 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00581_ThePurificationRitual/Q00581_ThePurificationRitual.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00581_ThePurificationRitual/Q00581_ThePurificationRitual.java
@@ -76,7 +76,7 @@ public class Q00581_ThePurificationRitual extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00582_WashBloodWithBlood/Q00582_WashBloodWithBlood.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00582_WashBloodWithBlood/Q00582_WashBloodWithBlood.java
index b1e14fd0e8..c019ae7c5d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00582_WashBloodWithBlood/Q00582_WashBloodWithBlood.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00582_WashBloodWithBlood/Q00582_WashBloodWithBlood.java
@@ -79,7 +79,7 @@ public class Q00582_WashBloodWithBlood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00583_MeaningOfSurvival/Q00583_MeaningOfSurvival.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00583_MeaningOfSurvival/Q00583_MeaningOfSurvival.java
index 9d628426d8..34e049ccb7 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00583_MeaningOfSurvival/Q00583_MeaningOfSurvival.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00583_MeaningOfSurvival/Q00583_MeaningOfSurvival.java
@@ -77,7 +77,7 @@ public class Q00583_MeaningOfSurvival extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00584_NeverSayGoodBye/Q00584_NeverSayGoodBye.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00584_NeverSayGoodBye/Q00584_NeverSayGoodBye.java
index 1af272b77e..a4addd8708 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00584_NeverSayGoodBye/Q00584_NeverSayGoodBye.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00584_NeverSayGoodBye/Q00584_NeverSayGoodBye.java
@@ -80,7 +80,7 @@ public class Q00584_NeverSayGoodBye extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00585_CantGoAgainstTheTime/Q00585_CantGoAgainstTheTime.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00585_CantGoAgainstTheTime/Q00585_CantGoAgainstTheTime.java
index 01371768ba..ee46da0fa7 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00585_CantGoAgainstTheTime/Q00585_CantGoAgainstTheTime.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00585_CantGoAgainstTheTime/Q00585_CantGoAgainstTheTime.java
@@ -72,7 +72,7 @@ public class Q00585_CantGoAgainstTheTime extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00586_MutatedCreatures/Q00586_MutatedCreatures.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00586_MutatedCreatures/Q00586_MutatedCreatures.java
index 9d985e8c90..5c793893ad 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00586_MutatedCreatures/Q00586_MutatedCreatures.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00586_MutatedCreatures/Q00586_MutatedCreatures.java
@@ -51,7 +51,7 @@ public class Q00586_MutatedCreatures extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00587_MoreAggressiveOperation/Q00587_MoreAggressiveOperation.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00587_MoreAggressiveOperation/Q00587_MoreAggressiveOperation.java
index fba5c2202c..cca3219ed2 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00587_MoreAggressiveOperation/Q00587_MoreAggressiveOperation.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00587_MoreAggressiveOperation/Q00587_MoreAggressiveOperation.java
@@ -78,7 +78,7 @@ public class Q00587_MoreAggressiveOperation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00588_HeadOnCrash/Q00588_HeadOnCrash.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00588_HeadOnCrash/Q00588_HeadOnCrash.java
index 1366535ddf..708560b434 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00588_HeadOnCrash/Q00588_HeadOnCrash.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00588_HeadOnCrash/Q00588_HeadOnCrash.java
@@ -55,7 +55,7 @@ public class Q00588_HeadOnCrash extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
index 295b613316..d362ed8b48 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
@@ -84,7 +84,7 @@ public class Q00617_GatherTheFlames extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
index 22d8a3f362..481380c065 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
@@ -65,7 +65,7 @@ public class Q00618_IntoTheFlame extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
index 24dc552a09..554a65b448 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
@@ -108,7 +108,7 @@ public class Q00620_FourGoblets extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = player.getQuestState(getName());
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
index effc3c81e3..e473202bfa 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
@@ -62,7 +62,7 @@ public class Q00621_EggDelivery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
index 8a857ca301..0aa311db9e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
@@ -62,7 +62,7 @@ public class Q00622_SpecialtyLiquorDelivery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
index a464df7f99..a0ed4ec2a8 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
@@ -66,7 +66,7 @@ public class Q00623_TheFinestFood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
index 335ef36527..882e4a1ad1 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
@@ -78,7 +78,7 @@ public class Q00627_HeartInSearchOfPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
index 79d69e4221..d4e6a5b7a8 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
@@ -88,7 +88,7 @@ public class Q00631_DeliciousTopChoiceMeat extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
index 6ab1e34b5a..f7548f5322 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
@@ -57,7 +57,7 @@ public class Q00641_AttackSailren extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
index 3ad4eb9269..f4030b7e1d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
@@ -66,7 +66,7 @@ public class Q00642_APowerfulPrimevalCreature extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
index 41c5a83b2a..48d241ef82 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
@@ -103,7 +103,7 @@ public class Q00643_RiseAndFallOfTheElrokiTribe extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
index dec61c1331..ac5cb7ff52 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
@@ -59,7 +59,7 @@ public class Q00645_GhostsOfBatur extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
index 6f6013cac1..ff2f3a5bfe 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
@@ -99,7 +99,7 @@ public class Q00648_AnIceMerchantsDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		final QuestState q115 = player.getQuestState(Q00115_TheOtherSideOfTruth.class.getSimpleName());
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
index e012de30f8..b36fd12f72 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
@@ -90,7 +90,7 @@ public class Q00662_AGameOfCards extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
index 3b05df07a2..51e520cc09 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
@@ -153,7 +153,7 @@ public class Q00663_SeductiveWhispers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00665_BasicTrainingForHunterGuildMember/Q00665_BasicTrainingForHunterGuildMember.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00665_BasicTrainingForHunterGuildMember/Q00665_BasicTrainingForHunterGuildMember.java
index d5ea1aeadc..1dd72a5854 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00665_BasicTrainingForHunterGuildMember/Q00665_BasicTrainingForHunterGuildMember.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00665_BasicTrainingForHunterGuildMember/Q00665_BasicTrainingForHunterGuildMember.java
@@ -64,7 +64,7 @@ public class Q00665_BasicTrainingForHunterGuildMember extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00666_HunterGuildMembersKnowledge/Q00666_HunterGuildMembersKnowledge.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00666_HunterGuildMembersKnowledge/Q00666_HunterGuildMembersKnowledge.java
index b39573ac0b..b1205ef9b6 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00666_HunterGuildMembersKnowledge/Q00666_HunterGuildMembersKnowledge.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00666_HunterGuildMembersKnowledge/Q00666_HunterGuildMembersKnowledge.java
@@ -69,7 +69,7 @@ public class Q00666_HunterGuildMembersKnowledge extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00667_HowToCoverShilensEyes/Q00667_HowToCoverShilensEyes.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00667_HowToCoverShilensEyes/Q00667_HowToCoverShilensEyes.java
index 462952ed55..d039ce3e6b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00667_HowToCoverShilensEyes/Q00667_HowToCoverShilensEyes.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00667_HowToCoverShilensEyes/Q00667_HowToCoverShilensEyes.java
@@ -61,7 +61,7 @@ public final class Q00667_HowToCoverShilensEyes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00668_ABattleWithTheGiants/Q00668_ABattleWithTheGiants.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00668_ABattleWithTheGiants/Q00668_ABattleWithTheGiants.java
index 0115611bea..9a2f5d7c44 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00668_ABattleWithTheGiants/Q00668_ABattleWithTheGiants.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00668_ABattleWithTheGiants/Q00668_ABattleWithTheGiants.java
@@ -58,7 +58,7 @@ public class Q00668_ABattleWithTheGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00669_DesperateFightWithTheDragons/Q00669_DesperateFightWithTheDragons.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00669_DesperateFightWithTheDragons/Q00669_DesperateFightWithTheDragons.java
index 86282d9458..808368ccf6 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00669_DesperateFightWithTheDragons/Q00669_DesperateFightWithTheDragons.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00669_DesperateFightWithTheDragons/Q00669_DesperateFightWithTheDragons.java
@@ -57,7 +57,7 @@ public class Q00669_DesperateFightWithTheDragons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00670_DefeatingTheLordOfSeed/Q00670_DefeatingTheLordOfSeed.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00670_DefeatingTheLordOfSeed/Q00670_DefeatingTheLordOfSeed.java
index 7d13e190f7..e8f1153c86 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00670_DefeatingTheLordOfSeed/Q00670_DefeatingTheLordOfSeed.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00670_DefeatingTheLordOfSeed/Q00670_DefeatingTheLordOfSeed.java
@@ -58,7 +58,7 @@ public class Q00670_DefeatingTheLordOfSeed extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00671_PathToFindingThePast/Q00671_PathToFindingThePast.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00671_PathToFindingThePast/Q00671_PathToFindingThePast.java
index bdf1b18f42..b033d03fa8 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00671_PathToFindingThePast/Q00671_PathToFindingThePast.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00671_PathToFindingThePast/Q00671_PathToFindingThePast.java
@@ -69,7 +69,7 @@ public class Q00671_PathToFindingThePast extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00672_ArchenemyEmbryo/Q00672_ArchenemyEmbryo.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00672_ArchenemyEmbryo/Q00672_ArchenemyEmbryo.java
index 596488f105..5b32e1a999 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00672_ArchenemyEmbryo/Q00672_ArchenemyEmbryo.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00672_ArchenemyEmbryo/Q00672_ArchenemyEmbryo.java
@@ -55,7 +55,7 @@ public class Q00672_ArchenemyEmbryo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00673_BelethAmbition/Q00673_BelethAmbition.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00673_BelethAmbition/Q00673_BelethAmbition.java
index 997841e0b2..a188d43e4d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00673_BelethAmbition/Q00673_BelethAmbition.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00673_BelethAmbition/Q00673_BelethAmbition.java
@@ -56,7 +56,7 @@ public class Q00673_BelethAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00674_ChangesInTheShadowOfTheMotherTree/Q00674_ChangesInTheShadowOfTheMotherTree.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00674_ChangesInTheShadowOfTheMotherTree/Q00674_ChangesInTheShadowOfTheMotherTree.java
index 2b5d58ddae..0273703923 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00674_ChangesInTheShadowOfTheMotherTree/Q00674_ChangesInTheShadowOfTheMotherTree.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00674_ChangesInTheShadowOfTheMotherTree/Q00674_ChangesInTheShadowOfTheMotherTree.java
@@ -72,7 +72,7 @@ public class Q00674_ChangesInTheShadowOfTheMotherTree extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00675_WhatTheThreadOfThePastShows/Q00675_WhatTheThreadOfThePastShows.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00675_WhatTheThreadOfThePastShows/Q00675_WhatTheThreadOfThePastShows.java
index c6b5ce237a..7762bddd90 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00675_WhatTheThreadOfThePastShows/Q00675_WhatTheThreadOfThePastShows.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00675_WhatTheThreadOfThePastShows/Q00675_WhatTheThreadOfThePastShows.java
@@ -64,7 +64,7 @@ public class Q00675_WhatTheThreadOfThePastShows extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
index 1dfdc81b32..e1e41ba51e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
@@ -49,7 +49,7 @@ public class Q00688_DefeatTheElrokianRaiders extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
index 0278e46ec2..17895d5c45 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
@@ -69,7 +69,7 @@ public class Q00726_LightWithinTheDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
index da19640964..bd744f7aaa 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
@@ -57,7 +57,7 @@ public class Q00727_HopeWithinTheDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00737_ASwordHiddenInASmile/Q00737_ASwordHiddenInASmile.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00737_ASwordHiddenInASmile/Q00737_ASwordHiddenInASmile.java
index 1033d9d208..4095fdfb2b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00737_ASwordHiddenInASmile/Q00737_ASwordHiddenInASmile.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00737_ASwordHiddenInASmile/Q00737_ASwordHiddenInASmile.java
@@ -61,7 +61,7 @@ public class Q00737_ASwordHiddenInASmile extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00738_DimensionalExplorationOfTheUnworldlyVisitors/Q00738_DimensionalExplorationOfTheUnworldlyVisitors.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00738_DimensionalExplorationOfTheUnworldlyVisitors/Q00738_DimensionalExplorationOfTheUnworldlyVisitors.java
index 0956613cc1..8f63f869cb 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00738_DimensionalExplorationOfTheUnworldlyVisitors/Q00738_DimensionalExplorationOfTheUnworldlyVisitors.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00738_DimensionalExplorationOfTheUnworldlyVisitors/Q00738_DimensionalExplorationOfTheUnworldlyVisitors.java
@@ -72,7 +72,7 @@ public class Q00738_DimensionalExplorationOfTheUnworldlyVisitors extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00743_AtTheAltarOfOblivion/Q00743_AtTheAltarOfOblivion.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00743_AtTheAltarOfOblivion/Q00743_AtTheAltarOfOblivion.java
index 960a737453..8d82ae530f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00743_AtTheAltarOfOblivion/Q00743_AtTheAltarOfOblivion.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00743_AtTheAltarOfOblivion/Q00743_AtTheAltarOfOblivion.java
@@ -82,7 +82,7 @@ public class Q00743_AtTheAltarOfOblivion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00744_TheAlligatorHunterReturns/Q00744_TheAlligatorHunterReturns.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00744_TheAlligatorHunterReturns/Q00744_TheAlligatorHunterReturns.java
index 4230ffc9be..ec5091f5ff 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00744_TheAlligatorHunterReturns/Q00744_TheAlligatorHunterReturns.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00744_TheAlligatorHunterReturns/Q00744_TheAlligatorHunterReturns.java
@@ -65,7 +65,7 @@ public final class Q00744_TheAlligatorHunterReturns extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00745_TheOutlawsAreIncoming/Q00745_TheOutlawsAreIncoming.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00745_TheOutlawsAreIncoming/Q00745_TheOutlawsAreIncoming.java
index a78b4b775a..2e896b781d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00745_TheOutlawsAreIncoming/Q00745_TheOutlawsAreIncoming.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00745_TheOutlawsAreIncoming/Q00745_TheOutlawsAreIncoming.java
@@ -74,7 +74,7 @@ public class Q00745_TheOutlawsAreIncoming extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00747_DefendingTheForsakenPlains/Q00747_DefendingTheForsakenPlains.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00747_DefendingTheForsakenPlains/Q00747_DefendingTheForsakenPlains.java
index 2bf41c5de2..2ce7479e4a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00747_DefendingTheForsakenPlains/Q00747_DefendingTheForsakenPlains.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00747_DefendingTheForsakenPlains/Q00747_DefendingTheForsakenPlains.java
@@ -69,7 +69,7 @@ public final class Q00747_DefendingTheForsakenPlains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00748_EndlessRevenge/Q00748_EndlessRevenge.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00748_EndlessRevenge/Q00748_EndlessRevenge.java
index b7a4d1bf37..c5186f1275 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00748_EndlessRevenge/Q00748_EndlessRevenge.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00748_EndlessRevenge/Q00748_EndlessRevenge.java
@@ -70,7 +70,7 @@ public final class Q00748_EndlessRevenge extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00749_TiesWithTheGuardians/Q00749_TiesWithTheGuardians.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00749_TiesWithTheGuardians/Q00749_TiesWithTheGuardians.java
index eb3716794f..538ea2d365 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00749_TiesWithTheGuardians/Q00749_TiesWithTheGuardians.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00749_TiesWithTheGuardians/Q00749_TiesWithTheGuardians.java
@@ -57,7 +57,7 @@ public final class Q00749_TiesWithTheGuardians extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java
index 9161bfd4b9..31eace47ba 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java
@@ -72,7 +72,7 @@ public class Q00751_LiberatingTheSpirits extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java
index 3c5f3d9861..e22b624bc5 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java
@@ -70,7 +70,7 @@ public class Q00752_UncoverTheSecret extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java
index 6f5853054b..935c3a7c37 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java
@@ -78,7 +78,7 @@ public class Q00753_ReactingToACrisis extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00754_AssistingTheRebelForces/Q00754_AssistingTheRebelForces.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00754_AssistingTheRebelForces/Q00754_AssistingTheRebelForces.java
index efd21fd055..fbbb9eb5c6 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00754_AssistingTheRebelForces/Q00754_AssistingTheRebelForces.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00754_AssistingTheRebelForces/Q00754_AssistingTheRebelForces.java
@@ -54,7 +54,7 @@ public class Q00754_AssistingTheRebelForces extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00755_InNeedOfPetras/Q00755_InNeedOfPetras.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00755_InNeedOfPetras/Q00755_InNeedOfPetras.java
index 20aa2199c8..09d9216654 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00755_InNeedOfPetras/Q00755_InNeedOfPetras.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00755_InNeedOfPetras/Q00755_InNeedOfPetras.java
@@ -67,7 +67,7 @@ public class Q00755_InNeedOfPetras extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java
index 40e84f4dd0..9038173a19 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java
@@ -48,7 +48,7 @@ public class Q00756_TopQualityPetra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java
index 1927ac253f..0b6815a166 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java
@@ -71,7 +71,7 @@ public class Q00757_TriolsMovement extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java
index 0578c5952a..c777c72641 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java
@@ -70,7 +70,7 @@ public class Q00758_TheFallenKingsMen extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00759_TheDwarvenNightmareContinues/Q00759_TheDwarvenNightmareContinues.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00759_TheDwarvenNightmareContinues/Q00759_TheDwarvenNightmareContinues.java
index e0db615674..4715b055c5 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00759_TheDwarvenNightmareContinues/Q00759_TheDwarvenNightmareContinues.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00759_TheDwarvenNightmareContinues/Q00759_TheDwarvenNightmareContinues.java
@@ -68,7 +68,7 @@ public class Q00759_TheDwarvenNightmareContinues extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java
index e163658293..33169c48a7 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java
@@ -47,7 +47,7 @@ public class Q00760_BlockTheExit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java
index bbe8918eef..42b3fd1c01 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java
@@ -87,7 +87,7 @@ public class Q00761_AssistingTheGoldenRamArmy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java
index 709817b6a5..ac13b91b3e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java
@@ -116,7 +116,7 @@ public class Q00762_AnOminousRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java
index b22bbfddc0..80637b644a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java
@@ -76,7 +76,7 @@ public class Q00763_ADauntingTask extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00764_WeakeningTheVarkaSilenosForces/Q00764_WeakeningTheVarkaSilenosForces.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00764_WeakeningTheVarkaSilenosForces/Q00764_WeakeningTheVarkaSilenosForces.java
index 5e10448397..fe404d0596 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00764_WeakeningTheVarkaSilenosForces/Q00764_WeakeningTheVarkaSilenosForces.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00764_WeakeningTheVarkaSilenosForces/Q00764_WeakeningTheVarkaSilenosForces.java
@@ -73,7 +73,7 @@ public class Q00764_WeakeningTheVarkaSilenosForces extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00765_WeakeningTheKetraOrcForces/Q00765_WeakeningTheKetraOrcForces.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00765_WeakeningTheKetraOrcForces/Q00765_WeakeningTheKetraOrcForces.java
index c700da56d0..84017857a4 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00765_WeakeningTheKetraOrcForces/Q00765_WeakeningTheKetraOrcForces.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00765_WeakeningTheKetraOrcForces/Q00765_WeakeningTheKetraOrcForces.java
@@ -73,7 +73,7 @@ public class Q00765_WeakeningTheKetraOrcForces extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00772_PurifyingSouls/Q00772_PurifyingSouls.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00772_PurifyingSouls/Q00772_PurifyingSouls.java
index e0ef1a907d..7da7d40be7 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00772_PurifyingSouls/Q00772_PurifyingSouls.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00772_PurifyingSouls/Q00772_PurifyingSouls.java
@@ -69,7 +69,7 @@ public class Q00772_PurifyingSouls extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00773_ToCalmTheFlood/Q00773_ToCalmTheFlood.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00773_ToCalmTheFlood/Q00773_ToCalmTheFlood.java
index 1ff56aaed8..e8be8cda84 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00773_ToCalmTheFlood/Q00773_ToCalmTheFlood.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00773_ToCalmTheFlood/Q00773_ToCalmTheFlood.java
@@ -91,7 +91,7 @@ public class Q00773_ToCalmTheFlood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00774_DreamingOfPeace/Q00774_DreamingOfPeace.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00774_DreamingOfPeace/Q00774_DreamingOfPeace.java
index 51271afc55..26216ab6ef 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00774_DreamingOfPeace/Q00774_DreamingOfPeace.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00774_DreamingOfPeace/Q00774_DreamingOfPeace.java
@@ -88,7 +88,7 @@ public class Q00774_DreamingOfPeace extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java
index 50114439f2..c74b54e1c8 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java
@@ -82,7 +82,7 @@ public class Q00775_RetrievingTheChaosFragment extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java
index ac2f54fa8d..18b9f67179 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java
@@ -49,7 +49,7 @@ public class Q00776_SlayDarkLordEkimus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java
index dad6a31213..ff385c026f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java
@@ -50,7 +50,7 @@ public class Q00777_SlayDarkLordTiat extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java
index c2266256c4..9cf140a913 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java
@@ -76,7 +76,7 @@ public class Q00778_OperationRoaringFlame extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00779_UtilizeTheDarknessSeedOfDestruction/Q00779_UtilizeTheDarknessSeedOfDestruction.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00779_UtilizeTheDarknessSeedOfDestruction/Q00779_UtilizeTheDarknessSeedOfDestruction.java
index 15fa0b1e53..c6fac96851 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00779_UtilizeTheDarknessSeedOfDestruction/Q00779_UtilizeTheDarknessSeedOfDestruction.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00779_UtilizeTheDarknessSeedOfDestruction/Q00779_UtilizeTheDarknessSeedOfDestruction.java
@@ -72,7 +72,7 @@ public class Q00779_UtilizeTheDarknessSeedOfDestruction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00780_UtilizeTheDarknessSeedOfInfinity/Q00780_UtilizeTheDarknessSeedOfInfinity.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00780_UtilizeTheDarknessSeedOfInfinity/Q00780_UtilizeTheDarknessSeedOfInfinity.java
index a71bdf61dc..3820918c63 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00780_UtilizeTheDarknessSeedOfInfinity/Q00780_UtilizeTheDarknessSeedOfInfinity.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00780_UtilizeTheDarknessSeedOfInfinity/Q00780_UtilizeTheDarknessSeedOfInfinity.java
@@ -61,7 +61,7 @@ public class Q00780_UtilizeTheDarknessSeedOfInfinity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00781_UtilizeTheDarknessSeedOfAnnihilation/Q00781_UtilizeTheDarknessSeedOfAnnihilation.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00781_UtilizeTheDarknessSeedOfAnnihilation/Q00781_UtilizeTheDarknessSeedOfAnnihilation.java
index 190b971f36..d662d9fc6d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00781_UtilizeTheDarknessSeedOfAnnihilation/Q00781_UtilizeTheDarknessSeedOfAnnihilation.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00781_UtilizeTheDarknessSeedOfAnnihilation/Q00781_UtilizeTheDarknessSeedOfAnnihilation.java
@@ -78,7 +78,7 @@ public class Q00781_UtilizeTheDarknessSeedOfAnnihilation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00782_UtilizeTheDarknessSeedOfHellfire/Q00782_UtilizeTheDarknessSeedOfHellfire.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00782_UtilizeTheDarknessSeedOfHellfire/Q00782_UtilizeTheDarknessSeedOfHellfire.java
index 7feaaf443e..3b181f5417 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00782_UtilizeTheDarknessSeedOfHellfire/Q00782_UtilizeTheDarknessSeedOfHellfire.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00782_UtilizeTheDarknessSeedOfHellfire/Q00782_UtilizeTheDarknessSeedOfHellfire.java
@@ -79,7 +79,7 @@ public class Q00782_UtilizeTheDarknessSeedOfHellfire extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java
index f72f39a08d..0f9c11b687 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java
@@ -71,7 +71,7 @@ public class Q00783_VestigeOfTheMagicPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
@@ -175,17 +175,17 @@ public class Q00783_VestigeOfTheMagicPower extends Quest
 					else if (qs.isCond(5))
 					{
 						htmltext = "31595-05b.htm";
-						onAdvEvent(htmltext, npc, player);
+						onEvent(htmltext, npc, player);
 					}
 					else if (qs.isCond(6))
 					{
 						htmltext = "31595-06b.htm";
-						onAdvEvent(htmltext, npc, player);
+						onEvent(htmltext, npc, player);
 					}
 					else if (qs.isCond(7))
 					{
 						htmltext = "31595-07b.htm";
-						onAdvEvent(htmltext, npc, player);
+						onEvent(htmltext, npc, player);
 					}
 					else if (qs.isCond(2) || qs.isCond(3) || qs.isCond(4))
 					{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java
index 5f840ead5d..449c163fad 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java
@@ -77,7 +77,7 @@ public class Q00787_TheRoleOfAWatcher extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00789_WaitingForPaagrio/Q00789_WaitingForPaagrio.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00789_WaitingForPaagrio/Q00789_WaitingForPaagrio.java
index ab35b9c767..ea6997ed3a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00789_WaitingForPaagrio/Q00789_WaitingForPaagrio.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00789_WaitingForPaagrio/Q00789_WaitingForPaagrio.java
@@ -75,7 +75,7 @@ public final class Q00789_WaitingForPaagrio extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00790_ObtainingFerinsTrust/Q00790_ObtainingFerinsTrust.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00790_ObtainingFerinsTrust/Q00790_ObtainingFerinsTrust.java
index 7056a05ab3..a12633bddd 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00790_ObtainingFerinsTrust/Q00790_ObtainingFerinsTrust.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00790_ObtainingFerinsTrust/Q00790_ObtainingFerinsTrust.java
@@ -73,7 +73,7 @@ public class Q00790_ObtainingFerinsTrust extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00792_TheSuperionGiants/Q00792_TheSuperionGiants.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00792_TheSuperionGiants/Q00792_TheSuperionGiants.java
index a494fa2d3a..1f8af8f813 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00792_TheSuperionGiants/Q00792_TheSuperionGiants.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00792_TheSuperionGiants/Q00792_TheSuperionGiants.java
@@ -70,7 +70,7 @@ public class Q00792_TheSuperionGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00816_PlansToRepairTheStronghold/Q00816_PlansToRepairTheStronghold.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00816_PlansToRepairTheStronghold/Q00816_PlansToRepairTheStronghold.java
index 0507702506..2427136f91 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00816_PlansToRepairTheStronghold/Q00816_PlansToRepairTheStronghold.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00816_PlansToRepairTheStronghold/Q00816_PlansToRepairTheStronghold.java
@@ -65,7 +65,7 @@ public class Q00816_PlansToRepairTheStronghold extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00817_BlackAteliaResearch/Q00817_BlackAteliaResearch.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00817_BlackAteliaResearch/Q00817_BlackAteliaResearch.java
index 7296ee314b..e4de6eff53 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00817_BlackAteliaResearch/Q00817_BlackAteliaResearch.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00817_BlackAteliaResearch/Q00817_BlackAteliaResearch.java
@@ -58,7 +58,7 @@ public class Q00817_BlackAteliaResearch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00823_DisappearedRaceNewFairy/Q00823_DisappearedRaceNewFairy.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00823_DisappearedRaceNewFairy/Q00823_DisappearedRaceNewFairy.java
index cd55044b35..62d5dafe62 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00823_DisappearedRaceNewFairy/Q00823_DisappearedRaceNewFairy.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00823_DisappearedRaceNewFairy/Q00823_DisappearedRaceNewFairy.java
@@ -66,7 +66,7 @@ public class Q00823_DisappearedRaceNewFairy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00824_AttackTheCommandPost/Q00824_AttackTheCommandPost.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00824_AttackTheCommandPost/Q00824_AttackTheCommandPost.java
index db25590de0..c89f2abb8a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00824_AttackTheCommandPost/Q00824_AttackTheCommandPost.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00824_AttackTheCommandPost/Q00824_AttackTheCommandPost.java
@@ -51,7 +51,7 @@ public class Q00824_AttackTheCommandPost extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java
index 33c9979b4a..4f6a1dd284 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java
@@ -68,7 +68,7 @@ public class Q00826_InSearchOfTheSecretWeapon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java
index 8b7399c41e..739655c72f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java
@@ -89,7 +89,7 @@ public class Q00827_EinhasadsOrder extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00828_EvasBlessing/Q00828_EvasBlessing.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00828_EvasBlessing/Q00828_EvasBlessing.java
index 202e0fc3ca..72b34bd5f9 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00828_EvasBlessing/Q00828_EvasBlessing.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00828_EvasBlessing/Q00828_EvasBlessing.java
@@ -95,7 +95,7 @@ public class Q00828_EvasBlessing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00829_MaphrsSalvation/Q00829_MaphrsSalvation.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00829_MaphrsSalvation/Q00829_MaphrsSalvation.java
index 977c610974..457faaa28c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00829_MaphrsSalvation/Q00829_MaphrsSalvation.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00829_MaphrsSalvation/Q00829_MaphrsSalvation.java
@@ -54,7 +54,7 @@ public class Q00829_MaphrsSalvation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00830_TheWayOfTheGiantsPawn/Q00830_TheWayOfTheGiantsPawn.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00830_TheWayOfTheGiantsPawn/Q00830_TheWayOfTheGiantsPawn.java
index 1bac202074..64715ee4c7 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00830_TheWayOfTheGiantsPawn/Q00830_TheWayOfTheGiantsPawn.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00830_TheWayOfTheGiantsPawn/Q00830_TheWayOfTheGiantsPawn.java
@@ -89,7 +89,7 @@ public class Q00830_TheWayOfTheGiantsPawn extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java
index 9584d686bc..cb7bae51ab 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java
@@ -55,7 +55,7 @@ public class Q00831_SayhasScheme extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
index 755ff509f8..42c14d342e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
@@ -65,7 +65,7 @@ public class Q00833_DevilsTreasureTauti extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
index 6448125f2f..d2db3dae19 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
@@ -61,7 +61,7 @@ public class Q00835_PitiableMelisa extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00841_ContaminationContainment/Q00841_ContaminationContainment.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00841_ContaminationContainment/Q00841_ContaminationContainment.java
index d2e0a5f339..f11476f789 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00841_ContaminationContainment/Q00841_ContaminationContainment.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00841_ContaminationContainment/Q00841_ContaminationContainment.java
@@ -86,7 +86,7 @@ public final class Q00841_ContaminationContainment extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00842_CaptiveDemons/Q00842_CaptiveDemons.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00842_CaptiveDemons/Q00842_CaptiveDemons.java
index 6a3f793adb..7c93c26cf7 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00842_CaptiveDemons/Q00842_CaptiveDemons.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00842_CaptiveDemons/Q00842_CaptiveDemons.java
@@ -67,7 +67,7 @@ public class Q00842_CaptiveDemons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00843_GiantEvolutionControl/Q00843_GiantEvolutionControl.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00843_GiantEvolutionControl/Q00843_GiantEvolutionControl.java
index 17fbceb090..f66b6c4eec 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00843_GiantEvolutionControl/Q00843_GiantEvolutionControl.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00843_GiantEvolutionControl/Q00843_GiantEvolutionControl.java
@@ -80,7 +80,7 @@ public final class Q00843_GiantEvolutionControl extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00844_GiantsTreasure/Q00844_GiantsTreasure.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00844_GiantsTreasure/Q00844_GiantsTreasure.java
index ea0d277f7d..06827de98e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00844_GiantsTreasure/Q00844_GiantsTreasure.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00844_GiantsTreasure/Q00844_GiantsTreasure.java
@@ -63,7 +63,7 @@ public class Q00844_GiantsTreasure extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00845_SabotageTheEmbryoSupplies/Q00845_SabotageTheEmbryoSupplies.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00845_SabotageTheEmbryoSupplies/Q00845_SabotageTheEmbryoSupplies.java
index e4a2ecd1e9..c81c7e73bf 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00845_SabotageTheEmbryoSupplies/Q00845_SabotageTheEmbryoSupplies.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00845_SabotageTheEmbryoSupplies/Q00845_SabotageTheEmbryoSupplies.java
@@ -72,7 +72,7 @@ public class Q00845_SabotageTheEmbryoSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00846_BuildingUpStrength/Q00846_BuildingUpStrength.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00846_BuildingUpStrength/Q00846_BuildingUpStrength.java
index c003dafa91..69c93caa37 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00846_BuildingUpStrength/Q00846_BuildingUpStrength.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00846_BuildingUpStrength/Q00846_BuildingUpStrength.java
@@ -75,7 +75,7 @@ public final class Q00846_BuildingUpStrength extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
index 1140fc7490..2a6c62bb48 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
@@ -58,7 +58,7 @@ public class Q00901_HowLavasaurusesAreMade extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java
index b16bc679ac..d9d162c9f1 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java
@@ -77,7 +77,7 @@ public class Q00902_ReclaimOurEra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
index 8587c2f741..d15889aad7 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
@@ -55,7 +55,7 @@ public class Q00903_TheCallOfAntharas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
index 79522f8309..73589e1dbb 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
@@ -103,7 +103,7 @@ public class Q00905_RefinedDragonBlood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
index 3f6c9f9a30..4494d2a115 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
@@ -65,7 +65,7 @@ public class Q00906_TheCallOfValakas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00923_ShinedustExtraction/Q00923_ShinedustExtraction.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00923_ShinedustExtraction/Q00923_ShinedustExtraction.java
index 23a188fedb..a68c027b2a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00923_ShinedustExtraction/Q00923_ShinedustExtraction.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00923_ShinedustExtraction/Q00923_ShinedustExtraction.java
@@ -69,7 +69,7 @@ public class Q00923_ShinedustExtraction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00924_GiantOfTheRestorationRoom/Q00924_GiantOfTheRestorationRoom.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00924_GiantOfTheRestorationRoom/Q00924_GiantOfTheRestorationRoom.java
index de9e6695cc..5fe6d77b8b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00924_GiantOfTheRestorationRoom/Q00924_GiantOfTheRestorationRoom.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00924_GiantOfTheRestorationRoom/Q00924_GiantOfTheRestorationRoom.java
@@ -66,7 +66,7 @@ public class Q00924_GiantOfTheRestorationRoom extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java
index 0c68f67f34..9c53c37390 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java
@@ -58,7 +58,7 @@ public class Q00926_30DaySearchOperation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java
index 18391c86e3..a162ef4426 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java
@@ -65,7 +65,7 @@ public class Q00928_100DaySubjugationOperation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00930_DisparagingThePhantoms/Q00930_DisparagingThePhantoms.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00930_DisparagingThePhantoms/Q00930_DisparagingThePhantoms.java
index 28bb494903..755b411c57 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00930_DisparagingThePhantoms/Q00930_DisparagingThePhantoms.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00930_DisparagingThePhantoms/Q00930_DisparagingThePhantoms.java
@@ -80,7 +80,7 @@ public class Q00930_DisparagingThePhantoms extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00931_MemoriesOfTheWind/Q00931_MemoriesOfTheWind.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00931_MemoriesOfTheWind/Q00931_MemoriesOfTheWind.java
index 5f92dba5cd..31ffff4f32 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00931_MemoriesOfTheWind/Q00931_MemoriesOfTheWind.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00931_MemoriesOfTheWind/Q00931_MemoriesOfTheWind.java
@@ -78,7 +78,7 @@ public class Q00931_MemoriesOfTheWind extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00932_SayhasEnergy/Q00932_SayhasEnergy.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00932_SayhasEnergy/Q00932_SayhasEnergy.java
index 374f7566ba..2682626efb 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00932_SayhasEnergy/Q00932_SayhasEnergy.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00932_SayhasEnergy/Q00932_SayhasEnergy.java
@@ -68,7 +68,7 @@ public class Q00932_SayhasEnergy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java
index 784084e18f..3f3674f408 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java
@@ -79,7 +79,7 @@ public class Q00937_ToReviveTheFishingGuild extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java
index fcaea628f2..14766f9216 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java
@@ -73,7 +73,7 @@ public class Q00938_TheFishermansOtherHobby extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
index 2fbbe388b7..f5e61c063c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
@@ -54,7 +54,7 @@ public class Q10273_GoodDayToFly extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
index 92298a9598..c5cf9c1ed5 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
@@ -64,7 +64,7 @@ public class Q10274_CollectingInTheAir extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
index aea1e23329..adb2982ac1 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
@@ -48,7 +48,7 @@ public class Q10282_ToTheSeedOfAnnihilation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
index e5310632bd..dc9e9a1de4 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
@@ -51,7 +51,7 @@ public class Q10283_RequestOfIceMerchant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java
index c8822c8a8a..fb0cefa677 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java
@@ -54,7 +54,7 @@ public class Q10284_AcquisitionOfDivineSword extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
index a5a7eaace6..d0294d0369 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
@@ -55,7 +55,7 @@ public class Q10285_MeetingSirra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
index b9a00e8388..94f82457bd 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
@@ -56,7 +56,7 @@ public class Q10286_ReunionWithSirra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
index c072297d38..d98cd117bd 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
@@ -50,7 +50,7 @@ public class Q10287_StoryOfThoseLeft extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
index 6603c62c8f..88a4a9ebb4 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
@@ -48,7 +48,7 @@ public class Q10288_SecretMission extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java
index ebc3b15a3a..19e9c7f984 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java
@@ -48,7 +48,7 @@ public class Q10289_FadeToBlack extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
index 8ae5f96306..fe0e24dfe8 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
@@ -54,7 +54,7 @@ public class Q10290_LandDragonConqueror extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
index 093062bde0..554a7ac150 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
@@ -52,7 +52,7 @@ public class Q10291_FireDragonDestroyer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
index 4f42181d0b..38e346b1cd 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
@@ -65,7 +65,7 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java
index 9578509dc1..f80fbdc02b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java
@@ -57,7 +57,7 @@ public class Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java
index 72d0ca7ed5..0ddc585beb 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java
@@ -95,7 +95,7 @@ public class Q10294_SevenSignsToTheMonasteryOfSilence extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java
index 747a9b8e55..fff91fc378 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java
@@ -105,7 +105,7 @@ public class Q10295_SevenSignsSolinasTomb extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java
index e4cf9dbdf6..f350112a68 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java
@@ -60,7 +60,7 @@ public class Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java
index fbcd6311a7..990366217f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java
@@ -50,7 +50,7 @@ public class Q10297_GrandOpeningComeToOurPub extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java
index c7a0f3a27b..44f2de8a14 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java
@@ -71,7 +71,7 @@ public class Q10301_ShadowOfTerrorBlackishRedFog extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10302_UnsettlingShadowAndRumors/Q10302_UnsettlingShadowAndRumors.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10302_UnsettlingShadowAndRumors/Q10302_UnsettlingShadowAndRumors.java
index 35634b2208..0ef255822a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10302_UnsettlingShadowAndRumors/Q10302_UnsettlingShadowAndRumors.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10302_UnsettlingShadowAndRumors/Q10302_UnsettlingShadowAndRumors.java
@@ -51,7 +51,7 @@ public class Q10302_UnsettlingShadowAndRumors extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java
index 075ada8600..77e10de1fd 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java
@@ -75,7 +75,7 @@ public class Q10303_CrossroadsBetweenLightAndDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java
index 66cd2f1407..331fdb471c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java
@@ -75,7 +75,7 @@ public class Q10304_ForForgottenHeroes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java
index 679a617f05..f1df52055e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java
@@ -53,7 +53,7 @@ public class Q10305_UnstoppableFutileEfforts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10306_TheCorruptedLeader/Q10306_TheCorruptedLeader.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10306_TheCorruptedLeader/Q10306_TheCorruptedLeader.java
index 6c34bbf0ec..e400458693 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10306_TheCorruptedLeader/Q10306_TheCorruptedLeader.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10306_TheCorruptedLeader/Q10306_TheCorruptedLeader.java
@@ -59,7 +59,7 @@ public class Q10306_TheCorruptedLeader extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java
index 836ba2610b..b557c0b277 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java
@@ -56,7 +56,7 @@ public class Q10307_TheCorruptedLeaderHisTruth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10310_TwistedCreationTree/Q10310_TwistedCreationTree.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10310_TwistedCreationTree/Q10310_TwistedCreationTree.java
index 9a5f3e93df..6eb9953cdc 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10310_TwistedCreationTree/Q10310_TwistedCreationTree.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10310_TwistedCreationTree/Q10310_TwistedCreationTree.java
@@ -56,7 +56,7 @@ public class Q10310_TwistedCreationTree extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java
index 9e2c35dd09..8971512507 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java
@@ -46,7 +46,7 @@ public class Q10311_PeacefulDaysAreOver extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java
index c7dc807cdf..40c76b9e2f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java
@@ -55,7 +55,7 @@ public class Q10312_AbandonedGodsCreature extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java
index 8f25603bcc..a17c3ebaf6 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java
@@ -49,7 +49,7 @@ public class Q10315_ToThePrisonOfDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java
index 9c05b1f86e..eed57ef8dc 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java
@@ -56,7 +56,7 @@ public class Q10316_UndecayingMemoryOfThePast extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java
index a92657082e..cb331da1d7 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java
@@ -46,7 +46,7 @@ public class Q10317_OrbisWitch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java
index b92fa5339e..d79519ea24 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java
@@ -68,7 +68,7 @@ public class Q10318_DecayingDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java
index 6400c4120b..1638f8129a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java
@@ -58,7 +58,7 @@ public class Q10320_LetsGoToTheCentralSquare extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java
index 8a5ff73015..d256763eca 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java
@@ -47,7 +47,7 @@ public class Q10321_QualificationsOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java
index 4f48c0b900..b374578bd5 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java
@@ -58,7 +58,7 @@ public class Q10330_ToTheRuinsOfYeSagira extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java
index 23babca5f8..6675e7090b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java
@@ -71,7 +71,7 @@ public class Q10331_StartOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10332_ToughRoad/Q10332_ToughRoad.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10332_ToughRoad/Q10332_ToughRoad.java
index 64f3357d45..1251f64744 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10332_ToughRoad/Q10332_ToughRoad.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10332_ToughRoad/Q10332_ToughRoad.java
@@ -57,7 +57,7 @@ public class Q10332_ToughRoad extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java
index 4e03c773a8..6a7dbf118d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java
@@ -65,7 +65,7 @@ public class Q10333_DisappearedSakum extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10334_ReportingTheStatusOfTheWindmillHill/Q10334_ReportingTheStatusOfTheWindmillHill.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10334_ReportingTheStatusOfTheWindmillHill/Q10334_ReportingTheStatusOfTheWindmillHill.java
index 48650b1ce0..da883a8f14 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10334_ReportingTheStatusOfTheWindmillHill/Q10334_ReportingTheStatusOfTheWindmillHill.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10334_ReportingTheStatusOfTheWindmillHill/Q10334_ReportingTheStatusOfTheWindmillHill.java
@@ -49,7 +49,7 @@ public class Q10334_ReportingTheStatusOfTheWindmillHill extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java
index 3e39536a87..46e88abfab 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java
@@ -58,7 +58,7 @@ public class Q10335_RequestToFindSakum extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10336_DividedSakumKanilov/Q10336_DividedSakumKanilov.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10336_DividedSakumKanilov/Q10336_DividedSakumKanilov.java
index aa5e5614ce..488bc68fca 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10336_DividedSakumKanilov/Q10336_DividedSakumKanilov.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10336_DividedSakumKanilov/Q10336_DividedSakumKanilov.java
@@ -56,7 +56,7 @@ public class Q10336_DividedSakumKanilov extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java
index f2e21d8f93..19c5ac1817 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java
@@ -58,7 +58,7 @@ public class Q10337_SakumsImpact extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
index edc0bdf638..b92033f3e6 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
@@ -66,7 +66,7 @@ public class Q10338_SeizeYourDestiny extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java
index 9bb47bafb8..718b70bbcd 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java
@@ -48,7 +48,7 @@ public class Q10341_DayOfDestinyHumansFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10341_DayOfDestinyHumansFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java
index 715453f3bb..071deb3562 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java
@@ -48,7 +48,7 @@ public class Q10342_DayOfDestinyElvenFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10342_DayOfDestinyElvenFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java
index b958ae1683..5701012e2c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java
@@ -48,7 +48,7 @@ public class Q10343_DayOfDestinyDarkElfsFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10343_DayOfDestinyDarkElfsFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java
index 3a9540d6f0..ff5519a3f1 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java
@@ -48,7 +48,7 @@ public class Q10344_DayOfDestinyOrcsFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10344_DayOfDestinyOrcsFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java
index f0b38f0d8f..9ad485a695 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java
@@ -48,7 +48,7 @@ public class Q10345_DayOfDestinyDwarfsFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10345_DayOfDestinyDwarfsFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java
index 0f3195f574..5690e3622f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java
@@ -48,7 +48,7 @@ public class Q10346_DayOfDestinyKamaelsFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10346_DayOfDestinyKamaelsFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java
index 2874c31889..6a7bf0c265 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java
@@ -51,7 +51,7 @@ public class Q10351_OwnerOfHall extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java
index 1175e2cdd1..18cd204fc0 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java
@@ -94,7 +94,7 @@ public class Q10353_CertificationOfValue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java
index ea20f5fe52..c1723c3065 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java
@@ -51,7 +51,7 @@ public class Q10354_ResurrectedOwnerOfHall extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10355_BlacksmithsSoul1/Q10355_BlacksmithsSoul1.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10355_BlacksmithsSoul1/Q10355_BlacksmithsSoul1.java
index 16e5c07fbf..28629cd353 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10355_BlacksmithsSoul1/Q10355_BlacksmithsSoul1.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10355_BlacksmithsSoul1/Q10355_BlacksmithsSoul1.java
@@ -73,7 +73,7 @@ public class Q10355_BlacksmithsSoul1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10356_BlacksmithsSoul2/Q10356_BlacksmithsSoul2.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10356_BlacksmithsSoul2/Q10356_BlacksmithsSoul2.java
index 34ddbeb550..92d621ebe8 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10356_BlacksmithsSoul2/Q10356_BlacksmithsSoul2.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10356_BlacksmithsSoul2/Q10356_BlacksmithsSoul2.java
@@ -65,7 +65,7 @@ public class Q10356_BlacksmithsSoul2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java
index d180f6cc32..3f55b11c38 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java
@@ -59,7 +59,7 @@ public class Q10358_DividedSakumPoslof extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10359_TracesOfEvil/Q10359_TracesOfEvil.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10359_TracesOfEvil/Q10359_TracesOfEvil.java
index 06b030511a..be3a0cd2a8 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10359_TracesOfEvil/Q10359_TracesOfEvil.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10359_TracesOfEvil/Q10359_TracesOfEvil.java
@@ -69,7 +69,7 @@ public class Q10359_TracesOfEvil extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java
index 9f01a049cf..56eaa948f2 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java
@@ -89,7 +89,7 @@ public class Q10360_CertificationOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java
index de64b241ea..8080af8df8 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java
@@ -59,7 +59,7 @@ public class Q10362_CertificationOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java
index 52a0d77960..e7071d4011 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java
@@ -61,7 +61,7 @@ public class Q10363_RequestOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java
index a3f167bb3b..2cad7041b8 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java
@@ -59,7 +59,7 @@ public class Q10364_ObligationsOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/Q10365_ForTheSearchdogKing.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/Q10365_ForTheSearchdogKing.java
index e121324c80..fa5575aaba 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/Q10365_ForTheSearchdogKing.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/Q10365_ForTheSearchdogKing.java
@@ -57,7 +57,7 @@ public class Q10365_ForTheSearchdogKing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java
index affa7852ba..f4baa88fde 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java
@@ -62,7 +62,7 @@ public class Q10366_ReportOnTheSituationAtTheRuins extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10369_NoblesseSoulTesting/Q10369_NoblesseSoulTesting.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10369_NoblesseSoulTesting/Q10369_NoblesseSoulTesting.java
index 236fe0146e..511af97acc 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10369_NoblesseSoulTesting/Q10369_NoblesseSoulTesting.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10369_NoblesseSoulTesting/Q10369_NoblesseSoulTesting.java
@@ -122,11 +122,11 @@ public class Q10369_NoblesseSoulTesting extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player == null)
 		{
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
@@ -321,7 +321,7 @@ public class Q10369_NoblesseSoulTesting extends Quest
 									final Quest instance = QuestManager.getInstance().getQuest(EvasHiddenSpace.class.getSimpleName());
 									if (instance != null)
 									{
-										instance.onAdvEvent("enterInstance", npc, player);
+										instance.onEvent("enterInstance", npc, player);
 									}
 									htmltext = null;
 									break;
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10370_MenacingTimes/Q10370_MenacingTimes.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10370_MenacingTimes/Q10370_MenacingTimes.java
index dc213da234..4763dba885 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10370_MenacingTimes/Q10370_MenacingTimes.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10370_MenacingTimes/Q10370_MenacingTimes.java
@@ -65,7 +65,7 @@ public class Q10370_MenacingTimes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10371_GraspThyPower/Q10371_GraspThyPower.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10371_GraspThyPower/Q10371_GraspThyPower.java
index a3a431ae90..f19d9a6240 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10371_GraspThyPower/Q10371_GraspThyPower.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10371_GraspThyPower/Q10371_GraspThyPower.java
@@ -61,7 +61,7 @@ public class Q10371_GraspThyPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10372_PurgatoryVolvere/Q10372_PurgatoryVolvere.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10372_PurgatoryVolvere/Q10372_PurgatoryVolvere.java
index 34e367af3f..73c9586552 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10372_PurgatoryVolvere/Q10372_PurgatoryVolvere.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10372_PurgatoryVolvere/Q10372_PurgatoryVolvere.java
@@ -58,7 +58,7 @@ public class Q10372_PurgatoryVolvere extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10373_ExploringTheDimensionSealingTheDimension/Q10373_ExploringTheDimensionSealingTheDimension.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10373_ExploringTheDimensionSealingTheDimension/Q10373_ExploringTheDimensionSealingTheDimension.java
index 7056e8b72a..425b0c979d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10373_ExploringTheDimensionSealingTheDimension/Q10373_ExploringTheDimensionSealingTheDimension.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10373_ExploringTheDimensionSealingTheDimension/Q10373_ExploringTheDimensionSealingTheDimension.java
@@ -44,7 +44,7 @@ public class Q10373_ExploringTheDimensionSealingTheDimension extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10374_ThatPlaceSuccubus/Q10374_ThatPlaceSuccubus.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10374_ThatPlaceSuccubus/Q10374_ThatPlaceSuccubus.java
index 8d91352295..44d4e50656 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10374_ThatPlaceSuccubus/Q10374_ThatPlaceSuccubus.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10374_ThatPlaceSuccubus/Q10374_ThatPlaceSuccubus.java
@@ -65,7 +65,7 @@ public class Q10374_ThatPlaceSuccubus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10375_SuccubusDisciples/Q10375_SuccubusDisciples.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10375_SuccubusDisciples/Q10375_SuccubusDisciples.java
index 2bbdfeff18..f14f026f93 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10375_SuccubusDisciples/Q10375_SuccubusDisciples.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10375_SuccubusDisciples/Q10375_SuccubusDisciples.java
@@ -64,7 +64,7 @@ public class Q10375_SuccubusDisciples extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java
index 965d1d06dd..8d6af4cb2d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java
@@ -66,7 +66,7 @@ public class Q10376_BloodyGoodTime extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java
index 255a3ce354..6a38565c9f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java
@@ -59,7 +59,7 @@ public class Q10377_TheInvadedExecutionGrounds extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10378_WeedingWork/Q10378_WeedingWork.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10378_WeedingWork/Q10378_WeedingWork.java
index e55058d9a5..cc498e2821 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10378_WeedingWork/Q10378_WeedingWork.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10378_WeedingWork/Q10378_WeedingWork.java
@@ -57,7 +57,7 @@ public class Q10378_WeedingWork extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10379_AnUninvitedGuest/Q10379_AnUninvitedGuest.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10379_AnUninvitedGuest/Q10379_AnUninvitedGuest.java
index 8502410bee..e227de28c7 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10379_AnUninvitedGuest/Q10379_AnUninvitedGuest.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10379_AnUninvitedGuest/Q10379_AnUninvitedGuest.java
@@ -69,7 +69,7 @@ public class Q10379_AnUninvitedGuest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10380_TheExecutionersExecution/Q10380_TheExecutionersExecution.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10380_TheExecutionersExecution/Q10380_TheExecutionersExecution.java
index 7b59d40bcb..5b4910c43e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10380_TheExecutionersExecution/Q10380_TheExecutionersExecution.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10380_TheExecutionersExecution/Q10380_TheExecutionersExecution.java
@@ -67,7 +67,7 @@ public class Q10380_TheExecutionersExecution extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java
index 3fdb1d2625..1a0550ce7a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java
@@ -49,7 +49,7 @@ public class Q10381_ToTheSeedOfHellfire extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10382_DayOfLiberation/Q10382_DayOfLiberation.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10382_DayOfLiberation/Q10382_DayOfLiberation.java
index 29de22db80..bf7a89cbc4 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10382_DayOfLiberation/Q10382_DayOfLiberation.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10382_DayOfLiberation/Q10382_DayOfLiberation.java
@@ -48,7 +48,7 @@ public class Q10382_DayOfLiberation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java
index 5a50c186ec..97fd290cdb 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java
@@ -61,7 +61,7 @@ public class Q10383_FergasonsOffer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java
index 11188fdada..9aba58dd1e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java
@@ -52,7 +52,7 @@ public class Q10384_AnAudienceWithTauti extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10385_RedThreadOfFate/Q10385_RedThreadOfFate.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10385_RedThreadOfFate/Q10385_RedThreadOfFate.java
index e16cde08bf..1a97e6d7de 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10385_RedThreadOfFate/Q10385_RedThreadOfFate.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10385_RedThreadOfFate/Q10385_RedThreadOfFate.java
@@ -120,7 +120,7 @@ public class Q10385_RedThreadOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -756,7 +756,7 @@ public class Q10385_RedThreadOfFate extends Quest
 						final Quest instance = QuestManager.getInstance().getQuest(TalkingIslandPast.class.getSimpleName());
 						if (instance != null)
 						{
-							instance.onAdvEvent("enterInstance", npc, player);
+							instance.onEvent("enterInstance", npc, player);
 						}
 					}
 					break;
@@ -844,7 +844,7 @@ public class Q10385_RedThreadOfFate extends Quest
 							final Quest instance = QuestManager.getInstance().getQuest(TalkingIslandPast.class.getSimpleName());
 							if (instance != null)
 							{
-								instance.onAdvEvent("enterInstance", npc, player);
+								instance.onEvent("enterInstance", npc, player);
 							}
 							break;
 						}
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10386_MysteriousJourney/Q10386_MysteriousJourney.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10386_MysteriousJourney/Q10386_MysteriousJourney.java
index 199681b2fa..51a014c8bf 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10386_MysteriousJourney/Q10386_MysteriousJourney.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10386_MysteriousJourney/Q10386_MysteriousJourney.java
@@ -50,7 +50,7 @@ public class Q10386_MysteriousJourney extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10387_SoullessOne/Q10387_SoullessOne.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10387_SoullessOne/Q10387_SoullessOne.java
index 3b4e70d070..90284f0de9 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10387_SoullessOne/Q10387_SoullessOne.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10387_SoullessOne/Q10387_SoullessOne.java
@@ -54,7 +54,7 @@ public class Q10387_SoullessOne extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java
index 174ea1a300..e5a8517a69 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java
@@ -46,7 +46,7 @@ public class Q10388_ConspiracyBehindDoor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java
index 6d60016a06..619cf89fa5 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java
@@ -66,7 +66,7 @@ public class Q10389_TheVoiceOfAuthority extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10390_KekropusLetter/Q10390_KekropusLetter.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10390_KekropusLetter/Q10390_KekropusLetter.java
index 267f3c669f..d55e74b0a5 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10390_KekropusLetter/Q10390_KekropusLetter.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10390_KekropusLetter/Q10390_KekropusLetter.java
@@ -67,7 +67,7 @@ public class Q10390_KekropusLetter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10391_ASuspiciousHelper/Q10391_ASuspiciousHelper.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10391_ASuspiciousHelper/Q10391_ASuspiciousHelper.java
index 52f96af258..e9ad07b210 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10391_ASuspiciousHelper/Q10391_ASuspiciousHelper.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10391_ASuspiciousHelper/Q10391_ASuspiciousHelper.java
@@ -51,7 +51,7 @@ public class Q10391_ASuspiciousHelper extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10392_FailureAndItsConsequences/Q10392_FailureAndItsConsequences.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10392_FailureAndItsConsequences/Q10392_FailureAndItsConsequences.java
index bf10758dda..7fb2e89ae5 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10392_FailureAndItsConsequences/Q10392_FailureAndItsConsequences.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10392_FailureAndItsConsequences/Q10392_FailureAndItsConsequences.java
@@ -59,7 +59,7 @@ public class Q10392_FailureAndItsConsequences extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10393_KekropusLetterAClueCompleted/Q10393_KekropusLetterAClueCompleted.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10393_KekropusLetterAClueCompleted/Q10393_KekropusLetterAClueCompleted.java
index dbf6bd0b95..b12d1beb67 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10393_KekropusLetterAClueCompleted/Q10393_KekropusLetterAClueCompleted.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10393_KekropusLetterAClueCompleted/Q10393_KekropusLetterAClueCompleted.java
@@ -58,7 +58,7 @@ public class Q10393_KekropusLetterAClueCompleted extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java
index 1203e8c9dc..07e4470101 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java
@@ -54,7 +54,7 @@ public class Q10394_MutualBenefit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java
index 04995ac069..8b1026ccb4 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java
@@ -63,7 +63,7 @@ public class Q10395_NotATraitor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10397_KekropusLetterASuspiciousBadge/Q10397_KekropusLetterASuspiciousBadge.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10397_KekropusLetterASuspiciousBadge/Q10397_KekropusLetterASuspiciousBadge.java
index 3f4fccb723..46a0ff46f6 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10397_KekropusLetterASuspiciousBadge/Q10397_KekropusLetterASuspiciousBadge.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10397_KekropusLetterASuspiciousBadge/Q10397_KekropusLetterASuspiciousBadge.java
@@ -58,7 +58,7 @@ public class Q10397_KekropusLetterASuspiciousBadge extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10398_ASuspiciousBadge/Q10398_ASuspiciousBadge.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10398_ASuspiciousBadge/Q10398_ASuspiciousBadge.java
index b4623adf0f..0f443aa463 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10398_ASuspiciousBadge/Q10398_ASuspiciousBadge.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10398_ASuspiciousBadge/Q10398_ASuspiciousBadge.java
@@ -59,7 +59,7 @@ public class Q10398_ASuspiciousBadge extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10399_TheAlphabetOfTheGiants/Q10399_TheAlphabetOfTheGiants.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10399_TheAlphabetOfTheGiants/Q10399_TheAlphabetOfTheGiants.java
index c2fe1e2e38..8e72951a3a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10399_TheAlphabetOfTheGiants/Q10399_TheAlphabetOfTheGiants.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10399_TheAlphabetOfTheGiants/Q10399_TheAlphabetOfTheGiants.java
@@ -57,7 +57,7 @@ public class Q10399_TheAlphabetOfTheGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10401_KekropusLetterDecodingTheBadge/Q10401_KekropusLetterDecodingTheBadge.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10401_KekropusLetterDecodingTheBadge/Q10401_KekropusLetterDecodingTheBadge.java
index f9a1f2697f..c80d7c0959 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10401_KekropusLetterDecodingTheBadge/Q10401_KekropusLetterDecodingTheBadge.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10401_KekropusLetterDecodingTheBadge/Q10401_KekropusLetterDecodingTheBadge.java
@@ -58,7 +58,7 @@ public class Q10401_KekropusLetterDecodingTheBadge extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java
index e94bd7c4f5..a510527418 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java
@@ -63,7 +63,7 @@ public class Q10402_NowhereToTurn extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10403_TheGuardianGiant/Q10403_TheGuardianGiant.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10403_TheGuardianGiant/Q10403_TheGuardianGiant.java
index 6a5e799879..b2b97e99b2 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10403_TheGuardianGiant/Q10403_TheGuardianGiant.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10403_TheGuardianGiant/Q10403_TheGuardianGiant.java
@@ -63,7 +63,7 @@ public class Q10403_TheGuardianGiant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10404_KekropusLetterAHiddenMeaning/Q10404_KekropusLetterAHiddenMeaning.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10404_KekropusLetterAHiddenMeaning/Q10404_KekropusLetterAHiddenMeaning.java
index 0fc3f84dab..5539f5f591 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10404_KekropusLetterAHiddenMeaning/Q10404_KekropusLetterAHiddenMeaning.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10404_KekropusLetterAHiddenMeaning/Q10404_KekropusLetterAHiddenMeaning.java
@@ -58,7 +58,7 @@ public class Q10404_KekropusLetterAHiddenMeaning extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10405_KartiasSeed/Q10405_KartiasSeed.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10405_KartiasSeed/Q10405_KartiasSeed.java
index 42291ddcaf..ef7e7396db 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10405_KartiasSeed/Q10405_KartiasSeed.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10405_KartiasSeed/Q10405_KartiasSeed.java
@@ -66,7 +66,7 @@ public class Q10405_KartiasSeed extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java
index 327c51112a..f4ede19821 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java
@@ -55,7 +55,7 @@ public class Q10406_BeforeDarknessBearsFruit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10408_KekropusLetterTheSwampOfScreams/Q10408_KekropusLetterTheSwampOfScreams.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10408_KekropusLetterTheSwampOfScreams/Q10408_KekropusLetterTheSwampOfScreams.java
index 85a688fa3e..26e516a179 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10408_KekropusLetterTheSwampOfScreams/Q10408_KekropusLetterTheSwampOfScreams.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10408_KekropusLetterTheSwampOfScreams/Q10408_KekropusLetterTheSwampOfScreams.java
@@ -58,7 +58,7 @@ public class Q10408_KekropusLetterTheSwampOfScreams extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java
index f5af9f664d..dce8f9986b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java
@@ -48,7 +48,7 @@ public class Q10409_ASuspiciousVagabondInTheSwamp extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java
index 77b3ca56b2..49f9797292 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java
@@ -73,7 +73,7 @@ public class Q10410_EmbryoInTheSwampOfScreams extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10411_KekropusLetterTheForestOfTheDead/Q10411_KekropusLetterTheForestOfTheDead.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10411_KekropusLetterTheForestOfTheDead/Q10411_KekropusLetterTheForestOfTheDead.java
index 1ff743da57..c5aeebf51e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10411_KekropusLetterTheForestOfTheDead/Q10411_KekropusLetterTheForestOfTheDead.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10411_KekropusLetterTheForestOfTheDead/Q10411_KekropusLetterTheForestOfTheDead.java
@@ -58,7 +58,7 @@ public class Q10411_KekropusLetterTheForestOfTheDead extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java
index 2bcc230a31..79c93ddebe 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java
@@ -48,7 +48,7 @@ public class Q10412_ASuspiciousVagabondInTheForest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java
index 368315d6d6..1260efb4f7 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java
@@ -102,7 +102,7 @@ public class Q10413_EmbryoInTheForestOfTheDead extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10414_KekropusLetterWithCourage/Q10414_KekropusLetterWithCourage.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10414_KekropusLetterWithCourage/Q10414_KekropusLetterWithCourage.java
index 4b6fcca87c..13b925da20 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10414_KekropusLetterWithCourage/Q10414_KekropusLetterWithCourage.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10414_KekropusLetterWithCourage/Q10414_KekropusLetterWithCourage.java
@@ -58,7 +58,7 @@ public class Q10414_KekropusLetterWithCourage extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10415_KekropusLetterWithWisdom/Q10415_KekropusLetterWithWisdom.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10415_KekropusLetterWithWisdom/Q10415_KekropusLetterWithWisdom.java
index 299f20a84e..95dd7f85c1 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10415_KekropusLetterWithWisdom/Q10415_KekropusLetterWithWisdom.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10415_KekropusLetterWithWisdom/Q10415_KekropusLetterWithWisdom.java
@@ -59,7 +59,7 @@ public class Q10415_KekropusLetterWithWisdom extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java
index 59961329d7..3436179c13 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java
@@ -67,7 +67,7 @@ public class Q10416_InSearchOfTheEyeOfArgos extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java
index 030668ee81..0e978c24df 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java
@@ -51,7 +51,7 @@ public class Q10417_DaimonTheWhiteEyed extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10418_TheImmortalPirateKing/Q10418_TheImmortalPirateKing.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10418_TheImmortalPirateKing/Q10418_TheImmortalPirateKing.java
index 239ef8a3a7..d6d93746c2 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10418_TheImmortalPirateKing/Q10418_TheImmortalPirateKing.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10418_TheImmortalPirateKing/Q10418_TheImmortalPirateKing.java
@@ -48,7 +48,7 @@ public class Q10418_TheImmortalPirateKing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10419_KekropusLetterKampfsWhereabouts/Q10419_KekropusLetterKampfsWhereabouts.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10419_KekropusLetterKampfsWhereabouts/Q10419_KekropusLetterKampfsWhereabouts.java
index 010fdc756a..86053d8d12 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10419_KekropusLetterKampfsWhereabouts/Q10419_KekropusLetterKampfsWhereabouts.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10419_KekropusLetterKampfsWhereabouts/Q10419_KekropusLetterKampfsWhereabouts.java
@@ -58,7 +58,7 @@ public class Q10419_KekropusLetterKampfsWhereabouts extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10420_TheVarkaSilenosSupporters/Q10420_TheVarkaSilenosSupporters.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10420_TheVarkaSilenosSupporters/Q10420_TheVarkaSilenosSupporters.java
index d7bd1e9006..2e9aeebde8 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10420_TheVarkaSilenosSupporters/Q10420_TheVarkaSilenosSupporters.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10420_TheVarkaSilenosSupporters/Q10420_TheVarkaSilenosSupporters.java
@@ -75,7 +75,7 @@ public class Q10420_TheVarkaSilenosSupporters extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10421_AssassinationOfTheVarkaSilenosCommander/Q10421_AssassinationOfTheVarkaSilenosCommander.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10421_AssassinationOfTheVarkaSilenosCommander/Q10421_AssassinationOfTheVarkaSilenosCommander.java
index b466969c97..2d6adc18da 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10421_AssassinationOfTheVarkaSilenosCommander/Q10421_AssassinationOfTheVarkaSilenosCommander.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10421_AssassinationOfTheVarkaSilenosCommander/Q10421_AssassinationOfTheVarkaSilenosCommander.java
@@ -51,7 +51,7 @@ public class Q10421_AssassinationOfTheVarkaSilenosCommander extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java
index 080ce0ebad..d68989ef8a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java
@@ -55,7 +55,7 @@ public class Q10422_AssassinationOfTheVarkaSilenosChief extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java
index b8823b8e7a..dc76dc4f94 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java
@@ -88,7 +88,7 @@ public class Q10423_EmbryoStrongholdRaid extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10424_KekropusLetterBelosWhereabouts/Q10424_KekropusLetterBelosWhereabouts.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10424_KekropusLetterBelosWhereabouts/Q10424_KekropusLetterBelosWhereabouts.java
index 071af1eb3d..1f7aa6f81a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10424_KekropusLetterBelosWhereabouts/Q10424_KekropusLetterBelosWhereabouts.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10424_KekropusLetterBelosWhereabouts/Q10424_KekropusLetterBelosWhereabouts.java
@@ -58,7 +58,7 @@ public class Q10424_KekropusLetterBelosWhereabouts extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10425_TheKetraOrcSupporters/Q10425_TheKetraOrcSupporters.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10425_TheKetraOrcSupporters/Q10425_TheKetraOrcSupporters.java
index 2fd6da992d..ae30164989 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10425_TheKetraOrcSupporters/Q10425_TheKetraOrcSupporters.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10425_TheKetraOrcSupporters/Q10425_TheKetraOrcSupporters.java
@@ -78,7 +78,7 @@ public class Q10425_TheKetraOrcSupporters extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10426_AssassinationOfTheKetraOrcCommander/Q10426_AssassinationOfTheKetraOrcCommander.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10426_AssassinationOfTheKetraOrcCommander/Q10426_AssassinationOfTheKetraOrcCommander.java
index 094dcd36c3..1ed6ed4388 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10426_AssassinationOfTheKetraOrcCommander/Q10426_AssassinationOfTheKetraOrcCommander.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10426_AssassinationOfTheKetraOrcCommander/Q10426_AssassinationOfTheKetraOrcCommander.java
@@ -53,7 +53,7 @@ public class Q10426_AssassinationOfTheKetraOrcCommander extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java
index ccd9df0ad1..56f5951419 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java
@@ -55,7 +55,7 @@ public class Q10427_AssassinationOfTheKetraOrcChief extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10442_TheAnnihilatedPlains1/Q10442_TheAnnihilatedPlains1.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10442_TheAnnihilatedPlains1/Q10442_TheAnnihilatedPlains1.java
index 5d9569f1bc..cfa2532708 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10442_TheAnnihilatedPlains1/Q10442_TheAnnihilatedPlains1.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10442_TheAnnihilatedPlains1/Q10442_TheAnnihilatedPlains1.java
@@ -43,7 +43,7 @@ public class Q10442_TheAnnihilatedPlains1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10443_TheAnnihilatedPlains2/Q10443_TheAnnihilatedPlains2.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10443_TheAnnihilatedPlains2/Q10443_TheAnnihilatedPlains2.java
index a17b25f237..4a8eacfbf6 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10443_TheAnnihilatedPlains2/Q10443_TheAnnihilatedPlains2.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10443_TheAnnihilatedPlains2/Q10443_TheAnnihilatedPlains2.java
@@ -52,7 +52,7 @@ public class Q10443_TheAnnihilatedPlains2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10444_TheOriginOfMonsters/Q10444_TheOriginOfMonsters.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10444_TheOriginOfMonsters/Q10444_TheOriginOfMonsters.java
index ad98ec175b..e52d6f6c4f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10444_TheOriginOfMonsters/Q10444_TheOriginOfMonsters.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10444_TheOriginOfMonsters/Q10444_TheOriginOfMonsters.java
@@ -57,7 +57,7 @@ public class Q10444_TheOriginOfMonsters extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10445_AnImpendingThreat/Q10445_AnImpendingThreat.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10445_AnImpendingThreat/Q10445_AnImpendingThreat.java
index c78d904936..dac215a5b1 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10445_AnImpendingThreat/Q10445_AnImpendingThreat.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10445_AnImpendingThreat/Q10445_AnImpendingThreat.java
@@ -53,7 +53,7 @@ public class Q10445_AnImpendingThreat extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java
index bb70f87faa..4649f7548e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java
@@ -58,7 +58,7 @@ public class Q10446_HitAndRun extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java
index c49b98c92d..c173bf24b6 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java
@@ -74,7 +74,7 @@ public class Q10447_TimingIsEverything extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10450_ADarkAmbition/Q10450_ADarkAmbition.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10450_ADarkAmbition/Q10450_ADarkAmbition.java
index c3f232b499..8f085a2197 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10450_ADarkAmbition/Q10450_ADarkAmbition.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10450_ADarkAmbition/Q10450_ADarkAmbition.java
@@ -49,7 +49,7 @@ public class Q10450_ADarkAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10452_IsItEdible/Q10452_IsItEdible.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10452_IsItEdible/Q10452_IsItEdible.java
index 921c507a44..751de64b84 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10452_IsItEdible/Q10452_IsItEdible.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10452_IsItEdible/Q10452_IsItEdible.java
@@ -53,7 +53,7 @@ public class Q10452_IsItEdible extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10453_StoppingTheWindDragon/Q10453_StoppingTheWindDragon.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10453_StoppingTheWindDragon/Q10453_StoppingTheWindDragon.java
index 3b567c5d04..6a74beb026 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10453_StoppingTheWindDragon/Q10453_StoppingTheWindDragon.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10453_StoppingTheWindDragon/Q10453_StoppingTheWindDragon.java
@@ -46,7 +46,7 @@ public class Q10453_StoppingTheWindDragon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java
index 133390e3ed..b58a5b6e94 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java
@@ -49,7 +49,7 @@ public class Q10454_FinalEmbryoApostle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java
index b6cec7570e..7268e0de45 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java
@@ -50,7 +50,7 @@ public class Q10455_ElikiasLetter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10456_OperationRescue/Q10456_OperationRescue.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10456_OperationRescue/Q10456_OperationRescue.java
index f38ae9e388..7da35bc35f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10456_OperationRescue/Q10456_OperationRescue.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10456_OperationRescue/Q10456_OperationRescue.java
@@ -66,7 +66,7 @@ public class Q10456_OperationRescue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10457_KefensisIllusion/Q10457_KefensisIllusion.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10457_KefensisIllusion/Q10457_KefensisIllusion.java
index 907cca5e98..32d56eba4b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10457_KefensisIllusion/Q10457_KefensisIllusion.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10457_KefensisIllusion/Q10457_KefensisIllusion.java
@@ -65,7 +65,7 @@ public class Q10457_KefensisIllusion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java
index fc5b941631..11718fe3dc 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java
@@ -54,7 +54,7 @@ public class Q10459_ASickAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10460_ReturnOfTheAlligatorHunter/Q10460_ReturnOfTheAlligatorHunter.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10460_ReturnOfTheAlligatorHunter/Q10460_ReturnOfTheAlligatorHunter.java
index e8890d2fdb..5220e36a95 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10460_ReturnOfTheAlligatorHunter/Q10460_ReturnOfTheAlligatorHunter.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10460_ReturnOfTheAlligatorHunter/Q10460_ReturnOfTheAlligatorHunter.java
@@ -60,7 +60,7 @@ public class Q10460_ReturnOfTheAlligatorHunter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10472_WindsOfFateEncroachingShadows/Q10472_WindsOfFateEncroachingShadows.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10472_WindsOfFateEncroachingShadows/Q10472_WindsOfFateEncroachingShadows.java
index c4e70d36b7..a4733734be 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10472_WindsOfFateEncroachingShadows/Q10472_WindsOfFateEncroachingShadows.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10472_WindsOfFateEncroachingShadows/Q10472_WindsOfFateEncroachingShadows.java
@@ -109,7 +109,7 @@ public class Q10472_WindsOfFateEncroachingShadows extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
index bacbb7058b..ad79a5980b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
@@ -73,7 +73,7 @@ public class Q10501_ZakenEmbroideredSoulCloak extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (player.getLevel() >= MIN_LEVEL) && event.equals("32612-04.html"))
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
index d1678a7601..38f4514197 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
@@ -73,7 +73,7 @@ public class Q10502_FreyaEmbroideredSoulCloak extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (player.getLevel() >= MIN_LEVEL) && event.equals("32612-04.html"))
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
index 224940ecd9..08aa62d532 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
@@ -74,7 +74,7 @@ public class Q10503_FrintezzaEmbroideredSoulCloak extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (player.getLevel() >= MIN_LEVEL) && event.equals("32612-04.html"))
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java
index b150a02b38..d81d398014 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java
@@ -66,7 +66,7 @@ public class Q10504_JewelOfAntharas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java
index 0c9360d9b7..e598298776 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java
@@ -66,7 +66,7 @@ public class Q10505_JewelOfValakas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java
index e9f585025d..6c50cf57a8 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java
@@ -59,7 +59,7 @@ public class Q10521_QueenNavarisLetterVarkaSilenosBarracks extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10522_TheDarkSecretOfVarkaSilenos/Q10522_TheDarkSecretOfVarkaSilenos.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10522_TheDarkSecretOfVarkaSilenos/Q10522_TheDarkSecretOfVarkaSilenos.java
index 703a1ac8bc..9564458b27 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10522_TheDarkSecretOfVarkaSilenos/Q10522_TheDarkSecretOfVarkaSilenos.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10522_TheDarkSecretOfVarkaSilenos/Q10522_TheDarkSecretOfVarkaSilenos.java
@@ -73,7 +73,7 @@ public class Q10522_TheDarkSecretOfVarkaSilenos extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10523_TheAssassinationOfTheVarkaSilenosCommander/Q10523_TheAssassinationOfTheVarkaSilenosCommander.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10523_TheAssassinationOfTheVarkaSilenosCommander/Q10523_TheAssassinationOfTheVarkaSilenosCommander.java
index bc88c09827..66a58918c5 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10523_TheAssassinationOfTheVarkaSilenosCommander/Q10523_TheAssassinationOfTheVarkaSilenosCommander.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10523_TheAssassinationOfTheVarkaSilenosCommander/Q10523_TheAssassinationOfTheVarkaSilenosCommander.java
@@ -55,7 +55,7 @@ public class Q10523_TheAssassinationOfTheVarkaSilenosCommander extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief.java
index 73761de539..f501b9bbee 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief.java
@@ -58,7 +58,7 @@ public class Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief extends Ques
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10525_QueenNavarisLetterKetraOrcOutpost/Q10525_QueenNavarisLetterKetraOrcOutpost.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10525_QueenNavarisLetterKetraOrcOutpost/Q10525_QueenNavarisLetterKetraOrcOutpost.java
index 60ba36e959..612a5dc228 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10525_QueenNavarisLetterKetraOrcOutpost/Q10525_QueenNavarisLetterKetraOrcOutpost.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10525_QueenNavarisLetterKetraOrcOutpost/Q10525_QueenNavarisLetterKetraOrcOutpost.java
@@ -58,7 +58,7 @@ public class Q10525_QueenNavarisLetterKetraOrcOutpost extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10526_TheDarkSecretOfTheKetraOrcs/Q10526_TheDarkSecretOfTheKetraOrcs.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10526_TheDarkSecretOfTheKetraOrcs/Q10526_TheDarkSecretOfTheKetraOrcs.java
index 95b5d6c43d..038e8661b8 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10526_TheDarkSecretOfTheKetraOrcs/Q10526_TheDarkSecretOfTheKetraOrcs.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10526_TheDarkSecretOfTheKetraOrcs/Q10526_TheDarkSecretOfTheKetraOrcs.java
@@ -78,7 +78,7 @@ public class Q10526_TheDarkSecretOfTheKetraOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10527_TheAssassinationOfTheKetraOrcCommander/Q10527_TheAssassinationOfTheKetraOrcCommander.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10527_TheAssassinationOfTheKetraOrcCommander/Q10527_TheAssassinationOfTheKetraOrcCommander.java
index 7cca4304fb..16beb3437e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10527_TheAssassinationOfTheKetraOrcCommander/Q10527_TheAssassinationOfTheKetraOrcCommander.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10527_TheAssassinationOfTheKetraOrcCommander/Q10527_TheAssassinationOfTheKetraOrcCommander.java
@@ -56,7 +56,7 @@ public class Q10527_TheAssassinationOfTheKetraOrcCommander extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10528_TheAssassinationOfTheKetraOrcChief/Q10528_TheAssassinationOfTheKetraOrcChief.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10528_TheAssassinationOfTheKetraOrcChief/Q10528_TheAssassinationOfTheKetraOrcChief.java
index 02307626f3..713ac08316 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10528_TheAssassinationOfTheKetraOrcChief/Q10528_TheAssassinationOfTheKetraOrcChief.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10528_TheAssassinationOfTheKetraOrcChief/Q10528_TheAssassinationOfTheKetraOrcChief.java
@@ -59,7 +59,7 @@ public class Q10528_TheAssassinationOfTheKetraOrcChief extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10529_IvoryTowersResearchSeaOfSporesJournal/Q10529_IvoryTowersResearchSeaOfSporesJournal.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10529_IvoryTowersResearchSeaOfSporesJournal/Q10529_IvoryTowersResearchSeaOfSporesJournal.java
index 48755350a4..ffe670f3ff 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10529_IvoryTowersResearchSeaOfSporesJournal/Q10529_IvoryTowersResearchSeaOfSporesJournal.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10529_IvoryTowersResearchSeaOfSporesJournal/Q10529_IvoryTowersResearchSeaOfSporesJournal.java
@@ -75,7 +75,7 @@ public final class Q10529_IvoryTowersResearchSeaOfSporesJournal extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10530_KekropusLetterTheDragonsTransition/Q10530_KekropusLetterTheDragonsTransition.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10530_KekropusLetterTheDragonsTransition/Q10530_KekropusLetterTheDragonsTransition.java
index 9db51e963f..1ab3652531 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10530_KekropusLetterTheDragonsTransition/Q10530_KekropusLetterTheDragonsTransition.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10530_KekropusLetterTheDragonsTransition/Q10530_KekropusLetterTheDragonsTransition.java
@@ -61,7 +61,7 @@ public class Q10530_KekropusLetterTheDragonsTransition extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10531_OddHappeningsAtDragonValley/Q10531_OddHappeningsAtDragonValley.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10531_OddHappeningsAtDragonValley/Q10531_OddHappeningsAtDragonValley.java
index 0b6cb61f4c..b366a824aa 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10531_OddHappeningsAtDragonValley/Q10531_OddHappeningsAtDragonValley.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10531_OddHappeningsAtDragonValley/Q10531_OddHappeningsAtDragonValley.java
@@ -72,7 +72,7 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java
index f8f9d1af2c..c67fbd555d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java
@@ -68,7 +68,7 @@ public class Q10532_UncoveringTheConspiracy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10534_HatchlingResearch/Q10534_HatchlingResearch.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10534_HatchlingResearch/Q10534_HatchlingResearch.java
index ca8ea7ebfa..32a839c147 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10534_HatchlingResearch/Q10534_HatchlingResearch.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10534_HatchlingResearch/Q10534_HatchlingResearch.java
@@ -52,7 +52,7 @@ public class Q10534_HatchlingResearch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10537_KamaelDisarray/Q10537_KamaelDisarray.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10537_KamaelDisarray/Q10537_KamaelDisarray.java
index 3f641802c2..63def42cfb 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10537_KamaelDisarray/Q10537_KamaelDisarray.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10537_KamaelDisarray/Q10537_KamaelDisarray.java
@@ -82,7 +82,7 @@ public class Q10537_KamaelDisarray extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10538_GiantsEvolution/Q10538_GiantsEvolution.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10538_GiantsEvolution/Q10538_GiantsEvolution.java
index f237fe9262..5b4da4cac7 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10538_GiantsEvolution/Q10538_GiantsEvolution.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10538_GiantsEvolution/Q10538_GiantsEvolution.java
@@ -60,7 +60,7 @@ public class Q10538_GiantsEvolution extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10539_EnergySupplyCutoffPlan/Q10539_EnergySupplyCutoffPlan.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10539_EnergySupplyCutoffPlan/Q10539_EnergySupplyCutoffPlan.java
index f97a6b1c21..4be23c454e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10539_EnergySupplyCutoffPlan/Q10539_EnergySupplyCutoffPlan.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10539_EnergySupplyCutoffPlan/Q10539_EnergySupplyCutoffPlan.java
@@ -61,7 +61,7 @@ public class Q10539_EnergySupplyCutoffPlan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10540_ThwartingMimirsPlan/Q10540_ThwartingMimirsPlan.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10540_ThwartingMimirsPlan/Q10540_ThwartingMimirsPlan.java
index aa8e864fb4..6462015e4a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10540_ThwartingMimirsPlan/Q10540_ThwartingMimirsPlan.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10540_ThwartingMimirsPlan/Q10540_ThwartingMimirsPlan.java
@@ -49,7 +49,7 @@ public class Q10540_ThwartingMimirsPlan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java
index d8806aaa46..2399b6f6f5 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java
@@ -76,7 +76,7 @@ public class Q10541_TrainLikeTheRealThing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java
index ac33019628..829bfe060e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java
@@ -64,7 +64,7 @@ public class Q10542_SearchingForNewPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java
index 5258465884..75e34abc11 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java
@@ -61,7 +61,7 @@ public class Q10543_SheddingWeight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10544_SeekerSupplies/Q10544_SeekerSupplies.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10544_SeekerSupplies/Q10544_SeekerSupplies.java
index 3c2f520f5b..02fcd6edca 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10544_SeekerSupplies/Q10544_SeekerSupplies.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10544_SeekerSupplies/Q10544_SeekerSupplies.java
@@ -71,7 +71,7 @@ public class Q10544_SeekerSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10552_ChallengeBalthusKnight/Q10552_ChallengeBalthusKnight.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10552_ChallengeBalthusKnight/Q10552_ChallengeBalthusKnight.java
index 0097859eea..8aac9299fb 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10552_ChallengeBalthusKnight/Q10552_ChallengeBalthusKnight.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10552_ChallengeBalthusKnight/Q10552_ChallengeBalthusKnight.java
@@ -68,7 +68,7 @@ public final class Q10552_ChallengeBalthusKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
@@ -87,7 +87,7 @@ public final class Q10552_ChallengeBalthusKnight extends Quest
 			final Quest instance = QuestManager.getInstance().getQuest(HatchlingNest.class.getSimpleName());
 			if (instance != null)
 			{
-				instance.onAdvEvent("enterInstance", npc, player);
+				instance.onEvent("enterInstance", npc, player);
 			}
 			htmltext = "tarti_balthus_q10552_03.htm";
 		}
@@ -125,7 +125,7 @@ public final class Q10552_ChallengeBalthusKnight extends Quest
 							final Quest instance = QuestManager.getInstance().getQuest(HatchlingNest.class.getSimpleName());
 							if (instance != null)
 							{
-								instance.onAdvEvent("enterInstance", npc, player);
+								instance.onEvent("enterInstance", npc, player);
 							}
 							htmltext = "tarti_balthus_q10552_04.htm";
 							break;
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10553_WhatMattersMoreThanAbility/Q10553_WhatMattersMoreThanAbility.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10553_WhatMattersMoreThanAbility/Q10553_WhatMattersMoreThanAbility.java
index f6b7a9381e..3583d34894 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10553_WhatMattersMoreThanAbility/Q10553_WhatMattersMoreThanAbility.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10553_WhatMattersMoreThanAbility/Q10553_WhatMattersMoreThanAbility.java
@@ -67,7 +67,7 @@ public final class Q10553_WhatMattersMoreThanAbility extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
@@ -181,7 +181,7 @@ public final class Q10553_WhatMattersMoreThanAbility extends Quest
 					final Quest instance = QuestManager.getInstance().getQuest(HatchlingCage.class.getSimpleName());
 					if (instance != null)
 					{
-						instance.onAdvEvent("enterInstance", npc, player);
+						instance.onEvent("enterInstance", npc, player);
 					}
 					break;
 				}
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10554_GiftForYou/Q10554_GiftForYou.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10554_GiftForYou/Q10554_GiftForYou.java
index 2f865852a5..4da0509600 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10554_GiftForYou/Q10554_GiftForYou.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10554_GiftForYou/Q10554_GiftForYou.java
@@ -63,7 +63,7 @@ public final class Q10554_GiftForYou extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10555_ChargeAtAntharas/Q10555_ChargeAtAntharas.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10555_ChargeAtAntharas/Q10555_ChargeAtAntharas.java
index 77c6849388..eb01780976 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10555_ChargeAtAntharas/Q10555_ChargeAtAntharas.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10555_ChargeAtAntharas/Q10555_ChargeAtAntharas.java
@@ -73,7 +73,7 @@ public final class Q10555_ChargeAtAntharas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
@@ -165,7 +165,7 @@ public final class Q10555_ChargeAtAntharas extends Quest
 							final Quest instance = QuestManager.getInstance().getQuest(AntharasNest.class.getSimpleName());
 							if (instance != null)
 							{
-								instance.onAdvEvent("startGemDragonsAttack", npc, player);
+								instance.onEvent("startGemDragonsAttack", npc, player);
 							}
 							qs.setCond(2, true);
 							player.getVariables().set(PlayerVariables.BALTHUS_PHASE, 3);
@@ -340,7 +340,7 @@ public final class Q10555_ChargeAtAntharas extends Quest
 					final Quest instance = QuestManager.getInstance().getQuest(AntharasNest.class.getSimpleName());
 					if (instance != null)
 					{
-						instance.onAdvEvent("enterInstance", npc, player);
+						instance.onEvent("enterInstance", npc, player);
 					}
 					break;
 				}
@@ -373,7 +373,7 @@ public final class Q10555_ChargeAtAntharas extends Quest
 					final Quest instance = QuestManager.getInstance().getQuest(AntharasNest.class.getSimpleName());
 					if (instance != null)
 					{
-						instance.onAdvEvent("startAntharasProgress", npc, killer);
+						instance.onEvent("startAntharasProgress", npc, killer);
 					}
 				}
 			}
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10556_ForgottenPowerStartOfFate/Q10556_ForgottenPowerStartOfFate.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10556_ForgottenPowerStartOfFate/Q10556_ForgottenPowerStartOfFate.java
index f1eb9e3f1f..126b03bda2 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10556_ForgottenPowerStartOfFate/Q10556_ForgottenPowerStartOfFate.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10556_ForgottenPowerStartOfFate/Q10556_ForgottenPowerStartOfFate.java
@@ -137,7 +137,7 @@ public final class Q10556_ForgottenPowerStartOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
@@ -298,7 +298,7 @@ public final class Q10556_ForgottenPowerStartOfFate extends Quest
 					final Quest abelius = QuestManager.getInstance().getQuest(PowerOfAbelius.class.getSimpleName());
 					if (abelius != null)
 					{
-						abelius.onAdvEvent("enterInstance", npc, player);
+						abelius.onEvent("enterInstance", npc, player);
 					}
 					break;
 				}
@@ -308,7 +308,7 @@ public final class Q10556_ForgottenPowerStartOfFate extends Quest
 					final Quest sapyros = QuestManager.getInstance().getQuest(PowerOfSapyros.class.getSimpleName());
 					if (sapyros != null)
 					{
-						sapyros.onAdvEvent("enterInstance", npc, player);
+						sapyros.onEvent("enterInstance", npc, player);
 					}
 					break;
 				}
@@ -318,7 +318,7 @@ public final class Q10556_ForgottenPowerStartOfFate extends Quest
 					final Quest kashnaga = QuestManager.getInstance().getQuest(PowerOfKashnaga.class.getSimpleName());
 					if (kashnaga != null)
 					{
-						kashnaga.onAdvEvent("enterInstance", npc, player);
+						kashnaga.onEvent("enterInstance", npc, player);
 					}
 					break;
 				}
@@ -328,7 +328,7 @@ public final class Q10556_ForgottenPowerStartOfFate extends Quest
 					final Quest cranigg = QuestManager.getInstance().getQuest(PowerOfCranigg.class.getSimpleName());
 					if (cranigg != null)
 					{
-						cranigg.onAdvEvent("enterInstance", npc, player);
+						cranigg.onEvent("enterInstance", npc, player);
 					}
 					break;
 				}
@@ -338,7 +338,7 @@ public final class Q10556_ForgottenPowerStartOfFate extends Quest
 					final Quest naviarope = QuestManager.getInstance().getQuest(PowerOfNaviarope.class.getSimpleName());
 					if (naviarope != null)
 					{
-						naviarope.onAdvEvent("enterInstance", npc, player);
+						naviarope.onEvent("enterInstance", npc, player);
 					}
 					break;
 				}
@@ -348,7 +348,7 @@ public final class Q10556_ForgottenPowerStartOfFate extends Quest
 					final Quest raister = QuestManager.getInstance().getQuest(PowerOfRaister.class.getSimpleName());
 					if (raister != null)
 					{
-						raister.onAdvEvent("enterInstance", npc, player);
+						raister.onEvent("enterInstance", npc, player);
 					}
 					break;
 				}
@@ -358,7 +358,7 @@ public final class Q10556_ForgottenPowerStartOfFate extends Quest
 					final Quest soltkreig = QuestManager.getInstance().getQuest(PowerOfSoltkreig.class.getSimpleName());
 					if (soltkreig != null)
 					{
-						soltkreig.onAdvEvent("enterInstance", npc, player);
+						soltkreig.onEvent("enterInstance", npc, player);
 					}
 					break;
 				}
@@ -368,7 +368,7 @@ public final class Q10556_ForgottenPowerStartOfFate extends Quest
 					final Quest lakcis = QuestManager.getInstance().getQuest(PowerOfLakcis.class.getSimpleName());
 					if (lakcis != null)
 					{
-						lakcis.onAdvEvent("enterInstance", npc, player);
+						lakcis.onEvent("enterInstance", npc, player);
 					}
 					break;
 				}
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10557_NewPowerWindsOfFate/Q10557_NewPowerWindsOfFate.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10557_NewPowerWindsOfFate/Q10557_NewPowerWindsOfFate.java
index a2cf99e670..f171fa8294 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10557_NewPowerWindsOfFate/Q10557_NewPowerWindsOfFate.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10557_NewPowerWindsOfFate/Q10557_NewPowerWindsOfFate.java
@@ -85,7 +85,7 @@ public final class Q10557_NewPowerWindsOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
@@ -180,7 +180,7 @@ public final class Q10557_NewPowerWindsOfFate extends Quest
 					final Quest faeron = QuestManager.getInstance().getQuest(FaeronVillage.class.getSimpleName());
 					if (faeron != null)
 					{
-						faeron.onAdvEvent("enterInstance", npc, player);
+						faeron.onEvent("enterInstance", npc, player);
 						switch (player.getClassId())
 						{
 							case EVISCERATOR_BALTHUS:
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10559_BeforeTheGuide/Q10559_BeforeTheGuide.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10559_BeforeTheGuide/Q10559_BeforeTheGuide.java
index 901a1fcb40..fd81b435f3 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10559_BeforeTheGuide/Q10559_BeforeTheGuide.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10559_BeforeTheGuide/Q10559_BeforeTheGuide.java
@@ -52,7 +52,7 @@ public final class Q10559_BeforeTheGuide extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10560_WayOfWanderingKnight/Q10560_WayOfWanderingKnight.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10560_WayOfWanderingKnight/Q10560_WayOfWanderingKnight.java
index add8bfc25b..9feef45665 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10560_WayOfWanderingKnight/Q10560_WayOfWanderingKnight.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10560_WayOfWanderingKnight/Q10560_WayOfWanderingKnight.java
@@ -80,7 +80,7 @@ public class Q10560_WayOfWanderingKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		final ClassId classId = player.getClassId();
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/Q10561_AcrossTheDeathLine.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/Q10561_AcrossTheDeathLine.java
index 9fc87aa701..f382802aae 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/Q10561_AcrossTheDeathLine.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/Q10561_AcrossTheDeathLine.java
@@ -58,7 +58,7 @@ public class Q10561_AcrossTheDeathLine extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10562_TakeUpArms/Q10562_TakeUpArms.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10562_TakeUpArms/Q10562_TakeUpArms.java
index 295605bcf8..2240a09db5 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10562_TakeUpArms/Q10562_TakeUpArms.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10562_TakeUpArms/Q10562_TakeUpArms.java
@@ -55,7 +55,7 @@ public class Q10562_TakeUpArms extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10563_ControlOfPower/Q10563_ControlOfPower.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10563_ControlOfPower/Q10563_ControlOfPower.java
index 59f2a942da..4c3ded8c3e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10563_ControlOfPower/Q10563_ControlOfPower.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10563_ControlOfPower/Q10563_ControlOfPower.java
@@ -61,7 +61,7 @@ public final class Q10563_ControlOfPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10564_ProveProgress/Q10564_ProveProgress.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10564_ProveProgress/Q10564_ProveProgress.java
index 47435da877..160354e383 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10564_ProveProgress/Q10564_ProveProgress.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10564_ProveProgress/Q10564_ProveProgress.java
@@ -60,7 +60,7 @@ public final class Q10564_ProveProgress extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10565_NothingIsImpossible/Q10565_NothingIsImpossible.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10565_NothingIsImpossible/Q10565_NothingIsImpossible.java
index 4c5000589d..725d04cd4a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10565_NothingIsImpossible/Q10565_NothingIsImpossible.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10565_NothingIsImpossible/Q10565_NothingIsImpossible.java
@@ -60,7 +60,7 @@ public final class Q10565_NothingIsImpossible extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
index 06dce8cce6..98043cea28 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
@@ -54,7 +54,7 @@ public class Q10566_BestChoice extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10567_SpecialMissionNornilsGarden/Q10567_SpecialMissionNornilsGarden.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10567_SpecialMissionNornilsGarden/Q10567_SpecialMissionNornilsGarden.java
index 6550a4d03e..a1f7ff00f3 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10567_SpecialMissionNornilsGarden/Q10567_SpecialMissionNornilsGarden.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10567_SpecialMissionNornilsGarden/Q10567_SpecialMissionNornilsGarden.java
@@ -54,7 +54,7 @@ public class Q10567_SpecialMissionNornilsGarden extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10568_KamaelsTechnologicalAdvancement/Q10568_KamaelsTechnologicalAdvancement.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10568_KamaelsTechnologicalAdvancement/Q10568_KamaelsTechnologicalAdvancement.java
index ce6037f64c..02b831dc03 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10568_KamaelsTechnologicalAdvancement/Q10568_KamaelsTechnologicalAdvancement.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10568_KamaelsTechnologicalAdvancement/Q10568_KamaelsTechnologicalAdvancement.java
@@ -64,7 +64,7 @@ public class Q10568_KamaelsTechnologicalAdvancement extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10569_DeclarationOfWar/Q10569_DeclarationOfWar.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10569_DeclarationOfWar/Q10569_DeclarationOfWar.java
index 947ea94aeb..4bb0999643 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10569_DeclarationOfWar/Q10569_DeclarationOfWar.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10569_DeclarationOfWar/Q10569_DeclarationOfWar.java
@@ -82,7 +82,7 @@ public class Q10569_DeclarationOfWar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10571_StrategicReconciliation/Q10571_StrategicReconciliation.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10571_StrategicReconciliation/Q10571_StrategicReconciliation.java
index 19234b84e3..f913993474 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10571_StrategicReconciliation/Q10571_StrategicReconciliation.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10571_StrategicReconciliation/Q10571_StrategicReconciliation.java
@@ -68,7 +68,7 @@ public class Q10571_StrategicReconciliation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java
index d47e535813..6ee4c52622 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java
@@ -74,7 +74,7 @@ public class Q10575_LetsGoFishing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java
index fbe765e74c..0e131f0668 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java
@@ -62,7 +62,7 @@ public class Q10576_GlitteringWeapons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java
index 1e62f333cb..546829376d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java
@@ -63,7 +63,7 @@ public class Q10577_TemperARustingBlade extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java
index 77b8eb101c..19bc9449dd 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java
@@ -63,7 +63,7 @@ public class Q10578_TheSoulOfASword extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java
index fc3a65c076..d7dbc2a6cb 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java
@@ -67,7 +67,7 @@ public class Q10579_ContainingTheAttributePower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10594_FergasonsScheme/Q10594_FergasonsScheme.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10594_FergasonsScheme/Q10594_FergasonsScheme.java
index 5c64dfa8cf..a897c26670 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10594_FergasonsScheme/Q10594_FergasonsScheme.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10594_FergasonsScheme/Q10594_FergasonsScheme.java
@@ -81,7 +81,7 @@ public final class Q10594_FergasonsScheme extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10597_EscapeToTheShadowOfTheMotherTree/Q10597_EscapeToTheShadowOfTheMotherTree.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10597_EscapeToTheShadowOfTheMotherTree/Q10597_EscapeToTheShadowOfTheMotherTree.java
index cf0beab6c6..287e636fb4 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10597_EscapeToTheShadowOfTheMotherTree/Q10597_EscapeToTheShadowOfTheMotherTree.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10597_EscapeToTheShadowOfTheMotherTree/Q10597_EscapeToTheShadowOfTheMotherTree.java
@@ -78,7 +78,7 @@ public class Q10597_EscapeToTheShadowOfTheMotherTree extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10598_WithAllYourMight/Q10598_WithAllYourMight.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10598_WithAllYourMight/Q10598_WithAllYourMight.java
index 0830015b97..11d8243e30 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10598_WithAllYourMight/Q10598_WithAllYourMight.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10598_WithAllYourMight/Q10598_WithAllYourMight.java
@@ -79,7 +79,7 @@ public class Q10598_WithAllYourMight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10599_ThreadOfFateHangingOnTheMotherTree/Q10599_ThreadOfFateHangingOnTheMotherTree.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10599_ThreadOfFateHangingOnTheMotherTree/Q10599_ThreadOfFateHangingOnTheMotherTree.java
index b87a0c021d..02d436c330 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10599_ThreadOfFateHangingOnTheMotherTree/Q10599_ThreadOfFateHangingOnTheMotherTree.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10599_ThreadOfFateHangingOnTheMotherTree/Q10599_ThreadOfFateHangingOnTheMotherTree.java
@@ -78,7 +78,7 @@ public class Q10599_ThreadOfFateHangingOnTheMotherTree extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/Q10658_MakkumInTheDimension.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/Q10658_MakkumInTheDimension.java
index 4345dfeba7..1f1ee2e21d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/Q10658_MakkumInTheDimension.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/Q10658_MakkumInTheDimension.java
@@ -50,7 +50,7 @@ public class Q10658_MakkumInTheDimension extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java
index 593c0d4936..e2bb80f5e5 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java
@@ -46,7 +46,7 @@ public class Q10701_TheRoadToDestruction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java
index 1ede0c4ba5..ba1153cd88 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java
@@ -46,7 +46,7 @@ public class Q10702_TheRoadToInfinity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java
index 2ee25d6af7..253b12cda4 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java
@@ -48,7 +48,7 @@ public class Q10703_BottleOfIstinasSoul extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java
index 23bae467b4..9e799c2fcb 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java
@@ -48,7 +48,7 @@ public class Q10704_BottleOfOctavisSoul extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java
index 94c10b561b..4c8ae1432b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java
@@ -48,7 +48,7 @@ public class Q10705_BottleOfTautisSoul extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java
index 331cc791c9..b9bbf6f7a1 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java
@@ -62,7 +62,7 @@ public class Q10707_FlamesOfSorrow extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java
index 4416c7807d..c804d64c68 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java
@@ -52,7 +52,7 @@ public class Q10708_StrengthenTheBarrier extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (event.equals("activateKey"))
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10709_TheStolenSeed/Q10709_TheStolenSeed.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10709_TheStolenSeed/Q10709_TheStolenSeed.java
index 7d9bf40f18..3cd7fe939a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10709_TheStolenSeed/Q10709_TheStolenSeed.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10709_TheStolenSeed/Q10709_TheStolenSeed.java
@@ -61,7 +61,7 @@ public class Q10709_TheStolenSeed extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (event.equals("action"))
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10710_LifeEnergyRepository/Q10710_LifeEnergyRepository.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10710_LifeEnergyRepository/Q10710_LifeEnergyRepository.java
index 8d8e2f2b35..62d33a8141 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10710_LifeEnergyRepository/Q10710_LifeEnergyRepository.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10710_LifeEnergyRepository/Q10710_LifeEnergyRepository.java
@@ -63,7 +63,7 @@ public class Q10710_LifeEnergyRepository extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (event.equals("action"))
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java
index 90003a043d..b6033b061d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java
@@ -46,7 +46,7 @@ public class Q10732_AForeignLand extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java
index 68becfc508..5bfca316b6 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java
@@ -52,7 +52,7 @@ public class Q10733_TheTestForSurvival extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java
index f71a8b29ac..dcb36039c8 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java
@@ -66,7 +66,7 @@ public class Q10734_DoOrDie extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java
index 6d51149018..fa1ffbfa27 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java
@@ -64,7 +64,7 @@ public class Q10735_ASpecialPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("33942-02.htm"))
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java
index 0712537c40..acc37c20ee 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java
@@ -63,7 +63,7 @@ public class Q10736_ASpecialPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("33943-02.htm"))
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java
index 86c056d93c..9d73490f3e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java
@@ -58,7 +58,7 @@ public class Q10737_GrakonsWarehouse extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java
index 18f6b4c6f8..f521e5f773 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java
@@ -51,7 +51,7 @@ public class Q10738_AnInnerBeauty extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java
index 4be8b937de..de9928d437 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java
@@ -65,7 +65,7 @@ public class Q10739_SupplyAndDemand extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java
index 051ea28cf9..d0313db269 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java
@@ -66,7 +66,7 @@ public class Q10740_NeverForget extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java
index 012d6a6263..fbf1a8b449 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java
@@ -57,7 +57,7 @@ public class Q10741_ADraughtForTheCold extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java
index e8c5f68163..ce6111db32 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java
@@ -62,7 +62,7 @@ public class Q10742_AFurryFriend extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java
index 51d978fd10..09456b6da9 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java
@@ -64,7 +64,7 @@ public class Q10743_StrangeFungus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java
index d81ff1fbc5..557934c425 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java
@@ -53,7 +53,7 @@ public class Q10744_StrongerThanSteel extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java
index 779a5affd6..dc292e67e4 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java
@@ -60,7 +60,7 @@ public class Q10745_TheSecretIngredients extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java
index 3774d264f0..811ce0b27c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java
@@ -57,7 +57,7 @@ public class Q10746_SeeTheWorld extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10748_MysteriousSuggestion1/Q10748_MysteriousSuggestion1.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10748_MysteriousSuggestion1/Q10748_MysteriousSuggestion1.java
index bf24739d4a..1db27a83de 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10748_MysteriousSuggestion1/Q10748_MysteriousSuggestion1.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10748_MysteriousSuggestion1/Q10748_MysteriousSuggestion1.java
@@ -54,7 +54,7 @@ public final class Q10748_MysteriousSuggestion1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10749_MysteriousSuggestion2/Q10749_MysteriousSuggestion2.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10749_MysteriousSuggestion2/Q10749_MysteriousSuggestion2.java
index 2e1b4f7932..fe683bb978 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10749_MysteriousSuggestion2/Q10749_MysteriousSuggestion2.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10749_MysteriousSuggestion2/Q10749_MysteriousSuggestion2.java
@@ -54,7 +54,7 @@ public final class Q10749_MysteriousSuggestion2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java
index 3cda144c48..f14723434f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java
@@ -98,7 +98,7 @@ public class Q10751_WindsOfFateEncounters extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java
index 6f75ff5ee7..b5d2e9720e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java
@@ -88,7 +88,7 @@ public class Q10752_WindsOfFateAPromise extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java
index 9802c626ae..8e72c775cf 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java
@@ -134,7 +134,7 @@ public class Q10753_WindsOfFateChoices extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10755_LettersFromTheQueenWindyHill/Q10755_LettersFromTheQueenWindyHill.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10755_LettersFromTheQueenWindyHill/Q10755_LettersFromTheQueenWindyHill.java
index 9aeaecedea..80d7827ec7 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10755_LettersFromTheQueenWindyHill/Q10755_LettersFromTheQueenWindyHill.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10755_LettersFromTheQueenWindyHill/Q10755_LettersFromTheQueenWindyHill.java
@@ -55,7 +55,7 @@ public class Q10755_LettersFromTheQueenWindyHill extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java
index 54f0924c8c..9addb06f6a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java
@@ -62,7 +62,7 @@ public class Q10756_AnInterdimensionalDraft extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java
index 145db2ec08..dc432da6f6 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java
@@ -59,7 +59,7 @@ public class Q10757_QuietingTheStorm extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10758_TheOathOfTheWind/Q10758_TheOathOfTheWind.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10758_TheOathOfTheWind/Q10758_TheOathOfTheWind.java
index 3782633f40..e8dbe9f291 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10758_TheOathOfTheWind/Q10758_TheOathOfTheWind.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10758_TheOathOfTheWind/Q10758_TheOathOfTheWind.java
@@ -54,7 +54,7 @@ public class Q10758_TheOathOfTheWind extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10760_LettersFromTheQueenOrcBarracks/Q10760_LettersFromTheQueenOrcBarracks.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10760_LettersFromTheQueenOrcBarracks/Q10760_LettersFromTheQueenOrcBarracks.java
index bb676024ab..9f1c80b400 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10760_LettersFromTheQueenOrcBarracks/Q10760_LettersFromTheQueenOrcBarracks.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10760_LettersFromTheQueenOrcBarracks/Q10760_LettersFromTheQueenOrcBarracks.java
@@ -55,7 +55,7 @@ public class Q10760_LettersFromTheQueenOrcBarracks extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java
index 74e8a89490..03a6b4b178 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java
@@ -65,7 +65,7 @@ public class Q10761_AnOrcInLove extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10762_MarionetteSpirit/Q10762_MarionetteSpirit.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10762_MarionetteSpirit/Q10762_MarionetteSpirit.java
index 0279f9aef0..ac750884a2 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10762_MarionetteSpirit/Q10762_MarionetteSpirit.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10762_MarionetteSpirit/Q10762_MarionetteSpirit.java
@@ -55,7 +55,7 @@ public class Q10762_MarionetteSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java
index 6bc6ed9b18..eb9e67177a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java
@@ -54,7 +54,7 @@ public class Q10763_TerrifyingChertuba extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java
index 54e982a6cd..dead250e0c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java
@@ -62,7 +62,7 @@ public class Q10764_FreeSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10766_ANewCraft/Q10766_ANewCraft.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10766_ANewCraft/Q10766_ANewCraft.java
index 41157ee92b..5fbafa35b2 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10766_ANewCraft/Q10766_ANewCraft.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10766_ANewCraft/Q10766_ANewCraft.java
@@ -63,7 +63,7 @@ public class Q10766_ANewCraft extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java
index 6fb43e4cd6..a82c8271e6 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java
@@ -60,7 +60,7 @@ public class Q10767_AWholeNewLevelOfAlchemy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10769_LettersFromTheQueenCrumaTowerPart1/Q10769_LettersFromTheQueenCrumaTowerPart1.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10769_LettersFromTheQueenCrumaTowerPart1/Q10769_LettersFromTheQueenCrumaTowerPart1.java
index 14fa88b6b0..0fedc60418 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10769_LettersFromTheQueenCrumaTowerPart1/Q10769_LettersFromTheQueenCrumaTowerPart1.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10769_LettersFromTheQueenCrumaTowerPart1/Q10769_LettersFromTheQueenCrumaTowerPart1.java
@@ -57,7 +57,7 @@ public class Q10769_LettersFromTheQueenCrumaTowerPart1 extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java
index 11ac5492a7..9b878bd1a3 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java
@@ -60,7 +60,7 @@ public class Q10770_InSearchOfTheGrail extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java
index 4fe64a9f90..73772df5d2 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java
@@ -59,7 +59,7 @@ public class Q10771_VolatilePower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java
index a50cba337e..ebffb6b105 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java
@@ -58,7 +58,7 @@ public class Q10772_ReportsFromCrumaTowerPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java
index 263715ca3c..153c60b44b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java
@@ -55,7 +55,7 @@ public class Q10774_LettersFromTheQueenCrumaTowerPart2 extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java
index 9d8bfdd905..7776d3ba24 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java
@@ -63,7 +63,7 @@ public class Q10775_InSearchOfAnAncientGiant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java
index 6e0b12b13b..546391adfd 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java
@@ -69,7 +69,7 @@ public class Q10776_TheWrathOfTheGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java
index ad558a3c03..d96d425c06 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java
@@ -58,7 +58,7 @@ public class Q10777_ReportsFromCrumaTowerPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10779_LettersFromTheQueenSeaOfSpores/Q10779_LettersFromTheQueenSeaOfSpores.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10779_LettersFromTheQueenSeaOfSpores/Q10779_LettersFromTheQueenSeaOfSpores.java
index ead65c1be8..943577fdd2 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10779_LettersFromTheQueenSeaOfSpores/Q10779_LettersFromTheQueenSeaOfSpores.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10779_LettersFromTheQueenSeaOfSpores/Q10779_LettersFromTheQueenSeaOfSpores.java
@@ -55,7 +55,7 @@ public class Q10779_LettersFromTheQueenSeaOfSpores extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java
index 8748c7c7f9..b3d2f0c99a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java
@@ -64,7 +64,7 @@ public class Q10780_AWeakenedBarrier extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10781_IngredientsToEnforcements/Q10781_IngredientsToEnforcements.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10781_IngredientsToEnforcements/Q10781_IngredientsToEnforcements.java
index 911dd56221..cb8ee37442 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10781_IngredientsToEnforcements/Q10781_IngredientsToEnforcements.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10781_IngredientsToEnforcements/Q10781_IngredientsToEnforcements.java
@@ -60,7 +60,7 @@ public class Q10781_IngredientsToEnforcements extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java
index 5dbea0b0ab..0e573f61a1 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java
@@ -55,7 +55,7 @@ public class Q10782_LettersFromTheQueenForsakenPlains extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java
index 04985fcd86..fb1188c3bf 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java
@@ -78,7 +78,7 @@ public class Q10783_TracesOfAnAmbush extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java
index 3e45259f8b..35165252b5 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java
@@ -66,7 +66,7 @@ public class Q10784_TheBrokenDevice extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java
index d8a021d469..9ce2946641 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java
@@ -55,7 +55,7 @@ public class Q10785_LettersFromTheQueenFieldsOfMassacre extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java
index e4aeb0a6c5..2a4efba6af 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java
@@ -72,7 +72,7 @@ public class Q10786_ResidentProblemSolver extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java
index a7cb5255a2..9e9e5ca51c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java
@@ -57,7 +57,7 @@ public class Q10787_ASpyMission extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java
index ee85567199..8b65f6fe1b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java
@@ -55,7 +55,7 @@ public class Q10789_LettersFromTheQueenSwampOfScreams extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java
index afdcde07a8..33df51f29a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java
@@ -73,7 +73,7 @@ public class Q10790_AMercenaryHelper extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java
index 2feff9b2af..d2c915008b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java
@@ -64,7 +64,7 @@ public class Q10791_TheManOfMystery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java
index 7549d9fa2f..416446e0e7 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java
@@ -55,7 +55,7 @@ public class Q10792_LettersFromTheQueenForestOfTheDead extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java
index b4aed022a7..353be489ac 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java
@@ -70,7 +70,7 @@ public class Q10793_SaveTheSouls extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java
index 0b66df0e5c..97425eba70 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java
@@ -94,7 +94,7 @@ public class Q10794_InvestigateTheForest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java
index 8df3dc83d3..bc6700e073 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java
@@ -40,7 +40,7 @@ public class Q10795_LettersFromTheQueenWallOfAgros extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java
index 26b6a34591..29464f9357 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java
@@ -66,7 +66,7 @@ public class Q10796_TheEyeThatDefiedTheGods extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
index 95fb61323c..34b86f9dc1 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
@@ -71,7 +71,7 @@ public class Q10797_CrossingFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java
index 6e4b0c1abc..9948808526 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java
@@ -56,7 +56,7 @@ public class Q10798_LettersFromTheQueenDragonValley extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java
index 092c19afb8..21165874a3 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java
@@ -69,7 +69,7 @@ public class Q10799_StrangeThingsAfootInTheValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java
index 6355ffa405..b72f3e4a66 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java
@@ -69,7 +69,7 @@ public class Q10800_ReconnaissanceAtDragonValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
index b1dca4d5b3..15fc371c1a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
@@ -55,7 +55,7 @@ public class Q10801_TheDimensionalWarpPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
index 1339720830..1b0c8d74d0 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
@@ -56,7 +56,7 @@ public class Q10802_TheDimensionalWarpPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
index 117f5cc53e..4cae513e93 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
@@ -57,7 +57,7 @@ public class Q10803_TheDimensionalWarpPart3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
index 124823783a..f16e276a8f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
@@ -57,7 +57,7 @@ public class Q10804_TheDimensionalWarpPart4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
index a6796e0c63..b80b2b6ae5 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
@@ -57,7 +57,7 @@ public class Q10805_TheDimensionalWarpPart5 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
index d6ecba6b8e..5a8d67d930 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
@@ -56,7 +56,7 @@ public class Q10806_TheDimensionalWarpPart6 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
index 12462309a1..393bbe074c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
@@ -56,7 +56,7 @@ public class Q10807_TheDimensionalWarpPart7 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
index df74301aed..67b8bcfb10 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
@@ -55,7 +55,7 @@ public class Q10811_ExaltedOneWhoFacesTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java
index d213b06ea2..d5f92b57d9 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java
@@ -114,7 +114,7 @@ public class Q10812_FacingSadness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10813_ForGlory/Q10813_ForGlory.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10813_ForGlory/Q10813_ForGlory.java
index 76fd620dde..89b572a2cc 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10813_ForGlory/Q10813_ForGlory.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10813_ForGlory/Q10813_ForGlory.java
@@ -58,7 +58,7 @@ public class Q10813_ForGlory extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java
index e487e06324..f583c8098b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java
@@ -75,7 +75,7 @@ public class Q10814_BefittingOfTheStatus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java
index e389fbdfcc..7f9ac0bd7d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java
@@ -66,7 +66,7 @@ public class Q10815_StepUp extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
index fdbdca62a6..e00434acbe 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
@@ -57,7 +57,7 @@ public class Q10817_ExaltedOneWhoOvercomesTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java
index 22cbb61194..0f898acae0 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java
@@ -64,7 +64,7 @@ public class Q10818_ConfrontingAGiantMonster extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10819_ForHonor/Q10819_ForHonor.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10819_ForHonor/Q10819_ForHonor.java
index d3d25867b9..250f860227 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10819_ForHonor/Q10819_ForHonor.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10819_ForHonor/Q10819_ForHonor.java
@@ -62,7 +62,7 @@ public class Q10819_ForHonor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10820_RelationshipsBefittingOfTheStatus/Q10820_RelationshipsBefittingOfTheStatus.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10820_RelationshipsBefittingOfTheStatus/Q10820_RelationshipsBefittingOfTheStatus.java
index d23b38f64a..126444e4a6 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10820_RelationshipsBefittingOfTheStatus/Q10820_RelationshipsBefittingOfTheStatus.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10820_RelationshipsBefittingOfTheStatus/Q10820_RelationshipsBefittingOfTheStatus.java
@@ -58,7 +58,7 @@ public class Q10820_RelationshipsBefittingOfTheStatus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10821_HelpingOthers/Q10821_HelpingOthers.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10821_HelpingOthers/Q10821_HelpingOthers.java
index 0ad084443b..bdbb8b5edb 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10821_HelpingOthers/Q10821_HelpingOthers.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10821_HelpingOthers/Q10821_HelpingOthers.java
@@ -55,7 +55,7 @@ public class Q10821_HelpingOthers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
index 6bf1ee6a4e..a795ecb975 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
@@ -59,7 +59,7 @@ public class Q10823_ExaltedOneWhoShattersTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java
index 68dd1f489a..b9d8b3ecb3 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java
@@ -55,7 +55,7 @@ public class Q10824_ConfrontingTheGreatestDanger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java
index d9982218ab..f62d1ec44d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java
@@ -61,7 +61,7 @@ public class Q10825_ForVictory extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10826_LuckBefittingOfTheStatus/Q10826_LuckBefittingOfTheStatus.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10826_LuckBefittingOfTheStatus/Q10826_LuckBefittingOfTheStatus.java
index 3ce9e62843..a74f6b22e4 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10826_LuckBefittingOfTheStatus/Q10826_LuckBefittingOfTheStatus.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10826_LuckBefittingOfTheStatus/Q10826_LuckBefittingOfTheStatus.java
@@ -76,7 +76,7 @@ public class Q10826_LuckBefittingOfTheStatus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10827_StepUpToLead/Q10827_StepUpToLead.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10827_StepUpToLead/Q10827_StepUpToLead.java
index 35fcab2537..73a3168454 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10827_StepUpToLead/Q10827_StepUpToLead.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10827_StepUpToLead/Q10827_StepUpToLead.java
@@ -58,7 +58,7 @@ public class Q10827_StepUpToLead extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10829_InSearchOfTheCause/Q10829_InSearchOfTheCause.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10829_InSearchOfTheCause/Q10829_InSearchOfTheCause.java
index 8f4b8ea015..8d961007e0 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10829_InSearchOfTheCause/Q10829_InSearchOfTheCause.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10829_InSearchOfTheCause/Q10829_InSearchOfTheCause.java
@@ -49,7 +49,7 @@ public class Q10829_InSearchOfTheCause extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/Q10830_TheLostGardenOfSpirits.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/Q10830_TheLostGardenOfSpirits.java
index f5a77a8c46..f1e8fcac8e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/Q10830_TheLostGardenOfSpirits.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/Q10830_TheLostGardenOfSpirits.java
@@ -63,7 +63,7 @@ public class Q10830_TheLostGardenOfSpirits extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10831_UnbelievableSight/Q10831_UnbelievableSight.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10831_UnbelievableSight/Q10831_UnbelievableSight.java
index 292e487dbb..09e8f8bffb 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10831_UnbelievableSight/Q10831_UnbelievableSight.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10831_UnbelievableSight/Q10831_UnbelievableSight.java
@@ -64,7 +64,7 @@ public class Q10831_UnbelievableSight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10832_EnergyOfSadnessAndAnger/Q10832_EnergyOfSadnessAndAnger.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10832_EnergyOfSadnessAndAnger/Q10832_EnergyOfSadnessAndAnger.java
index c3ba629f61..69125c3c8e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10832_EnergyOfSadnessAndAnger/Q10832_EnergyOfSadnessAndAnger.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10832_EnergyOfSadnessAndAnger/Q10832_EnergyOfSadnessAndAnger.java
@@ -79,7 +79,7 @@ public class Q10832_EnergyOfSadnessAndAnger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10833_PutTheQueenOfSpiritsToSleep/Q10833_PutTheQueenOfSpiritsToSleep.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10833_PutTheQueenOfSpiritsToSleep/Q10833_PutTheQueenOfSpiritsToSleep.java
index f139198949..0072e5d723 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10833_PutTheQueenOfSpiritsToSleep/Q10833_PutTheQueenOfSpiritsToSleep.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10833_PutTheQueenOfSpiritsToSleep/Q10833_PutTheQueenOfSpiritsToSleep.java
@@ -56,7 +56,7 @@ public class Q10833_PutTheQueenOfSpiritsToSleep extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10836_DisappearedClanMember/Q10836_DisappearedClanMember.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10836_DisappearedClanMember/Q10836_DisappearedClanMember.java
index 3b3f852c70..3230d13891 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10836_DisappearedClanMember/Q10836_DisappearedClanMember.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10836_DisappearedClanMember/Q10836_DisappearedClanMember.java
@@ -59,7 +59,7 @@ public class Q10836_DisappearedClanMember extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10837_LookingForTheBlackbirdClanMember/Q10837_LookingForTheBlackbirdClanMember.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10837_LookingForTheBlackbirdClanMember/Q10837_LookingForTheBlackbirdClanMember.java
index 217cabf9fb..a83cf4e3fa 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10837_LookingForTheBlackbirdClanMember/Q10837_LookingForTheBlackbirdClanMember.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10837_LookingForTheBlackbirdClanMember/Q10837_LookingForTheBlackbirdClanMember.java
@@ -54,7 +54,7 @@ public class Q10837_LookingForTheBlackbirdClanMember extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java
index 2ef2a3e32e..6b0de70720 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java
@@ -64,7 +64,7 @@ public class Q10838_TheReasonForNotBeingAbleToGetOut extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java
index 248d9275e5..c4ba15bb8f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java
@@ -61,7 +61,7 @@ public class Q10839_BlackbirdsNameValue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java
index 218f86f996..1a12c524a9 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java
@@ -63,7 +63,7 @@ public class Q10840_TimeToRecover extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java
index 8cf3b7506e..cae50c4972 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java
@@ -53,7 +53,7 @@ public class Q10841_DeepInsideAteliaFortress extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10843_AnomalyInTheEnchantedValley/Q10843_AnomalyInTheEnchantedValley.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10843_AnomalyInTheEnchantedValley/Q10843_AnomalyInTheEnchantedValley.java
index e1712c2ba9..ae707e925f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10843_AnomalyInTheEnchantedValley/Q10843_AnomalyInTheEnchantedValley.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10843_AnomalyInTheEnchantedValley/Q10843_AnomalyInTheEnchantedValley.java
@@ -48,7 +48,7 @@ public class Q10843_AnomalyInTheEnchantedValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10844_BloodyBattleSeizingSupplies/Q10844_BloodyBattleSeizingSupplies.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10844_BloodyBattleSeizingSupplies/Q10844_BloodyBattleSeizingSupplies.java
index 3a18492bfa..95e9f265f1 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10844_BloodyBattleSeizingSupplies/Q10844_BloodyBattleSeizingSupplies.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10844_BloodyBattleSeizingSupplies/Q10844_BloodyBattleSeizingSupplies.java
@@ -56,7 +56,7 @@ public class Q10844_BloodyBattleSeizingSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10845_BloodyBattleRescueTheSmiths/Q10845_BloodyBattleRescueTheSmiths.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10845_BloodyBattleRescueTheSmiths/Q10845_BloodyBattleRescueTheSmiths.java
index 262fbdc4b5..632574f511 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10845_BloodyBattleRescueTheSmiths/Q10845_BloodyBattleRescueTheSmiths.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10845_BloodyBattleRescueTheSmiths/Q10845_BloodyBattleRescueTheSmiths.java
@@ -62,7 +62,7 @@ public final class Q10845_BloodyBattleRescueTheSmiths extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = event;
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10846_BloodyBattleMeetingTheCommander/Q10846_BloodyBattleMeetingTheCommander.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10846_BloodyBattleMeetingTheCommander/Q10846_BloodyBattleMeetingTheCommander.java
index 6a229188da..e3d0e59e43 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10846_BloodyBattleMeetingTheCommander/Q10846_BloodyBattleMeetingTheCommander.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10846_BloodyBattleMeetingTheCommander/Q10846_BloodyBattleMeetingTheCommander.java
@@ -53,7 +53,7 @@ public class Q10846_BloodyBattleMeetingTheCommander extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10848_TrialsBeforeTheBattle/Q10848_TrialsBeforeTheBattle.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10848_TrialsBeforeTheBattle/Q10848_TrialsBeforeTheBattle.java
index 868ecb9bdc..cad927beb2 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10848_TrialsBeforeTheBattle/Q10848_TrialsBeforeTheBattle.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10848_TrialsBeforeTheBattle/Q10848_TrialsBeforeTheBattle.java
@@ -58,7 +58,7 @@ public final class Q10848_TrialsBeforeTheBattle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10849_TrialsForAdaptation/Q10849_TrialsForAdaptation.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10849_TrialsForAdaptation/Q10849_TrialsForAdaptation.java
index 8f77ff4caf..437e5c9a8e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10849_TrialsForAdaptation/Q10849_TrialsForAdaptation.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10849_TrialsForAdaptation/Q10849_TrialsForAdaptation.java
@@ -76,7 +76,7 @@ public class Q10849_TrialsForAdaptation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10851_ElvenBotany/Q10851_ElvenBotany.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10851_ElvenBotany/Q10851_ElvenBotany.java
index d22f5130b5..e74becd0de 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10851_ElvenBotany/Q10851_ElvenBotany.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10851_ElvenBotany/Q10851_ElvenBotany.java
@@ -58,7 +58,7 @@ public class Q10851_ElvenBotany extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10852_TheMotherTreeRevivalProject/Q10852_TheMotherTreeRevivalProject.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10852_TheMotherTreeRevivalProject/Q10852_TheMotherTreeRevivalProject.java
index 650f2a8248..ea67637b49 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10852_TheMotherTreeRevivalProject/Q10852_TheMotherTreeRevivalProject.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10852_TheMotherTreeRevivalProject/Q10852_TheMotherTreeRevivalProject.java
@@ -82,7 +82,7 @@ public class Q10852_TheMotherTreeRevivalProject extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10853_ToWeakenTheGiants/Q10853_ToWeakenTheGiants.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10853_ToWeakenTheGiants/Q10853_ToWeakenTheGiants.java
index d631d47348..70eddc1c55 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10853_ToWeakenTheGiants/Q10853_ToWeakenTheGiants.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10853_ToWeakenTheGiants/Q10853_ToWeakenTheGiants.java
@@ -60,7 +60,7 @@ public final class Q10853_ToWeakenTheGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10854_ToSeizeTheFortress/Q10854_ToSeizeTheFortress.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10854_ToSeizeTheFortress/Q10854_ToSeizeTheFortress.java
index 0f131cd3d9..dbdc97fc8b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10854_ToSeizeTheFortress/Q10854_ToSeizeTheFortress.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10854_ToSeizeTheFortress/Q10854_ToSeizeTheFortress.java
@@ -77,7 +77,7 @@ public final class Q10854_ToSeizeTheFortress extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = event;
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10856_SuperionAppears/Q10856_SuperionAppears.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10856_SuperionAppears/Q10856_SuperionAppears.java
index 6beea62bcf..37c5a21afe 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10856_SuperionAppears/Q10856_SuperionAppears.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10856_SuperionAppears/Q10856_SuperionAppears.java
@@ -45,7 +45,7 @@ public class Q10856_SuperionAppears extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10857_SecretTeleport/Q10857_SecretTeleport.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10857_SecretTeleport/Q10857_SecretTeleport.java
index 80fce78d5e..8db2ad22a1 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10857_SecretTeleport/Q10857_SecretTeleport.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10857_SecretTeleport/Q10857_SecretTeleport.java
@@ -69,7 +69,7 @@ public class Q10857_SecretTeleport extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10858_QueenRamonaControllerOfTheVessel/Q10858_QueenRamonaControllerOfTheVessel.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10858_QueenRamonaControllerOfTheVessel/Q10858_QueenRamonaControllerOfTheVessel.java
index 8343b8e737..6adf4b1901 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10858_QueenRamonaControllerOfTheVessel/Q10858_QueenRamonaControllerOfTheVessel.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10858_QueenRamonaControllerOfTheVessel/Q10858_QueenRamonaControllerOfTheVessel.java
@@ -50,7 +50,7 @@ public class Q10858_QueenRamonaControllerOfTheVessel extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10859_OwnTheEarthAndTheHeavens/Q10859_OwnTheEarthAndTheHeavens.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10859_OwnTheEarthAndTheHeavens/Q10859_OwnTheEarthAndTheHeavens.java
index d4ac9e202b..f5e36c2340 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10859_OwnTheEarthAndTheHeavens/Q10859_OwnTheEarthAndTheHeavens.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10859_OwnTheEarthAndTheHeavens/Q10859_OwnTheEarthAndTheHeavens.java
@@ -50,7 +50,7 @@ public class Q10859_OwnTheEarthAndTheHeavens extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
index 9fbdc244ba..88771cce29 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
@@ -57,7 +57,7 @@ public class Q10873_ExaltedReachingAnotherLevel extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10874_AgainstTheNewEnemy/Q10874_AgainstTheNewEnemy.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10874_AgainstTheNewEnemy/Q10874_AgainstTheNewEnemy.java
index 3e4007dfe2..62cde0f803 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10874_AgainstTheNewEnemy/Q10874_AgainstTheNewEnemy.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10874_AgainstTheNewEnemy/Q10874_AgainstTheNewEnemy.java
@@ -103,7 +103,7 @@ public class Q10874_AgainstTheNewEnemy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10875_ForReputation/Q10875_ForReputation.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10875_ForReputation/Q10875_ForReputation.java
index f022445f8b..c4c5405e4a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10875_ForReputation/Q10875_ForReputation.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10875_ForReputation/Q10875_ForReputation.java
@@ -53,7 +53,7 @@ public class Q10875_ForReputation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10876_LeadersGrace/Q10876_LeadersGrace.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10876_LeadersGrace/Q10876_LeadersGrace.java
index 05cb70e278..db3a2b2c73 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10876_LeadersGrace/Q10876_LeadersGrace.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10876_LeadersGrace/Q10876_LeadersGrace.java
@@ -56,7 +56,7 @@ public class Q10876_LeadersGrace extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10877_BreakThroughCrisis/Q10877_BreakThroughCrisis.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10877_BreakThroughCrisis/Q10877_BreakThroughCrisis.java
index 8f0c4a3231..929436212f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10877_BreakThroughCrisis/Q10877_BreakThroughCrisis.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10877_BreakThroughCrisis/Q10877_BreakThroughCrisis.java
@@ -59,7 +59,7 @@ public class Q10877_BreakThroughCrisis extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java
index 9fa54a275d..a291386f62 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java
@@ -57,7 +57,7 @@ public class Q10879_ExaltedGuideToPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10880_TheLastOneStanding/Q10880_TheLastOneStanding.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10880_TheLastOneStanding/Q10880_TheLastOneStanding.java
index 4154dcb533..a18705914f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10880_TheLastOneStanding/Q10880_TheLastOneStanding.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10880_TheLastOneStanding/Q10880_TheLastOneStanding.java
@@ -126,7 +126,7 @@ public class Q10880_TheLastOneStanding extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10881_ForThePride/Q10881_ForThePride.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10881_ForThePride/Q10881_ForThePride.java
index 60f565fe71..c3ccdaa708 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10881_ForThePride/Q10881_ForThePride.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10881_ForThePride/Q10881_ForThePride.java
@@ -56,7 +56,7 @@ public class Q10881_ForThePride extends Quest
 	private static final int MIN_LEVEL = 104;
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10882_VictoryCollection/Q10882_VictoryCollection.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10882_VictoryCollection/Q10882_VictoryCollection.java
index 0b64afccd2..8ae5ea873e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10882_VictoryCollection/Q10882_VictoryCollection.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10882_VictoryCollection/Q10882_VictoryCollection.java
@@ -78,7 +78,7 @@ public class Q10882_VictoryCollection extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10883_ImmortalHonor/Q10883_ImmortalHonor.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10883_ImmortalHonor/Q10883_ImmortalHonor.java
index ba80484f13..3bb1ae6dd2 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10883_ImmortalHonor/Q10883_ImmortalHonor.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10883_ImmortalHonor/Q10883_ImmortalHonor.java
@@ -57,7 +57,7 @@ public class Q10883_ImmortalHonor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/ThirdClassTransferQuest.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
index b230b12a5b..e0ee0b931a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
@@ -133,7 +133,7 @@ public abstract class ThirdClassTransferQuest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/vehicles/AirShipController.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/vehicles/AirShipController.java
index 682f3b238b..ee534c5f04 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/vehicles/AirShipController.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/vehicles/AirShipController.java
@@ -117,7 +117,7 @@ public abstract class AirShipController extends AbstractNpcAI
 	private static final SystemMessage SM_NEED_MORE = new SystemMessage(SystemMessageId.AN_AIRSHIP_CANNOT_BE_SUMMONED_BECAUSE_YOU_DON_T_HAVE_ENOUGH_S1).addItemName(STARSTONE);
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("summon".equalsIgnoreCase(event))
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
index a1ff9f0e0a..c5dc6f515f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
@@ -162,7 +162,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player.isTransformed())
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
index 7ff39fb0c0..8675a7ec2c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
@@ -51,7 +51,7 @@ public class AllianceMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!"9001-01.htm".equals(event) && (player.getClan() == null))
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
index 2886a6556e..e091ef9b7e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
@@ -73,7 +73,7 @@ public class ClanMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LEADER_REQUIRED.containsKey(event) && !player.isClanLeader())
 		{
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/quest/Quest.java
index 270725d319..09e6c336cc 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/quest/Quest.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/quest/Quest.java
@@ -247,7 +247,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -269,7 +269,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -560,7 +560,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 			{
 				player.setSimulatedTalking(false);
 			}
-			res = onAdvEvent(event, npc, player);
+			res = onEvent(event, npc, player);
 		}
 		catch (Exception e)
 		{
@@ -1038,12 +1038,11 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 */
 	public String onDeath(Creature killer, Creature victim, QuestState qs)
 	{
-		return onAdvEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
+		return onEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
 	}
 	
 	/**
 	 * This function is called whenever a player clicks on a link in a quest dialog and whenever a timer fires.<br>
-	 * If is not overridden by a subclass, then default to the returned value of the simpler (and older) {@link #onEvent(String, QuestState)} override.<br>
 	 * If the player has a quest state, use it as parameter in the next call, otherwise return null.
 	 * @param event this parameter contains a string identifier for the event.<br>
 	 *            Generally, this string is passed directly via the link.<br>
@@ -1062,35 +1061,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 *            This parameter may be {@code null} in certain circumstances.
 	 * @return the text returned by the event (may be {@code null}, a filename or just text)
 	 */
-	public String onAdvEvent(String event, Npc npc, Player player)
-	{
-		if (player != null)
-		{
-			final QuestState qs = player.getQuestState(getName());
-			if (qs != null)
-			{
-				return onEvent(event, qs);
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * This function is called in place of {@link #onAdvEvent(String, Npc, Player)} if the former is not implemented.<br>
-	 * If a script contains both {@link #onAdvEvent(String, Npc, Player)} and this implementation, then this method will never be called unless the script's {@link #onAdvEvent(String, Npc, Player)} explicitly calls this method.
-	 * @param event this parameter contains a string identifier for the event.<br>
-	 *            Generally, this string is passed directly via the link.<br>
-	 *            For example:<br>
-	 *            <code>
-	 *            &lt;a action="bypass -h Quest 626_ADarkTwilight 31517-01.htm"&gt;hello&lt;/a&gt;
-	 *            </code><br>
-	 *            The above link sets the event variable to "31517-01.htm" for the quest 626_ADarkTwilight.<br>
-	 *            In the case of timers, this will be the name of the timer.<br>
-	 *            This parameter serves as a sort of identifier.
-	 * @param qs this parameter contains a reference to the quest state of the player who used the link or started the timer.
-	 * @return the text returned by the event (may be {@code null}, a filename or just text)
-	 */
-	public String onEvent(String event, QuestState qs)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return null;
 	}
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java
index 3246831bf4..62d6ebb211 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java
@@ -47,7 +47,7 @@ public class Herphah extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java
index 235fd9d2a3..086f8aeab5 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java
@@ -47,7 +47,7 @@ public class Penny extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java
index 2ab35f83dc..6740fe6383 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java
@@ -46,7 +46,7 @@ public class Ruine extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
index e85df039b0..0ebae68471 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
@@ -73,7 +73,7 @@ public class AncientArcanCity extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CHANGE_STATE"))
 		{
@@ -107,7 +107,7 @@ public class AncientArcanCity extends AbstractNpcAI
 				cat.broadcastSocialAction(2);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
index d76c158f9e..d38ceb917e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
@@ -42,7 +42,7 @@ public class Lykus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
index 4fd3e87bb7..92979a713e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
@@ -39,7 +39,7 @@ public class Mumu extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
index 56ceed0cda..34c3cc9100 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
@@ -329,7 +329,7 @@ public class AteliaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/AteliaFortress/TeleportDevice/TeleportDevice.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/AteliaFortress/TeleportDevice/TeleportDevice.java
index 9ea87d2149..7ff361c8e1 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/AteliaFortress/TeleportDevice/TeleportDevice.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/AteliaFortress/TeleportDevice/TeleportDevice.java
@@ -45,7 +45,7 @@ public class TeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player.getFactionLevel(Faction.KINGDOM_ROYAL_GUARDS) < 3)
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java
index e589643825..af3454fafd 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java
@@ -62,7 +62,7 @@ public class AteliaRefinery extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
index c87c4e9224..a2a2891b57 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
@@ -56,7 +56,7 @@ public class BabyPets extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("HEAL") && (player != null))
 		{
@@ -78,7 +78,7 @@ public class BabyPets extends AbstractNpcAI
 				cancelQuestTimer("HEAL", null, player);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGOUT)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
index b0153ef5da..f0f610c8b9 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
@@ -56,7 +56,7 @@ public class ImprovedBabyPets extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player != null)
 		{
@@ -108,7 +108,7 @@ public class ImprovedBabyPets extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
index 6b4a147550..301899a76f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
@@ -42,7 +42,7 @@ public class Tunatun extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/BlackbirdCampsite/BlackbirdCampsite.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/BlackbirdCampsite/BlackbirdCampsite.java
index 8940c4c672..984a0abd2e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/BlackbirdCampsite/BlackbirdCampsite.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/BlackbirdCampsite/BlackbirdCampsite.java
@@ -48,7 +48,7 @@ public class BlackbirdCampsite extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -81,7 +81,7 @@ public class BlackbirdCampsite extends AbstractNpcAI
 				return "34434-5.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java
index f6485e07b4..2693ef7a00 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java
@@ -48,7 +48,7 @@ public class Alarm extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Player player0 = npc.getVariables().getObject("player0", Player.class);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
index a2b4810dfa..ad01bdba4a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
@@ -46,14 +46,14 @@ public class CrumaTower extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("MESSAGE") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_GO_TO_UNDERGROUND_LV_3_USING_THE_ELEVATOR_IN_THE_BACK);
 			startQuestTimer(event, 15000, npc, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
index 7cab0d9caf..9ac87f3024 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
@@ -77,7 +77,7 @@ public class FrightenedRagnaOrc extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
index ee5d44d59e..db9d7838fc 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
@@ -53,7 +53,7 @@ public class DragonVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("Spawn".equals(event))
 		{
@@ -104,7 +104,7 @@ public class DragonVortex extends AbstractNpcAI
 		{
 			npc.setScriptValue(0);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
index de54d68cf6..ce248d3f8f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
@@ -53,7 +53,7 @@ public class LairOfAntharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CHECK_HOME") && (npc != null) && !npc.isDead())
 		{
@@ -67,7 +67,7 @@ public class LairOfAntharas extends AbstractNpcAI
 				npc.broadcastPacket(new ValidateLocation(npc));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
index bf46d16542..c4e625c565 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
@@ -55,7 +55,7 @@ public class LeopardDragonHachling extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && event.equals("MOVE_TO_TRANSFORM"))
 		{
@@ -77,7 +77,7 @@ public class LeopardDragonHachling extends AbstractNpcAI
 				npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, nearestLocation(npc));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
index 04396d3683..6f794f4008 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
@@ -40,13 +40,13 @@ public class MercenaryCaptain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THE_EASTERN_PART_OF_DRAGON_VALLEY_IS_MUCH_MORE_DANGEROUS_THAN_THE_WEST_BE_CAREFUL));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
index 13dfbd313b..324120327b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
@@ -61,10 +61,10 @@ public class MercenaryTeleport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		player.teleToLocation(LOCATIONS.get(event), true);
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DragonValley/Namo.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
index 99057c816c..f21c497157 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
@@ -40,13 +40,13 @@ public class Namo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THIS_PLACE_SWARMS_WITH_DRAGONS_BY_DAY_AND_UNDEAD_BY_NIGHT));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
index 32c7beb400..c02404f76a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
@@ -40,13 +40,13 @@ public class Rakun extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THIS_PLACE_SWARMS_WITH_DRAGONS_BY_DAY_AND_UNDEAD_BY_NIGHT));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
index 349976c56b..cc5487971c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
@@ -72,7 +72,7 @@ public class SeparatedSoul extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LOCATIONS.containsKey(event))
 		{
@@ -98,7 +98,7 @@ public class SeparatedSoul extends AbstractNpcAI
 				return "no-items.htm";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java
index 2125fca0d8..870b8a5820 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java
@@ -50,7 +50,7 @@ public class Celestiel extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java
index 4cb6303606..8d927f12d2 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java
@@ -48,7 +48,7 @@ public class FlowerBud extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("spawn") && npc.isDead())
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
index 8ca5f0c7d4..a3b3d2da62 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
@@ -49,7 +49,7 @@ public class AltarOfSouls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -96,7 +96,7 @@ public class AltarOfSouls extends AbstractNpcAI
 				return "33920-9.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
index 47beace94a..c82e8969f1 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
@@ -41,7 +41,7 @@ public class RemembranceTower extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("action") && npc.isScriptValue(0))
 		{
@@ -54,7 +54,7 @@ public class RemembranceTower extends AbstractNpcAI
 			npc.setScriptValue(0);
 			npc.broadcastPacket(new OnEventTrigger(EMMITER_ID, false));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
index 39625630cd..0d3824cd68 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
@@ -60,7 +60,7 @@ public class LargeCocoon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -138,7 +138,7 @@ public class LargeCocoon extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
index d4a9137f8d..20aad104b0 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
@@ -41,7 +41,7 @@ public class KrateisCube extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
index 54f813c829..c1de7e5630 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
@@ -365,7 +365,7 @@ public class TalentShow extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((event == null) || event.isEmpty())
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
index 099500e9bb..8dea4780a1 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
@@ -41,7 +41,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -54,7 +54,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 				npc.deleteMe();
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_DAY_NIGHT_CHANGE)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
index 8029a17703..20dfae5ccf 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
@@ -88,7 +88,7 @@ public class ForgeOfTheGods extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
index ba045bd19c..39fcc5a8d7 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
@@ -84,7 +84,7 @@ public class Rooney extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport") && !npc.isDecayed())
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
index a3bc5828d9..40c8ad2e0d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
@@ -87,7 +87,7 @@ public class GainakSiege extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("GAINAK_WAR"))
 		{
@@ -129,7 +129,7 @@ public class GainakSiege extends AbstractNpcAI
 				ZoneManager.getInstance().getZoneById(GAINAK_TOWN_ZONE.getId(), PeaceZone.class).setEnabled(false);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
index 27e969e0c9..955c7ddd25 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
@@ -46,7 +46,7 @@ public class Lailly extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
index 35274b2de7..ca8919593a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
@@ -128,7 +128,7 @@ public class TavernEmployee extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
index c99c7cdf42..0ff79c4f5d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
@@ -76,7 +76,7 @@ public class Apherus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("buff"))
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
index 06a75493ac..d7944dd6f3 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
@@ -40,7 +40,7 @@ public class ApherusLookout extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		if (event.equals("open_bag"))
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
index e984558e2c..0d30623e93 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
@@ -48,7 +48,7 @@ public class GardenWatchman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -78,7 +78,7 @@ public class GardenWatchman extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
index 02b6a47091..42752aea0c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
@@ -42,7 +42,7 @@ public class GenesisVines extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CAST_SKILL") && npc.isScriptValue(1))
 		{
@@ -58,7 +58,7 @@ public class GenesisVines extends AbstractNpcAI
 			npc.setScriptValue(0);
 			npc.deleteMe();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
index 3216884d13..ab0d91e3cd 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
@@ -53,7 +53,7 @@ public class Statues extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("fight"))
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfSpirits/Belas/Belas.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfSpirits/Belas/Belas.java
index 526cfce78f..00cfa7a674 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfSpirits/Belas/Belas.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfSpirits/Belas/Belas.java
@@ -44,7 +44,7 @@ public class Belas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfSpirits/Dinford/Dinford.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfSpirits/Dinford/Dinford.java
index 6f9f40ec3c..742cc37560 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfSpirits/Dinford/Dinford.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfSpirits/Dinford/Dinford.java
@@ -46,7 +46,7 @@ public class Dinford extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java
index bdffef8294..386587cc49 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java
@@ -40,7 +40,7 @@ public class Eubina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
index 29ccfb6308..64246fbb51 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
@@ -46,7 +46,7 @@ public class FuryKiku extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -76,7 +76,7 @@ public class FuryKiku extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
index 7c2b546530..203f873b61 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
@@ -50,7 +50,7 @@ public class Isabella extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAWN"))
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java
index fab023bab3..5e9e8d3a57 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java
@@ -40,7 +40,7 @@ public class Rotoeh extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
index dc07df1c2f..a7ab45ea5e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
@@ -42,7 +42,7 @@ public class GiantsCave extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
index 50c14b79bb..20f3adf32d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
@@ -57,7 +57,7 @@ public class Kekropus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
index d4c54fcddd..9e41be2b4a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
@@ -82,7 +82,7 @@ public class Spirit extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -102,7 +102,7 @@ public class Spirit extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Heine/WrapGate.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
index eb934ee4dc..bd1d86a743 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
@@ -43,7 +43,7 @@ public class WrapGate extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("enter_hellbound".equals(event))
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java
index 245a039160..074991c7f8 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java
@@ -79,7 +79,7 @@ public class EnchantedMegaliths extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
index e49050b695..c4486b2670 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
@@ -39,7 +39,7 @@ public class LeonaBlackbird extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
index 888a2980ef..5923d188eb 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
@@ -60,7 +60,7 @@ public class Theorn extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
index e026f3cd57..5ef95aed5e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
@@ -47,7 +47,7 @@ public class Merlot extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/ImperialTomb/BloodySuccubus.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/ImperialTomb/BloodySuccubus.java
index 1f56178ded..2ab48d235a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/ImperialTomb/BloodySuccubus.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/ImperialTomb/BloodySuccubus.java
@@ -118,7 +118,7 @@ public class BloodySuccubus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
index 8ca61e5e9b..78ff485aca 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
@@ -218,7 +218,7 @@ public class FourSepulchers extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
index 6ea0a0760f..14c4560f16 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
@@ -43,7 +43,7 @@ public class Zenya extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
index 2b048463f8..99e8fa6078 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
@@ -63,7 +63,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -135,7 +135,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 				npc.reduceCurrentHp(500, npc, null); // poison kills Fafurion if he is not healed
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
index 2a0a8014f8..d4dc25aab8 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
@@ -47,7 +47,7 @@ public class Rignos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -90,7 +90,7 @@ public class Rignos extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
index 43e2c64226..af4b116516 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
@@ -57,7 +57,7 @@ public class HillsOfGold extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -75,7 +75,7 @@ public class HillsOfGold extends AbstractNpcAI
 			});
 			startQuestTimer("SPICULA_AGGRO", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
index edf9416113..efaf6d6bf8 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
@@ -61,7 +61,7 @@ public class AvantGarde extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
index 37f35f00f8..ac8772d975 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
@@ -108,7 +108,7 @@ public class KetraOrcSupport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
index 6c1085f7d0..f253eadcb6 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
@@ -38,13 +38,13 @@ public class El extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_USE_THE_JUMP_BOARD_TO_GET_STRAIGHT_TO_THE_2ND_FLOOR, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
index 92b4915758..085300cd9c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
@@ -47,7 +47,7 @@ public class Erda extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
@@ -113,7 +113,7 @@ public class Erda extends AbstractNpcAI
 		{
 			player.teleToLocation(CAMILLE_LOC, true);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
index 282d7a6326..debef79252 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
@@ -58,7 +58,7 @@ public class GeneralDilios extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("command_"))
 		{
@@ -87,7 +87,7 @@ public class GeneralDilios extends AbstractNpcAI
 				startQuestTimer("guard_animation_" + (value + 1), 1500, null, null);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
index 0a84cf47a0..b4dbbc74ae 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
@@ -47,7 +47,7 @@ public class Lekon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
index e4edb350d4..3cdddadb06 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
@@ -56,7 +56,7 @@ public class LindviorScene extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -109,7 +109,7 @@ public class LindviorScene extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public void scheduleNextLindviorVisit()
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
index 43c01dcd8b..8f6933b116 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
@@ -57,7 +57,7 @@ public class Nottingale extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
index 975e4a2614..b0ded82d61 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
@@ -38,13 +38,13 @@ public class Plenos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_BE_TELEPORTED_TO_EACH_SEED_IF_YOU_VOLUNTEER_WHY_NOT_TRY, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
index 18f2110178..7fc2284ccb 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
@@ -46,7 +46,7 @@ public class SeedTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -75,7 +75,7 @@ public class SeedTeleportDevice extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
index 23b5c50033..c8498cbee5 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
@@ -49,7 +49,7 @@ public class MithrilMinesTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int index = Integer.parseInt(event) - 1;
 		if (LOCS.length > index)
@@ -57,7 +57,7 @@ public class MithrilMinesTeleporter extends AbstractNpcAI
 			final Location loc = LOCS[index];
 			player.teleToLocation(loc, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
index 6f4192f837..e5abb08edb 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
@@ -84,7 +84,7 @@ public class MonasteryOfSilence extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -132,7 +132,7 @@ public class MonasteryOfSilence extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
index 9a2ee10f60..434807bd9e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
@@ -62,7 +62,7 @@ public class PaganTeleporters extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
index 7eed58ebec..1c6e6ba756 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
@@ -60,7 +60,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -90,7 +90,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI
 				instanceScript.notifyEvent(event, npc, player);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
index 9d4b3bde33..781bfa3af3 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
@@ -39,13 +39,13 @@ public class Fioren extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("startMovie"))
 		{
 			playMovie(player, Movie.SI_BARLOG_STORY);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java
index 9c52a15e19..2d6d808bad 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java
@@ -93,7 +93,7 @@ public class PlainsOfLizardman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("fantasy_mushroom") && (npc != null) && (player != null))
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
index f2332c3567..37bd258812 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
@@ -179,7 +179,7 @@ public class PrimevalIsle extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -239,7 +239,7 @@ public class PrimevalIsle extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
index 5ffc401682..6a166ec683 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
@@ -74,7 +74,7 @@ public class Kaysen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
index 619d9e57f4..ceb8d8a7b9 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
@@ -63,7 +63,7 @@ public class NervasTemporaryPrison extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
index b8b803e57f..43691cef06 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
@@ -38,14 +38,14 @@ public class RoAGuard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THIS_IS_RUINS_OF_AGONY_WHERE_KANILOV_IS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
index f3af67aba7..dd2a52bdc5 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
@@ -38,14 +38,14 @@ public class RoDGuard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THIS_IS_THE_RUINS_OF_AGONY_WHERE_POSLOF_IS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
index 5e57a9fb94..a19c1d4085 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
@@ -48,7 +48,7 @@ public class AltarOfSacrifice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("msg_text"))
 		{
@@ -68,7 +68,7 @@ public class AltarOfSacrifice extends AbstractNpcAI
 			startQuestTimer("msg_text", 135000, npc, null);
 			_jenas_guard.setScriptValue(0);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
index a025e62542..b50f530164 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
@@ -147,7 +147,7 @@ public class Venom extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
index ed4ce2d782..cd89ebcb9e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
@@ -43,7 +43,7 @@ public class Klemis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("portInside"))
 		{
@@ -56,7 +56,7 @@ public class Klemis extends AbstractNpcAI
 				return "32734-01.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
index d66782538a..c1db3c8180 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
@@ -80,7 +80,7 @@ public class Maguen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || (player == null))
 		{
@@ -163,7 +163,7 @@ public class Maguen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
index 344d65a44f..d5ab73ff74 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
@@ -48,7 +48,7 @@ public class Nemo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
index 251458ea98..ae26a6c701 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
@@ -297,7 +297,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("ChangeSeedsStatus"))
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
index d6f644fa86..765deb4a7d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
@@ -51,7 +51,7 @@ public class Seyo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (npc == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
index f213bbec6c..f62aa835e8 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
@@ -132,7 +132,7 @@ public class SelMahumDrill extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -188,7 +188,7 @@ public class SelMahumDrill extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
index 4d3891946f..4e0a01cea2 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
@@ -83,7 +83,7 @@ public class SelMahumSquad extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -189,7 +189,7 @@ public class SelMahumSquad extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java
index 1c47135e60..a38df65796 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java
@@ -70,7 +70,7 @@ public class SilentValley extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
index ebf70cc5ae..6ba58ffc8e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
@@ -197,7 +197,7 @@ public class StakatoNest extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || (player == null) || npc.isDead())
 		{
@@ -225,7 +225,7 @@ public class StakatoNest extends AbstractNpcAI
 			addAttackPlayerDesire(spawned, player);
 			npc.deleteMe();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private static Monster checkMinion(Npc npc)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
index 356608d0fc..49a25ec26b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
@@ -47,7 +47,7 @@ public class StakatoNestTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int index = Integer.parseInt(event) - 1;
 		if (LOCS.length > index)
@@ -65,7 +65,7 @@ public class StakatoNestTeleporter extends AbstractNpcAI
 			}
 			player.teleToLocation(loc, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
index 4a64afbd00..ba580c2dad 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
@@ -44,7 +44,7 @@ public class Apprentice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("rideKukuru"))
 		{
@@ -61,7 +61,7 @@ public class Apprentice extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TRY_RIDING_A_KUKURI, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
index 727bf5903a..8661548dcc 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
@@ -97,7 +97,7 @@ public class AwakeningMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
index cd6185a888..8ed7701c68 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
@@ -38,7 +38,7 @@ public class Banette extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
@@ -62,7 +62,7 @@ public class Banette extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
index 87e0629227..858331ae3e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
@@ -38,13 +38,13 @@ public class Bink extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TALKING_ISLAND_VILLAGE_IS_REALLY_BEAUTIFUL, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
index e439d986ad..5d231aa00d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
@@ -45,7 +45,7 @@ public class BoyAndGirl extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_CHANGEWEAP"))
 		{
@@ -66,7 +66,7 @@ public class BoyAndGirl extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, npc.getId() == BOY ? NpcStringId.WEEE : NpcStringId.BOYS_ARE_SO_ANNOYING);
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
index ff53080809..22d19b3496 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
@@ -41,7 +41,7 @@ public class Devno extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -74,7 +74,7 @@ public class Devno extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
index a4f08b8c99..18c04b2e7e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
@@ -42,7 +42,7 @@ public class DrillSergeant extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SOCIAL_SHOW"))
 		{
@@ -66,7 +66,7 @@ public class DrillSergeant extends AbstractNpcAI
 				npc.broadcastSocialAction(socialActionId);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
index 8e3f9e5943..83363ef157 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
@@ -41,7 +41,7 @@ public class Eleve extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Eleve extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
index b8863b9963..114728632b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
@@ -44,13 +44,13 @@ public class Gagabu extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, GAGABU_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
index 44dab7df42..d490504792 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
@@ -38,14 +38,14 @@ public class Galad extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSocialAction(3);
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.OCCASIONALLY_RARE_JEWELS_OF_GIANTS_ARE_DISCOVERED_IN_THE_BEACH, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
index a0c7f71816..3a56943e20 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
@@ -52,7 +52,7 @@ public class GiantSoldiers extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
index a703c40323..b94d2f9624 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
@@ -38,7 +38,7 @@ public class GuardSoldier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -49,7 +49,7 @@ public class GuardSoldier extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(2);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
index b26d9fd748..1b0dd65c82 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
@@ -43,7 +43,7 @@ public class Hadel extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
index bdb70d1f2d..d7ff70d9a0 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
@@ -38,7 +38,7 @@ public class Handermonkey extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE") && (npc != null))
 		{
@@ -54,7 +54,7 @@ public class Handermonkey extends AbstractNpcAI
 				npc.broadcastSocialAction(9);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
index b8370bffe7..5ea0569424 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
@@ -60,7 +60,7 @@ public class Hardin extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = getHtmlMessage(player);
 		if (htmltext != null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
index a8bded51f1..536ee7f5cd 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
@@ -58,7 +58,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("HARNAK_SPAWN"))
 		{
@@ -70,7 +70,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
 				_templates.forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName), null));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private static class zoneInfo
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
index 3c2080e85a..03dca71bb5 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
@@ -55,13 +55,13 @@ public class HurnakMobMsg extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("ATTACK"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomEntry(ON_ATTACK_MSG));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
index 81f6617329..7055381eab 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
@@ -38,14 +38,14 @@ public class Hera extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomBoolean() ? NpcStringId.DOES_THE_GODDESS_SEE_WHAT_SHE_HAS_DONE : NpcStringId.WHY_HAVE_THE_HEROES_ABANDONED_US);
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
index 7003ad014d..2b6a1a1e51 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
@@ -38,7 +38,7 @@ public class Heymond extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
@@ -62,7 +62,7 @@ public class Heymond extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
index 52ce99be7f..8033f3c1ec 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
@@ -38,7 +38,7 @@ public class Holly extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -48,7 +48,7 @@ public class Holly extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(6);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
index 3f9141b931..e11490debc 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
@@ -41,7 +41,7 @@ public class Karonf extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Karonf extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
index 597cfd80f2..c102b0cc4c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
@@ -44,7 +44,7 @@ public class Luderic extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -54,7 +54,7 @@ public class Luderic extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(1);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
index 0c07720a0a..08de6143f0 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
@@ -45,13 +45,13 @@ public class Lumi extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, LUMI_SHOUT[getRandom(3)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
index 68b2789416..3bdb8de60b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
@@ -38,13 +38,13 @@ public class Mahram extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.ALCHEMY_IS_A_SCIENCE_AND_AN_ART, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
index e00fd6c98c..85117713a0 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
@@ -38,13 +38,13 @@ public class Mai extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EVERY_RACE_BUILT_A_PIECE_OF_THIS_VILLAGE, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
index dcd47a9822..2d44f1568a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
@@ -38,13 +38,13 @@ public class MarinSmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.HMM_IS_THIS_STILL_A_DECENT_WEAPON, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
index d5e5496e16..0d4e8f79e3 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
@@ -41,7 +41,7 @@ public class Marsha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Marsha extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
index aa9eb0eb87..81bc246742 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
@@ -43,7 +43,7 @@ public class Milia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("gludioAirship"))
 		{
@@ -53,7 +53,7 @@ public class Milia extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SPEAK_WITH_ME_ABOUT_TRAVELING_AROUND_ADEN, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
index b1e037eb5a..933c139b8c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
@@ -64,7 +64,7 @@ public class MonkOfChaos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
index f6cd83883a..0bedb09eb6 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
@@ -41,7 +41,7 @@ public class Morgan extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Morgan extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
index e7ce45a4e5..fd5e025cd2 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
@@ -40,7 +40,7 @@ public class Oris extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SOCIAL_ACTION_1"))
 		{
@@ -55,7 +55,7 @@ public class Oris extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_HAVEN_T_FELT_THIS_GOOD_IN_AGES, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
index 328de6a4df..34ae4f55b6 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
@@ -49,7 +49,7 @@ public class Pantheon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
index 869ebf3119..e44fe2e373 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
@@ -152,7 +152,7 @@ public class Raina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
index 4c8862c733..8d66a71766 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
@@ -41,7 +41,7 @@ public class Rubentis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Rubentis extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
index d5c86cee97..87e1df4a6b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
@@ -38,14 +38,14 @@ public class Ruks extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomBoolean() ? NpcStringId.THE_SEVEN_SIGNS_ENDED : NpcStringId.WE_NEED_TO_FIND_HER_WEAKNESS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
index cc9a63c666..880532e52c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
@@ -38,13 +38,13 @@ public class Sebion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TIS_A_SCRATCH, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
index fa3cc06633..4b05120bde 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
@@ -38,13 +38,13 @@ public class Shannon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.LOOK_AT_ALL_THE_NEWBIES_HA_HA_HA, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
index 219ac48515..7fd067c374 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
@@ -44,13 +44,13 @@ public class Sodian extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, SODIAN_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
index e11dfb9aaf..8413c93bc8 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
@@ -44,13 +44,13 @@ public class Stiller extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, STILLER_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
index b10f044196..d196091a8e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
@@ -38,13 +38,13 @@ public class Theodore extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.AND_NOW_YOUR_JOURNEY_BEGINS, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
index 4290aa8fc6..8e4f8ed738 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
@@ -38,7 +38,7 @@ public class TomaJunior extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -49,7 +49,7 @@ public class TomaJunior extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(6);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java
index 219f1f4879..1e4bdb3ff1 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java
@@ -48,7 +48,7 @@ public class Toyron extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true);
 		if (event.equals("museum_teleport"))
@@ -62,7 +62,7 @@ public class Toyron extends AbstractNpcAI
 				player.teleToLocation(MUSEUM_OUT);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
index c3aa031317..78ce6f2c8c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
@@ -38,7 +38,7 @@ public class TrainningSoldier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -55,7 +55,7 @@ public class TrainningSoldier extends AbstractNpcAI
 			}
 			startQuestTimer("START_ATTACK", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
index 848196c047..b92e79413b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
@@ -63,7 +63,7 @@ public class Trandon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String[] substrings = event.split(" ");
 		if (substrings.length < 1)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
index 8cd3cd965d..b65bd9a7ad 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
@@ -42,7 +42,7 @@ public class YeSagiraGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -56,7 +56,7 @@ public class YeSagiraGuards extends AbstractNpcAI
 			}
 			startQuestTimer("GUARD_AGGRO", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
index 007d0e13d3..a4e0c941bd 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
@@ -88,7 +88,7 @@ public class YeSegiraTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LOCATIONS.containsKey(event))
 		{
@@ -111,7 +111,7 @@ public class YeSegiraTeleportDevice extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_PLAYER_CREATE)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java
index e546cbc086..be903e83d2 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java
@@ -87,7 +87,7 @@ public class ToIVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int npcId = npc.getId();
 		
@@ -133,7 +133,7 @@ public class ToIVortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
index 2c8e967539..4bb6be2086 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
@@ -40,7 +40,7 @@ public class Acateo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("give_circlet"))
 		{
@@ -51,7 +51,7 @@ public class Acateo extends AbstractNpcAI
 			giveItems(player, ACADEMY_CIRCLET, 1);
 			return "33905-2.html";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TownOfGoddard/Cerenas/Cerenas.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TownOfGoddard/Cerenas/Cerenas.java
index 4b87f5ec09..f2df150f21 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TownOfGoddard/Cerenas/Cerenas.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TownOfGoddard/Cerenas/Cerenas.java
@@ -41,7 +41,7 @@ public class Cerenas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(Q10369_NoblesseSoulTesting.class.getSimpleName());
 		String htmltext = null;
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
index 949fb8f279..48ca778074 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
@@ -108,7 +108,7 @@ public class VarkaSilenosSupport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
index b7fb571500..3a94d3d378 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
@@ -43,7 +43,7 @@ public class ElmoredenServantsGhost extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("teleport1") || event.equals("teleport2"))
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
index 427084ea7a..150fee7dfb 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
@@ -83,7 +83,7 @@ public class Wastelands extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || !npc.isSpawned())
 		{
@@ -184,7 +184,7 @@ public class Wastelands extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
index 61678a5cb2..5e24c8040c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
@@ -47,7 +47,7 @@ public class ZealotOfShilen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -75,7 +75,7 @@ public class ZealotOfShilen extends AbstractNpcAI
 			}
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
index 2da266ca0e..ab6a6ebc3e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
@@ -38,14 +38,14 @@ public class Commando extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.WE_RE_COLLECTING_SEEKER_OF_ADEN);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Anais/Anais.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Anais/Anais.java
index 74fe879672..823d08142f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Anais/Anais.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Anais/Anais.java
@@ -75,7 +75,7 @@ public class Anais extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -134,7 +134,7 @@ public class Anais extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
index 00ebb5f34f..6f04200e6f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
@@ -361,7 +361,7 @@ public class Anakim extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -475,7 +475,7 @@ public class Anakim extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index d236e19d43..a5157acfc7 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -193,7 +193,7 @@ public class Antharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -605,7 +605,7 @@ public class Antharas extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 0fea286d69..e6080d34c6 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -164,7 +164,7 @@ public class Baium extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -478,7 +478,7 @@ public class Baium extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
index 992eae3c7c..7bea095520 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
@@ -105,7 +105,7 @@ public class BalokWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -115,7 +115,7 @@ public class BalokWarzone extends AbstractInstance
 				takeItems(player, PRISON_KEY, -1);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
index 6684b9b04c..ce39ed9b22 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
@@ -72,7 +72,7 @@ public class BaylorWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -124,7 +124,7 @@ public class BaylorWarzone extends AbstractInstance
 				player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index b5a24845bb..3748875859 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -126,7 +126,7 @@ public class Beleth extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -536,7 +536,7 @@ public class Beleth extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
index e2770b5bec..b768e563e9 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
@@ -49,7 +49,7 @@ public class Wormhole extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Camille/Camille.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Camille/Camille.java
index 24757df47d..ee0ad1539f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Camille/Camille.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Camille/Camille.java
@@ -54,7 +54,7 @@ public class Camille extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class Camille extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Core/Core.java
index 344ad52a0a..34584c31c3 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -143,7 +143,7 @@ public class Core extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
@@ -162,7 +162,7 @@ public class Core extends AbstractNpcAI
 			_minions.forEach(Attackable::decayMe);
 			_minions.clear();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/ChoirOfDarkness.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/ChoirOfDarkness.java
index c07620df2f..22735a6228 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/ChoirOfDarkness.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/ChoirOfDarkness.java
@@ -44,7 +44,7 @@ public class ChoirOfDarkness extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class ChoirOfDarkness extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/Etina.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/Etina.java
index 21647bc333..3f20e07ce9 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/Etina.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/Etina.java
@@ -47,7 +47,7 @@ public class Etina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -60,7 +60,7 @@ public class Etina extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
index e7275b843f..47455b4c67 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
@@ -348,7 +348,7 @@ public class EtisVanEtina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -515,7 +515,7 @@ public class EtisVanEtina extends AbstractNpcAI
 			}
 			
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private void clean()
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleDarkJudge.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleDarkJudge.java
index 609abafe5c..c89586710f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleDarkJudge.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleDarkJudge.java
@@ -44,7 +44,7 @@ public class GreatTempleDarkJudge extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class GreatTempleDarkJudge extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleSoulGuide.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleSoulGuide.java
index 7ffe33d918..a08a1c79c2 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleSoulGuide.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleSoulGuide.java
@@ -44,7 +44,7 @@ public class GreatTempleSoulGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class GreatTempleSoulGuide extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/JudgeOfHeresy.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/JudgeOfHeresy.java
index acfba50e7d..a9e53959c5 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/JudgeOfHeresy.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/JudgeOfHeresy.java
@@ -44,7 +44,7 @@ public class JudgeOfHeresy extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class JudgeOfHeresy extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/Kain.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/Kain.java
index 8c81abebe3..7b910760fd 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/Kain.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/Kain.java
@@ -46,7 +46,7 @@ public class Kain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -59,7 +59,7 @@ public class Kain extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/LiberatorOfLust.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/LiberatorOfLust.java
index 081d00456a..628d8f4399 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/LiberatorOfLust.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/LiberatorOfLust.java
@@ -44,7 +44,7 @@ public class LiberatorOfLust extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class LiberatorOfLust extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/SeekerOfDespair.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/SeekerOfDespair.java
index 4cb190b064..b9fadc44ad 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/SeekerOfDespair.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/SeekerOfDespair.java
@@ -44,7 +44,7 @@ public class SeekerOfDespair extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class SeekerOfDespair extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/SoulDestroyer.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/SoulDestroyer.java
index defafa1d95..7382c7e319 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/SoulDestroyer.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/SoulDestroyer.java
@@ -44,7 +44,7 @@ public class SoulDestroyer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class SoulDestroyer extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleArchon.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleArchon.java
index ba2d56ecf9..85dc410977 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleArchon.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleArchon.java
@@ -44,7 +44,7 @@ public class TempleArchon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleArchon extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleDarkWizard.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleDarkWizard.java
index c92187c67e..ff892ea50e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleDarkWizard.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleDarkWizard.java
@@ -44,7 +44,7 @@ public class TempleDarkWizard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleDarkWizard extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleFlameMaster.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleFlameMaster.java
index 57a930ddd5..341a3663b7 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleFlameMaster.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleFlameMaster.java
@@ -44,7 +44,7 @@ public class TempleFlameMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleFlameMaster extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleHighPriest.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleHighPriest.java
index df735b07c3..df68ee43c3 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleHighPriest.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleHighPriest.java
@@ -44,7 +44,7 @@ public class TempleHighPriest extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleHighPriest extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
index 859e6fc695..ed664b4197 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
@@ -65,7 +65,7 @@ public class IceQueensCastle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class IceQueensCastle extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
index a07501ed22..9f3772a47d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
@@ -160,7 +160,7 @@ public class IceQueensCastleBattle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterEasy"))
 		{
@@ -700,7 +700,7 @@ public class IceQueensCastleBattle extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
index 7fa44d08d6..21e250c482 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
@@ -45,7 +45,7 @@ public class Jinia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
index 5bc0aacffb..b17d1828c5 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
@@ -165,7 +165,7 @@ public class LastImperialTomb extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
index 282b9f8fbc..254c891bc5 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
@@ -62,7 +62,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Helios/Helios.java
index d6de973ec6..8288e0626c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Helios/Helios.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Helios/Helios.java
@@ -320,7 +320,7 @@ public class Helios extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Helios/Helios1.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Helios/Helios1.java
index 7eb394719d..5d2364fbc0 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Helios/Helios1.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Helios/Helios1.java
@@ -45,7 +45,7 @@ public class Helios1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -58,7 +58,7 @@ public class Helios1 extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Helios/Helios2.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Helios/Helios2.java
index 2147bd52c0..abe0cc400e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Helios/Helios2.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Helios/Helios2.java
@@ -45,7 +45,7 @@ public class Helios2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -58,7 +58,7 @@ public class Helios2 extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Helios/Helios3.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Helios/Helios3.java
index 364dce85de..8e293ad2a4 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Helios/Helios3.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Helios/Helios3.java
@@ -46,7 +46,7 @@ public class Helios3 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -59,7 +59,7 @@ public class Helios3 extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java
index 404237e0fa..29b64fa20b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java
@@ -44,7 +44,7 @@ public class RoyalArchmageMinion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class RoyalArchmageMinion extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
index e4260628ce..d61884c91b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
@@ -92,7 +92,7 @@ public class IstinaCavern extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance instance = npc.getInstanceWorld();
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
index 27728f34c1..f1945e2def 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
@@ -40,7 +40,7 @@ public class Rumiese extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
index b94d17f47b..ae0e6aaef9 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
@@ -141,7 +141,7 @@ public class Kelbim extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -281,7 +281,7 @@ public class Kelbim extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
index 9f677053b2..c3e066a466 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
@@ -137,7 +137,7 @@ public class KimerianCommon extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance instance = npc.getInstanceWorld();
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
index 8d618ecd4f..f0d8652322 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
@@ -387,7 +387,7 @@ public class Lilith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -501,7 +501,7 @@ public class Lilith extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/LimitBarrier.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/LimitBarrier.java
index 3e8838936e..b5d871e9d2 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/LimitBarrier.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/LimitBarrier.java
@@ -83,7 +83,7 @@ public class LimitBarrier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -112,7 +112,7 @@ public class LimitBarrier extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
index 5b16c333e2..ced833a889 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
@@ -49,7 +49,7 @@ public class KatoSicanus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
index 2bd8aeb2c6..7dacdd2c16 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
@@ -674,7 +674,7 @@ public class Lindvior extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
index 73d5d88407..f676f620a3 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
@@ -49,7 +49,7 @@ public class Vortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -110,7 +110,7 @@ public class Vortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java
index 190f1ce9ea..02f57b1bd5 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java
@@ -59,7 +59,7 @@ public class Lydia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
index 49a224c8bc..8c7d0eb77d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
@@ -122,7 +122,7 @@ public class OctavisWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -146,7 +146,7 @@ public class OctavisWarzone extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 9a58c9f1b7..6eda44726f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -145,7 +145,7 @@ public class Orfen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -201,7 +201,7 @@ public class Orfen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 93735c996b..72e174bb65 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -155,7 +155,7 @@ public class QueenAnt extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -239,7 +239,7 @@ public class QueenAnt extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
index 7a3322b68a..297948d172 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
@@ -53,7 +53,7 @@ public class QueenShyeed extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java
index 8304e07d78..80a048214d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java
@@ -149,7 +149,7 @@ public class Ramona extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -377,7 +377,7 @@ public class Ramona extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
index ad87d93fe0..20e1572d8a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
@@ -80,7 +80,7 @@ public class Sailren extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -249,7 +249,7 @@ public class Sailren extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
index 4eeb4da057..b11aa4de6a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
@@ -73,7 +73,7 @@ public class Cannon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
index f754206b22..45b4c89ee7 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
@@ -62,7 +62,7 @@ public class TautiWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -170,7 +170,7 @@ public class TautiWarzone extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
index 50da94c8b2..f973bf0e12 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
@@ -182,7 +182,7 @@ public class TeredorWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
index 7b07413999..63b2c0589a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
@@ -507,7 +507,7 @@ public class Stage1 extends AbstractInstance implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
index 70d36f9c61..d2abf63365 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
@@ -50,7 +50,7 @@ public class Daichir extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterEarthWyrnCave"))
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
index e69a688d77..2c365d7f61 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
@@ -570,7 +570,7 @@ public class Trasken extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -694,7 +694,7 @@ public class Trasken extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index 74f7b64063..4eaf667f0a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -191,7 +191,7 @@ public class Valakas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -380,7 +380,7 @@ public class Valakas extends AbstractNpcAI
 		{
 			BOSS_ZONE.oustAllPlayers();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
index a211f7bfc0..bae4d63898 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
@@ -172,7 +172,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter60"))
 		{
@@ -254,7 +254,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/AdenReconstructorManager.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
index efa4bfa6ca..65a08050b6 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
@@ -42,7 +42,7 @@ public class AdenReconstructorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -67,7 +67,7 @@ public class AdenReconstructorManager extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
index 2dec85bd94..c31f5c0175 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
@@ -141,7 +141,7 @@ public class AdventureGuildsman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
index 147014c5ca..6dd0539e41 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
@@ -63,7 +63,7 @@ public class AdventurersGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
index c5ed73b2c2..7d81da92e1 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
@@ -51,7 +51,7 @@ public class AlchemistManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index b939ece983..849ed827d3 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -63,7 +63,7 @@ public class ArenaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -128,7 +128,7 @@ public class ArenaManager extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/BalthusKnights/Monsters/GemDragon/GemDragon.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/BalthusKnights/Monsters/GemDragon/GemDragon.java
index 69554e90a1..de35fff281 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/BalthusKnights/Monsters/GemDragon/GemDragon.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/BalthusKnights/Monsters/GemDragon/GemDragon.java
@@ -88,7 +88,7 @@ public final class GemDragon extends AbstractNpcAI
 				{
 					ThreadPool.schedule(() ->
 					{
-						instance.onAdvEvent("continueGemDragonsAttack", npc, killer);
+						instance.onEvent("continueGemDragonsAttack", npc, killer);
 					}, 4000); // 4 sec
 					
 				}
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
index 1c51b94358..352c31c8fc 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
@@ -38,7 +38,7 @@ public class BlackJudge extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("weakenBreath"))
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
index d35adf8706..e203aecd5e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
@@ -42,7 +42,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equals("31092-01.html"))
@@ -79,7 +79,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 			giveAdena(player, count, false);
 			return "31092-04.html";
 		}
-		return super.onAdvEvent(htmltext, npc, player);
+		return super.onEvent(htmltext, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
index 6a44d63e0b..81e90f2d67 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
@@ -56,7 +56,7 @@ public class CastleAmbassador extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
index b07792cd2d..11b8786523 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
@@ -57,7 +57,7 @@ public class CastleBlacksmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return (event.equalsIgnoreCase(npc.getId() + "-02.html") && hasRights(player, npc)) ? event : null;
 	}
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
index 355012ffea..5385531356 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
@@ -393,7 +393,7 @@ public class CastleChamberlain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Castle castle = npc.getCastle();
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
index 3e2cd16930..4a8fac8c0e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
@@ -140,7 +140,7 @@ public class CastleCourtMagician extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player.getClan() == null) && (player.getClanId() != npc.getCastle().getOwnerId()))
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
index b9c1f3faf5..70bae86615 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
@@ -72,7 +72,7 @@ public class CastleDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
index bb32dde319..a319e3977f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
@@ -56,7 +56,7 @@ public class CastleMercenaryManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index ac71c1afad..0e8137bb1d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -78,7 +78,7 @@ public class CastleTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
@@ -168,7 +168,7 @@ public class CastleTeleporter extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
index bffed40bcc..ea1b40c41c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
@@ -52,7 +52,7 @@ public class CastleWarehouse extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final boolean isMyLord = player.isClanLeader() && (player.getClan().getCastleId() == (npc.getCastle() != null ? npc.getCastle().getResidenceId() : -1));
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index e8d1c84950..e84e7c9e49 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -64,7 +64,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
index a86581206e..afd7250ca4 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
@@ -57,7 +57,7 @@ public class ClanHallDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 8e2969fe49..188fe77edb 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -105,7 +105,7 @@ public class ClanHallManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
index 1d8e114daa..77845525b2 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
@@ -68,7 +68,7 @@ public class ClanTrader extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index ca48b6b231..551a1bd767 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -235,7 +235,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		if (!_isEnabled)
 		{
@@ -936,7 +936,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	{
 		if (event.getCommand().startsWith("Quest ClassMaster "))
 		{
-			final String html = onAdvEvent(event.getCommand().substring(18), null, event.getPlayer());
+			final String html = onEvent(event.getCommand().substring(18), null, event.getPlayer());
 			event.getPlayer().sendPacket(TutorialCloseHtml.STATIC_PACKET);
 			showResult(event.getPlayer(), html);
 		}
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
index 21aafa7e87..7b61214c91 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
@@ -43,7 +43,7 @@ public class CrimsonHatuOtis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -69,7 +69,7 @@ public class CrimsonHatuOtis extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java
index e1f6de3c80..c66ba04bfe 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java
@@ -73,7 +73,7 @@ public class DimensionalMerchant extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/DivineBeast.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/DivineBeast.java
index 1f247a7b35..3f3a076992 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/DivineBeast.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/DivineBeast.java
@@ -44,7 +44,7 @@ public class DivineBeast extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player == null) || !player.hasServitors())
 		{
@@ -55,7 +55,7 @@ public class DivineBeast extends AbstractNpcAI
 			cancelQuestTimer(event, npc, player);
 			player.getServitors().values().forEach(summon -> summon.unSummon(player));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/EnergySeeds.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/EnergySeeds.java
index 509c12bbeb..befbad7bff 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/EnergySeeds.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/EnergySeeds.java
@@ -196,7 +196,7 @@ public class EnergySeeds extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("StartSoDAi"))
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/FameManager/FameManager.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/FameManager/FameManager.java
index d4f16a9b96..b0a7bc0a20 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/FameManager/FameManager.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/FameManager/FameManager.java
@@ -49,7 +49,7 @@ public class FameManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
index 79742f7171..c5a075fbcf 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
@@ -69,7 +69,7 @@ public class FortressSiegeManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
index 344d4c5547..db32dd6f2b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
@@ -67,7 +67,7 @@ public class HealerTrainer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
index 94b2f5f16d..2b2e0d3c40 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
@@ -89,7 +89,7 @@ public class HermuncusMinion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(eventValue, " ");
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
index 2928fbd023..abe98a50e5 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
@@ -47,7 +47,7 @@ public class LaVieEnRose extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/Mammons/Mammons.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/Mammons/Mammons.java
index 3ff005b72b..f58c7b8b86 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/Mammons/Mammons.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/Mammons/Mammons.java
@@ -79,12 +79,12 @@ public class Mammons extends AbstractNpcAI
 		addTalkId(MAMMONS);
 		addFirstTalkId(MAMMONS);
 		
-		onAdvEvent("RESPAWN_MAMMONS", null, null);
+		onEvent("RESPAWN_MAMMONS", null, null);
 		startQuestTimer("RESPAWN_MAMMONS", TELEPORT_DELAY, null, null, true);
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
index 8d38a27541..6763b0367c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
@@ -71,7 +71,7 @@ public class ManorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
index 0aabff8144..33e539ee09 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
@@ -143,7 +143,7 @@ public class MentorGuide extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("exchange"))
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/Minigame/Minigame.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/Minigame/Minigame.java
index 6e48943e76..936ed15436 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/Minigame/Minigame.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/Minigame/Minigame.java
@@ -68,7 +68,7 @@ public class Minigame extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final MinigameRoom room = getRoomByManager(npc);
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
index b203206d7b..50e3f93113 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
@@ -79,7 +79,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/MysteriousWizard/MysteriousWizard.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/MysteriousWizard/MysteriousWizard.java
index 2c423c6490..667463de4d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/MysteriousWizard/MysteriousWizard.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/MysteriousWizard/MysteriousWizard.java
@@ -41,7 +41,7 @@ public class MysteriousWizard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return event.equals("33980-01.html") ? event : null;
 	}
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
index 4ad7e0a2fc..d3576b9fff 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
@@ -48,14 +48,14 @@ public class NornilTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("teleport_"))
 		{
 			final int locId = Integer.parseInt(event.replace("teleport_", ""));
 			player.teleToLocation(LOCATIONS[locId - 1]);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
index 899c6a356f..66831c0e4e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
@@ -66,7 +66,7 @@ public class OlyBuffer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index db559f3ca6..bc0a7630c3 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -88,7 +88,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/PrisonGuards.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/PrisonGuards.java
index 4084beddca..c79356a1f0 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/PrisonGuards.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/PrisonGuards.java
@@ -53,7 +53,7 @@ public class PrisonGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CLEAR_STATUS"))
 		{
@@ -67,7 +67,7 @@ public class PrisonGuards extends AbstractNpcAI
 			}
 			startQuestTimer("CHECK_HOME", 30000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
index 21d281c6c9..435f293345 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
@@ -84,7 +84,7 @@ public class Proclaimer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("giveBuff"))
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
index 8b3515e12b..83098c1eaf 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
@@ -79,7 +79,7 @@ public class ProvisionalHalls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/Servitors/SinEater.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/Servitors/SinEater.java
index 1ed8d645a5..d7536614e8 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/Servitors/SinEater.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/Servitors/SinEater.java
@@ -48,7 +48,7 @@ public class SinEater extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TALK") && (player != null) && (player.getPet() != null))
 		{
@@ -79,7 +79,7 @@ public class SinEater extends AbstractNpcAI
 			}
 			startQuestTimer("TALK", 60000, null, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_CREATURE_DEATH)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
index ec177e537e..373c64200b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
@@ -128,7 +128,7 @@ public class SupportUnitCaptain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int fortOwner = npc.getFort().getOwnerClan() == null ? 0 : npc.getFort().getOwnerClan().getId();
 		if ((player.getClan() == null) || (player.getClanId() != fortOwner))
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
index f6d1e74529..a733b87dad 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
@@ -53,7 +53,7 @@ public class SymbolMaker extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
index f9cd32a0dd..82ec9274c2 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
@@ -94,7 +94,7 @@ public class TeleportToUndergroundColiseum extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.endsWith(".htm"))
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
index dbe26ae6a3..7052b10367 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
@@ -75,7 +75,7 @@ public class TersisHerald extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("giveBuff"))
 		{
@@ -87,7 +87,7 @@ public class TersisHerald extends AbstractNpcAI
 			npc.setTarget(player);
 			npc.doCast(DRAGON_BUFF.getSkill());
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java
index 3c46f755ca..c2f0970ccc 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java
@@ -58,7 +58,7 @@ public class TrainingCamp extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (!Config.TRAINING_CAMP_ENABLE || !checkConditions(player))
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
index 8e94950d76..520a057481 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
@@ -62,7 +62,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = "";
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
index 9924fb4ace..0a6b873028 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
@@ -85,7 +85,7 @@ public class ClassTransferTalk extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/WarriorFishingBlock.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
index 56b29fee5b..78e3d1c99e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
@@ -75,7 +75,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -104,7 +104,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
index b9439eb0ec..a1878b037b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
@@ -156,7 +156,7 @@ public class WeaverOlf extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.contains("_grade_"))
 		{
@@ -185,7 +185,7 @@ public class WeaverOlf extends AbstractNpcAI
 			}
 			else
 			{
-				return super.onAdvEvent(event, npc, player);
+				return super.onEvent(event, npc, player);
 			}
 			
 			if (hasQuestItems(player, itemIds[0]))
@@ -225,7 +225,7 @@ public class WeaverOlf extends AbstractNpcAI
 			{
 				return npc.getId() + "-no.htm";
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		return event;
 	}
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index 777998cde4..48bf41ab6d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -210,7 +210,7 @@ public class WyvernManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
index 0c2e7586c9..c49be5297b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
@@ -36,7 +36,7 @@ public class DelevelManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.DELEVEL_MANAGER_ENABLED)
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
index 5eaddb78ba..76b7f1e559 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
@@ -54,7 +54,7 @@ public class FactionSystem extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class FactionSystem extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
index 8b9c676ad5..771c8a9058 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
@@ -34,7 +34,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -77,7 +77,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 				npc.broadcastInfo(); // update flag status
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
index ee7151c9c2..36f2ef411d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
@@ -68,7 +68,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("AUTOBUFF") && (npc != null) && !npc.isDead())
 		{
@@ -96,7 +96,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
 			}
 			startQuestTimer("AUTOBUFF", 30000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
index f19aa0cb6f..447c512987 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
@@ -39,7 +39,7 @@ public class NoblessMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.NOBLESS_MASTER_ENABLED)
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
index 370e9a1ced..3488295c5a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
@@ -163,7 +163,7 @@ public class Deathmatch extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
index 1eb84eca93..b92bbe7f77 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
@@ -213,7 +213,7 @@ public class Rabbits extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/events/Race/Race.java
index ff9fc462f6..6ac325ca6f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/events/Race/Race.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/events/Race/Race.java
@@ -320,7 +320,7 @@ public class Race extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 2ceed8623e..85520805ac 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -180,7 +180,7 @@ public class TvT extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
index 77c055cc79..84a2d7763d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
@@ -45,7 +45,7 @@ public class BirthOfDraco extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
index 9bc0ff9c55..87ac868dc7 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
@@ -64,7 +64,7 @@ public class CharacterBirthday extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("despawn_npc"))
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index a966bdff3e..4648d78f95 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -56,7 +56,7 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
index a8f534ca97..76c5aa611f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
@@ -73,7 +73,7 @@ public class FreyaCelebration extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("give_potion"))
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
index b45e872a60..2570ef061a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
@@ -86,7 +86,7 @@ public class GiftOfVitality extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/HappyHours/HappyHours.java
index ed84918716..9e0bc0ce91 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/HappyHours/HappyHours.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/HappyHours/HappyHours.java
@@ -49,7 +49,7 @@ public class HappyHours extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
index aa5419e179..76aaa4ab09 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
@@ -59,7 +59,7 @@ public class HeavyMedal extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		int level = checkLevel(player);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/HungryHorse/HungryHorse.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
index 646db8d92d..657ddb84b9 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
@@ -58,7 +58,7 @@ public class HungryHorse extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
index 6107af7f71..502fce9a30 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
@@ -55,7 +55,7 @@ public class HuntForSanta extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/LetterCollector/LetterCollector.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
index 744b1f2ae4..d87bd82b02 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
@@ -123,7 +123,7 @@ public class LetterCollector extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
index b71176a555..a42e986ee4 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
@@ -49,7 +49,7 @@ public class LoveYourGatekeeper extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
index c868fad2b3..6460eb4ab0 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
@@ -61,7 +61,7 @@ public class LoversJubilee extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmtext = event;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
index a6666bb367..5e6d36bf89 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
@@ -68,7 +68,7 @@ public class MasterOfEnchanting extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("buy_staff"))
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/RedLibra/RedLibra.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/RedLibra/RedLibra.java
index 69414f20c6..693f2efd18 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/RedLibra/RedLibra.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/RedLibra/RedLibra.java
@@ -42,7 +42,7 @@ public class RedLibra extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
index f6c714eddc..7d3462224b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
@@ -58,7 +58,7 @@ public class RudolphsBlessing extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("rudolph_eat") && (player != null) && player.isOnline())
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
index 3f076fc92b..17ff961002 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
@@ -297,7 +297,7 @@ public class SavingSanta extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!isEventPeriod())
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
index 5c00677d25..862a8df578 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
@@ -51,7 +51,7 @@ public class ThePowerOfLove extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
index 6696dee542..a53ca2b3a0 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
@@ -130,7 +130,7 @@ public class AltarOfShilen extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (event.equals("enterInstance"))
@@ -266,7 +266,7 @@ public class AltarOfShilen extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
index 4fcc21b412..56b8393b3a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
@@ -154,7 +154,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -269,7 +269,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/AntharasNest.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/AntharasNest.java
index 5dccc8d689..9fb9d0784a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/AntharasNest.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/AntharasNest.java
@@ -56,7 +56,7 @@ public final class AntharasNest extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/FaeronVillage/FaeronVillage.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/FaeronVillage/FaeronVillage.java
index 8783eafd87..8e65bcd851 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/FaeronVillage/FaeronVillage.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/FaeronVillage/FaeronVillage.java
@@ -63,7 +63,7 @@ public final class FaeronVillage extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/HatchlingCage.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/HatchlingCage.java
index 6dda2fe250..90a084d54b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/HatchlingCage.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/HatchlingCage.java
@@ -48,7 +48,7 @@ public final class HatchlingCage extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/HatchlingNest.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/HatchlingNest.java
index 351e59ac1a..e06ac8cc55 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/HatchlingNest.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/HatchlingNest.java
@@ -49,7 +49,7 @@ public final class HatchlingNest extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/PowerOfAbelius/PowerOfAbelius.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/PowerOfAbelius/PowerOfAbelius.java
index 60c1163aee..f6c80cbf2a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/PowerOfAbelius/PowerOfAbelius.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/PowerOfAbelius/PowerOfAbelius.java
@@ -67,7 +67,7 @@ public final class PowerOfAbelius extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/PowerOfCranigg/PowerOfCranigg.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/PowerOfCranigg/PowerOfCranigg.java
index 2599222ccb..4ba72749df 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/PowerOfCranigg/PowerOfCranigg.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/PowerOfCranigg/PowerOfCranigg.java
@@ -71,7 +71,7 @@ public final class PowerOfCranigg extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/PowerOfKashnaga/PowerOfKashnaga.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/PowerOfKashnaga/PowerOfKashnaga.java
index fb9d2efe48..331002322c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/PowerOfKashnaga/PowerOfKashnaga.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/PowerOfKashnaga/PowerOfKashnaga.java
@@ -71,7 +71,7 @@ public final class PowerOfKashnaga extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/PowerOfLakcis/PowerOfLakcis.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/PowerOfLakcis/PowerOfLakcis.java
index 9f7c19e8a5..ffc0317368 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/PowerOfLakcis/PowerOfLakcis.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/PowerOfLakcis/PowerOfLakcis.java
@@ -67,7 +67,7 @@ public final class PowerOfLakcis extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/PowerOfNaviarope/PowerOfNaviarope.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/PowerOfNaviarope/PowerOfNaviarope.java
index 97129f0610..3f11ac0f8d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/PowerOfNaviarope/PowerOfNaviarope.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/PowerOfNaviarope/PowerOfNaviarope.java
@@ -67,7 +67,7 @@ public final class PowerOfNaviarope extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/PowerOfRaister/PowerOfRaister.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/PowerOfRaister/PowerOfRaister.java
index 07bdeb9c97..06b0ebf5a9 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/PowerOfRaister/PowerOfRaister.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/PowerOfRaister/PowerOfRaister.java
@@ -71,7 +71,7 @@ public final class PowerOfRaister extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/PowerOfSapyros/PowerOfSapyros.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/PowerOfSapyros/PowerOfSapyros.java
index 8e02743187..6b5a2fb419 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/PowerOfSapyros/PowerOfSapyros.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/PowerOfSapyros/PowerOfSapyros.java
@@ -71,7 +71,7 @@ public final class PowerOfSapyros extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/PowerOfSoltkreig/PowerOfSoltkreig.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/PowerOfSoltkreig/PowerOfSoltkreig.java
index ebf516a97a..17fdebdbd0 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/PowerOfSoltkreig/PowerOfSoltkreig.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/BalthusKnights/PowerOfSoltkreig/PowerOfSoltkreig.java
@@ -71,7 +71,7 @@ public final class PowerOfSoltkreig extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
index be7e723084..46b9e22b59 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
@@ -467,7 +467,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
index 1100b43aee..80911f4423 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
@@ -72,7 +72,7 @@ public class ChamberOfProphecies extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
index 4f0f2f7a19..b815b5bae7 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
@@ -177,7 +177,7 @@ public class ChamberOfDelusion extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CommandPost/CommandPost.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CommandPost/CommandPost.java
index 23da57e021..4a68caa376 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CommandPost/CommandPost.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CommandPost/CommandPost.java
@@ -105,7 +105,7 @@ public class CommandPost extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
index ff860c70bb..c8bed455cc 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
@@ -114,13 +114,13 @@ public class CrystalCavernsCoralGarden extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
index 6db8525e11..46f3d2fdf6 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
@@ -79,13 +79,13 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
index c51b5d7887..121e3a89f4 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
@@ -135,13 +135,13 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
index 72d2fe0f6f..58eec2329b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
@@ -122,7 +122,7 @@ public class DarkCloudMansion extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
index 00241b7b77..4f4fade41e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
@@ -45,7 +45,7 @@ public class DimensionMakkum extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = getPlayerInstance(player);
 		switch (event)
@@ -69,7 +69,7 @@ public class DimensionMakkum extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
index 605b8ebdf8..981a91d4a7 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
@@ -53,13 +53,13 @@ public class DimensionalArchon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), getRandomEntry(ARCHON_MSG)));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
index 176ee5b803..9243451cde 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
@@ -53,7 +53,7 @@ public class DimensionalTrap extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || npc.isAlikeDead())
 		{
@@ -102,7 +102,7 @@ public class DimensionalTrap extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
index 2bbbc27dea..e034bb7f04 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
@@ -115,7 +115,7 @@ public class DimensionalWrap extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
index 8211e90098..4d937103a7 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
@@ -45,7 +45,7 @@ public class EvasHiddenSpace extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = player.getQuestState(Q10369_NoblesseSoulTesting.class.getSimpleName());
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
index 98e2ac0c8b..a40e7e3c88 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
@@ -195,12 +195,12 @@ public class EvilIncubator extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player);
 		if ((st == null) || !st.isStarted())
 		{
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java
index 634da69955..ef4b29846d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java
@@ -69,7 +69,7 @@ public class FaeronTrainingGrounds1 extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(Q10735_ASpecialPower.class.getSimpleName());
 		String htmltext = null;
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java
index 32eb0526b8..4dd64ac3fb 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java
@@ -68,7 +68,7 @@ public class FaeronTrainingGrounds2 extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(Q10736_ASpecialPower.class.getSimpleName());
 		String htmltext = null;
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
index 6d58bd6eb4..1477e297c5 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
@@ -59,7 +59,7 @@ public class FortressOfTheDead extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/Fortuna/Fortuna.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/Fortuna/Fortuna.java
index 339328eea4..ef7b65659f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/Fortuna/Fortuna.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/Fortuna/Fortuna.java
@@ -51,7 +51,7 @@ public class Fortuna extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -472,7 +472,7 @@ public class Fortuna extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
index ef73cf3920..a205145189 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
@@ -119,7 +119,7 @@ public class HarnakUndergroundRuins extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
index 598a7460c7..c7180064eb 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
@@ -642,7 +642,7 @@ public class Kamaloka extends AbstractInstance
 	 * Handles only player's enter, single parameter - integer kamaloka index
 	 */
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java
index 7a8f1aa4b3..ef3b1ae1ba 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java
@@ -48,7 +48,7 @@ public class KaraphonHabitat extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(Q10745_TheSecretIngredients.class.getSimpleName());
 		if (qs != null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
index cccdf5d51f..4db13d5b98 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
@@ -195,7 +195,7 @@ public class KartiasLabyrinth extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -268,7 +268,7 @@ public class KartiasLabyrinth extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java
index defddc2e63..4a871ec80d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java
@@ -95,7 +95,7 @@ public class LabyrinthOfBelis extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter_instance"))
 		{
@@ -209,7 +209,7 @@ public class LabyrinthOfBelis extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java
index 0284ac988f..7f88562bc4 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java
@@ -61,7 +61,7 @@ public class MithrilMine extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -108,7 +108,7 @@ public class MithrilMine extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java
index 8477e30897..7a34ab8b3c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java
@@ -127,13 +127,13 @@ public class MuseumDungeon extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter_instance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
index f83f2fcec1..024065f4e9 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
@@ -83,7 +83,7 @@ public class MysticTavern extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
index 48ee563ff5..56d62a42d1 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
@@ -81,7 +81,7 @@ public class StoryOfFreya extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance world = npc.getInstanceWorld();
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
index e21d937eb6..d1d82fe8d7 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
@@ -107,7 +107,7 @@ public class StoryOfTauti extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		switch (event)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
index 150d8f3496..acd2b4b1f7 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
@@ -67,7 +67,7 @@ public class NightmareKamaloka extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -132,7 +132,7 @@ public class NightmareKamaloka extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
index 68ff2fba1b..d91167b4bb 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
@@ -93,7 +93,7 @@ public class NornilsGarden extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (isInInstance(world))
@@ -157,7 +157,7 @@ public class NornilsGarden extends AbstractInstance
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/Nursery/Nursery.java
index 2e394a7446..9042632611 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/Nursery/Nursery.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/Nursery/Nursery.java
@@ -192,7 +192,7 @@ public class Nursery extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance instance = npc.getInstanceWorld();
 		if (isInInstance(instance))
@@ -269,7 +269,7 @@ public class Nursery extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
index 8ddaa9cd0f..f78f43a9dc 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
@@ -101,7 +101,7 @@ public class PailakaDevilsLegacy extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter"))
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java
index b9b2064a77..07fcb7c67b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java
@@ -139,7 +139,7 @@ public class PailakaInjuredDragon extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = player.getQuestState(Q00144_PailakaInjuredDragon.class.getSimpleName());
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
index 5f1d771719..64f2155310 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
@@ -105,7 +105,7 @@ public class PailakaRuneCastle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
index 00fb1c9096..7b25c61e9d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
@@ -63,7 +63,7 @@ public class PailakaSongOfIceAndFire extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -102,7 +102,7 @@ public class PailakaSongOfIceAndFire extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
index 422cbc96a0..48039ff29e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
@@ -173,7 +173,7 @@ public class PrisonOfDarkness extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -313,7 +313,7 @@ public class PrisonOfDarkness extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java
index c72d9b8646..da8c6e785c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java
@@ -162,7 +162,7 @@ public class SSQDisciplesNecropolisPast extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = player.getInstanceWorld();
 		if (world != null)
@@ -264,7 +264,7 @@ public class SSQDisciplesNecropolisPast extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java
index be0450dd2e..b4d398e7d9 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java
@@ -63,7 +63,7 @@ public class SSQLibraryOfSages extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = player.getInstanceWorld();
 		if (world != null)
@@ -103,7 +103,7 @@ public class SSQLibraryOfSages extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java
index e378631253..4b2f28016a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java
@@ -126,7 +126,7 @@ public class SSQMonasteryOfSilence extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = player.getInstanceWorld();
 		if (world != null)
@@ -218,7 +218,7 @@ public class SSQMonasteryOfSilence extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/SSQSanctumOftheLordsOfDawn/SSQSanctumOftheLordsOfDawn.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/SSQSanctumOftheLordsOfDawn/SSQSanctumOftheLordsOfDawn.java
index 9a84142109..863594e558 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/SSQSanctumOftheLordsOfDawn/SSQSanctumOftheLordsOfDawn.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/SSQSanctumOftheLordsOfDawn/SSQSanctumOftheLordsOfDawn.java
@@ -89,7 +89,7 @@ public class SSQSanctumOftheLordsOfDawn extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -126,7 +126,7 @@ public class SSQSanctumOftheLordsOfDawn extends AbstractInstance
 				player.teleToLocation(SAVE_POINT[npc.getScriptValue()]);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java
index dfb00caae2..d5bece244e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java
@@ -196,13 +196,13 @@ public class TaintedDimension extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java
index b0f641adfe..1c74f89fdf 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java
@@ -60,7 +60,7 @@ public class TalkingIslandPast extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -74,7 +74,7 @@ public class TalkingIslandPast extends AbstractInstance
 				teleportPlayerOut(player, world);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
index e4f0fea409..0aa8f7b0be 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
@@ -46,7 +46,7 @@ public class Q00013_ParcelDelivery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
index a9332344fe..5772a2064d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
@@ -44,7 +44,7 @@ public class Q00015_SweetWhispers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
index d825925804..37d92fabd2 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
@@ -53,7 +53,7 @@ public class Q00016_TheComingDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
index 4a1a62c19a..0e0ef5512d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
@@ -52,7 +52,7 @@ public class Q00017_LightAndDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
index c1ede03985..b885fa960d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
@@ -56,7 +56,7 @@ public class Q00031_SecretBuriedInTheSwamp extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
index ab85113705..02fd7814dd 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
@@ -64,7 +64,7 @@ public class Q00032_AnObviousLie extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
index 346e21ba51..3e17f3d69c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
@@ -53,7 +53,7 @@ public class Q00033_MakeAPairOfDressShoes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
index 30988810b7..32c4a3f461 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
@@ -61,7 +61,7 @@ public class Q00034_InSearchOfCloth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
index c9b8b6e19c..c2d6566765 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
@@ -57,7 +57,7 @@ public class Q00035_FindGlitteringJewelry extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
index e3bd0e5753..73ae6c433d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
@@ -53,7 +53,7 @@ public class Q00036_MakeASewingKit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
index 78660c7498..29c1bd2863 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
@@ -54,7 +54,7 @@ public class Q00037_MakeFormalWear extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
index 5c4d3d5074..c4274aa035 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
@@ -50,7 +50,7 @@ public class Q00040_ASpecialOrder extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
index 100213b849..fe31a6ab4e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
@@ -54,7 +54,7 @@ public class Q00042_HelpTheUncle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
index 9d5f9265df..a5d1225fca 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
@@ -60,7 +60,7 @@ public class Q00043_HelpTheSister extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
index 7cc6c0f337..a13197fc21 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
@@ -55,7 +55,7 @@ public class Q00044_HelpTheSon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java
index 5768b389fd..4e93e4e1bb 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java
@@ -55,7 +55,7 @@ public class Q00061_LawEnforcement extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
index 40a4965112..c29eaa83b6 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
@@ -55,7 +55,7 @@ public class Q00115_TheOtherSideOfTruth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
index 720f90157c..7701c4bef7 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
@@ -44,7 +44,7 @@ public class Q00119_LastImperialPrince extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
index 452b42393c..e923610ac9 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
@@ -82,7 +82,7 @@ public class Q00128_PailakaSongOfIceAndFire extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java
index 8afec644ae..f60ce01f79 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java
@@ -68,7 +68,7 @@ public class Q00129_PailakaDevilsLegacy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
index 3b340ac633..7d7eeb1bf5 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
@@ -72,7 +72,7 @@ public class Q00134_TempleMissionary extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
index b16e0481cc..c9771f6f78 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
@@ -70,7 +70,7 @@ public class Q00135_TempleExecutor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
index 62a45e847c..7e8051404a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
@@ -82,7 +82,7 @@ public class Q00136_MoreThanMeetsTheEye extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
index bd8fa776f8..786030dbaa 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
@@ -66,7 +66,7 @@ public class Q00137_TempleChampionPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
index ca37a25537..6d1b504de8 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
@@ -64,7 +64,7 @@ public class Q00138_TempleChampionPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
index df1521d00e..ff220cfb81 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
@@ -59,7 +59,7 @@ public class Q00139_ShadowFoxPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
index 2a37d17413..a168e639b0 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
@@ -68,7 +68,7 @@ public class Q00140_ShadowFoxPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
index c9b1f579f9..0df4d73fda 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
@@ -63,7 +63,7 @@ public class Q00141_ShadowFoxPart3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player, false);
 		if (st == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
index 0c1af718d5..78fb0e0b32 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
@@ -73,7 +73,7 @@ public class Q00142_FallenAngelRequestOfDawn extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
index 78a954764d..9d44b1bc42 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
@@ -52,7 +52,7 @@ public class Q00143_FallenAngelRequestOfDusk extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java
index 8f024cd03b..686696b998 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java
@@ -99,7 +99,7 @@ public class Q00144_PailakaInjuredDragon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java
index f197dee99a..44145d4eed 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java
@@ -50,7 +50,7 @@ public class Q00149_PrimalMotherIstina extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java
index 04ab71a2eb..2d50cdf25e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java
@@ -49,7 +49,7 @@ public class Q00150_ExtremeChallengePrimalMotherResurrected extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
index 22ae037b8c..55261fadf8 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
@@ -69,7 +69,7 @@ public class Q00177_SplitDestiny extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00180_InfernalFlamesBurningInCrystalPrison/Q00180_InfernalFlamesBurningInCrystalPrison.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00180_InfernalFlamesBurningInCrystalPrison/Q00180_InfernalFlamesBurningInCrystalPrison.java
index 3aadc906fe..7a005c6b00 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00180_InfernalFlamesBurningInCrystalPrison/Q00180_InfernalFlamesBurningInCrystalPrison.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00180_InfernalFlamesBurningInCrystalPrison/Q00180_InfernalFlamesBurningInCrystalPrison.java
@@ -53,7 +53,7 @@ public class Q00180_InfernalFlamesBurningInCrystalPrison extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java
index a325fcb987..d44207205c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java
@@ -54,7 +54,7 @@ public class Q00181_DevilsStrikeBackAdventOfBalok extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java
index 2c9337e950..cf6321781b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java
@@ -47,7 +47,7 @@ public class Q00183_RelicExploration extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java
index 56fa89ac7f..416ef1fbd8 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java
@@ -54,7 +54,7 @@ public class Q00184_ArtOfPersuasion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java
index f98dd20667..5a3e22a29c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java
@@ -54,7 +54,7 @@ public class Q00185_NikolasCooperation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java
index e02899fc82..bc04a591e4 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java
@@ -68,7 +68,7 @@ public class Q00186_ContractExecution extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java
index 9c540f6338..a2460cb6c8 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java
@@ -49,7 +49,7 @@ public class Q00187_NikolasHeart extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java
index 1c1777caec..47b0cf65fc 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java
@@ -52,7 +52,7 @@ public class Q00188_SealRemoval extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java
index 5af9afe0fd..68da52d09c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java
@@ -49,7 +49,7 @@ public class Q00189_ContractCompletion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java
index 898d20eee3..45237f5fde 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java
@@ -46,7 +46,7 @@ public class Q00190_LostDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java
index ebc1748aa6..5fcd0f8944 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java
@@ -49,7 +49,7 @@ public class Q00191_VainConclusion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java
index 07c28bdb93..88b7048a5f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java
@@ -52,7 +52,7 @@ public class Q00192_SevenSignsSeriesOfDoubt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
index f81be2e67f..78a292d3d9 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
@@ -66,7 +66,7 @@ public class Q00193_SevenSignsDyingMessage extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == SHILENS_EVIL_THOUGHTS) && "despawn".equals(event))
 		{
@@ -76,7 +76,7 @@ public class Q00193_SevenSignsDyingMessage extends Quest
 				npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.NEXT_TIME_YOU_WILL_NOT_ESCAPE);
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
index 63ec681f3e..1420f8b7af 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
@@ -63,7 +63,7 @@ public class Q00194_SevenSignsMammonsContract extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java
index 4c400a55b1..122ede966b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java
@@ -62,7 +62,7 @@ public class Q00195_SevenSignsSecretRitualOfThePriests extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java
index 5320deacab..129c02898e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java
@@ -60,14 +60,14 @@ public class Q00196_SevenSignsSealOfTheEmperor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == MERCHANT_OF_MAMMON) && "DESPAWN".equals(event))
 		{
 			isBusy = false;
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THE_ANCIENT_PROMISE_TO_THE_EMPEROR_HAS_BEEN_FULFILLED);
 			npc.deleteMe();
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
index 5dab25e1e5..092819fee0 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
@@ -62,7 +62,7 @@ public class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == SHILENS_EVIL_THOUGHTS) && "despawn".equals(event))
 		{
@@ -72,7 +72,7 @@ public class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
 				npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.NEXT_TIME_YOU_WILL_NOT_ESCAPE);
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
index c026781542..c1400b2fe9 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
@@ -65,7 +65,7 @@ public class Q00198_SevenSignsEmbryo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == SHILENS_EVIL_THOUGHTS) && "despawn".equals(event))
 		{
@@ -75,7 +75,7 @@ public class Q00198_SevenSignsEmbryo extends Quest
 				npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.NEXT_TIME_YOU_WILL_NOT_ESCAPE);
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java
index aaf98cd2ae..3495505fb2 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java
@@ -47,7 +47,7 @@ public class Q00210_ObtainAWolfPet extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java
index d563a46c8c..282ad1a84b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java
@@ -135,7 +135,7 @@ public class Q00254_LegendaryTales extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
index a5a6fafea2..edae9395ac 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
@@ -113,7 +113,7 @@ public class Q00337_AudienceWithTheLandDragon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
index c8a74d6b71..0bbbc76a1c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
@@ -87,7 +87,7 @@ public class Q00344_1000YearsTheEndOfLamentation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java
index ffe42d334e..be857602fe 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java
@@ -86,7 +86,7 @@ public class Q00371_ShrieksOfGhosts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
index e61f3448e2..d5d9f396a3 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
@@ -124,7 +124,7 @@ public class Q00386_StolenDignity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (npc.getId() == WAREHOUSE_KEEPER_ROMP))
@@ -259,7 +259,7 @@ public class Q00386_StolenDignity extends Quest
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private String takeHtml(Player player, QuestState qs, int num)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
index 7726a3df5d..3e481e9b26 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
@@ -126,7 +126,7 @@ public class Q00420_LittleWing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
index 6390601ce2..14cbad6537 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
@@ -86,7 +86,7 @@ public class Q00421_LittleWingsBigAdventure extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
index 47fc9d7da4..ee9504f119 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
@@ -54,7 +54,7 @@ public class Q00450_GraveRobberRescue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
index 47e03b544f..e38e415a0a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
@@ -61,7 +61,7 @@ public class Q00451_LuciensAltar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
index 946e2fb51d..be55660c3e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
@@ -50,7 +50,7 @@ public class Q00452_FindingtheLostSoldiers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
index 76ba1205f5..18e37daee3 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
@@ -174,7 +174,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java
index 507820dc6a..0fd000078b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java
@@ -63,7 +63,7 @@ public class Q00454_CompletelyLost extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
index 6daf2a37e3..f67b20750b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
@@ -91,7 +91,7 @@ public class Q00455_WingsOfSand extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
index 10f2f47f73..cabd56f883 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
@@ -230,7 +230,7 @@ public class Q00456_DontKnowDontCare extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00459_TheVillainOfTheUndergroundMineTeredor/Q00459_TheVillainOfTheUndergroundMineTeredor.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00459_TheVillainOfTheUndergroundMineTeredor/Q00459_TheVillainOfTheUndergroundMineTeredor.java
index bcec6a35af..0cf6ea0dcb 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00459_TheVillainOfTheUndergroundMineTeredor/Q00459_TheVillainOfTheUndergroundMineTeredor.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00459_TheVillainOfTheUndergroundMineTeredor/Q00459_TheVillainOfTheUndergroundMineTeredor.java
@@ -51,7 +51,7 @@ public class Q00459_TheVillainOfTheUndergroundMineTeredor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00460_PreciousResearchMaterial/Q00460_PreciousResearchMaterial.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00460_PreciousResearchMaterial/Q00460_PreciousResearchMaterial.java
index fb020c3040..981ff3c14e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00460_PreciousResearchMaterial/Q00460_PreciousResearchMaterial.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00460_PreciousResearchMaterial/Q00460_PreciousResearchMaterial.java
@@ -52,7 +52,7 @@ public class Q00460_PreciousResearchMaterial extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java
index bdda5c0ff1..2092e40879 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java
@@ -71,7 +71,7 @@ public class Q00462_StuffedAncientHeroes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00465_WeAreFriends/Q00465_WeAreFriends.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00465_WeAreFriends/Q00465_WeAreFriends.java
index 52d86f67f3..af30a59f5d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00465_WeAreFriends/Q00465_WeAreFriends.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00465_WeAreFriends/Q00465_WeAreFriends.java
@@ -51,7 +51,7 @@ public class Q00465_WeAreFriends extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java
index c350641b85..3eb4b71954 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java
@@ -83,7 +83,7 @@ public class Q00466_PlacingMySmallPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00468_BeLostInTheMysteriousScent/Q00468_BeLostInTheMysteriousScent.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00468_BeLostInTheMysteriousScent/Q00468_BeLostInTheMysteriousScent.java
index d880c919e2..5b347e1276 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00468_BeLostInTheMysteriousScent/Q00468_BeLostInTheMysteriousScent.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00468_BeLostInTheMysteriousScent/Q00468_BeLostInTheMysteriousScent.java
@@ -53,7 +53,7 @@ public class Q00468_BeLostInTheMysteriousScent extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00469_SuspiciousGardener/Q00469_SuspiciousGardener.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00469_SuspiciousGardener/Q00469_SuspiciousGardener.java
index 77e00cc205..c739186b4d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00469_SuspiciousGardener/Q00469_SuspiciousGardener.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00469_SuspiciousGardener/Q00469_SuspiciousGardener.java
@@ -52,7 +52,7 @@ public class Q00469_SuspiciousGardener extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00470_DivinityProtector/Q00470_DivinityProtector.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00470_DivinityProtector/Q00470_DivinityProtector.java
index 73c7cefac0..4948dcf1ee 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00470_DivinityProtector/Q00470_DivinityProtector.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00470_DivinityProtector/Q00470_DivinityProtector.java
@@ -72,7 +72,7 @@ public class Q00470_DivinityProtector extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00471_BreakingThroughTheEmeraldSquare/Q00471_BreakingThroughTheEmeraldSquare.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00471_BreakingThroughTheEmeraldSquare/Q00471_BreakingThroughTheEmeraldSquare.java
index 78f677a640..c563bbad31 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00471_BreakingThroughTheEmeraldSquare/Q00471_BreakingThroughTheEmeraldSquare.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00471_BreakingThroughTheEmeraldSquare/Q00471_BreakingThroughTheEmeraldSquare.java
@@ -50,7 +50,7 @@ public class Q00471_BreakingThroughTheEmeraldSquare extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00472_ChallengeSteamCorridor/Q00472_ChallengeSteamCorridor.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00472_ChallengeSteamCorridor/Q00472_ChallengeSteamCorridor.java
index 69f96d292c..0d36fed463 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00472_ChallengeSteamCorridor/Q00472_ChallengeSteamCorridor.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00472_ChallengeSteamCorridor/Q00472_ChallengeSteamCorridor.java
@@ -50,7 +50,7 @@ public class Q00472_ChallengeSteamCorridor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00473_InTheCoralGarden/Q00473_InTheCoralGarden.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00473_InTheCoralGarden/Q00473_InTheCoralGarden.java
index 3331b4528f..7489bd9a3f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00473_InTheCoralGarden/Q00473_InTheCoralGarden.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00473_InTheCoralGarden/Q00473_InTheCoralGarden.java
@@ -50,7 +50,7 @@ public class Q00473_InTheCoralGarden extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00474_WaitingForTheSummer/Q00474_WaitingForTheSummer.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00474_WaitingForTheSummer/Q00474_WaitingForTheSummer.java
index 51691cc5ff..7d5a64da50 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00474_WaitingForTheSummer/Q00474_WaitingForTheSummer.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00474_WaitingForTheSummer/Q00474_WaitingForTheSummer.java
@@ -59,7 +59,7 @@ public class Q00474_WaitingForTheSummer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java
index 3890d7cd62..d98e0f6ace 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java
@@ -79,7 +79,7 @@ public class Q00476_PlainMission extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00482_RecertificationOfValue/Q00482_RecertificationOfValue.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00482_RecertificationOfValue/Q00482_RecertificationOfValue.java
index 62d524dfd3..35d3fa4406 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00482_RecertificationOfValue/Q00482_RecertificationOfValue.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00482_RecertificationOfValue/Q00482_RecertificationOfValue.java
@@ -131,7 +131,7 @@ public class Q00482_RecertificationOfValue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java
index e15e32b144..c10c564ffb 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java
@@ -68,7 +68,7 @@ public class Q00483_IntendedTactic extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00485_HotSpringWater/Q00485_HotSpringWater.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00485_HotSpringWater/Q00485_HotSpringWater.java
index a35badf96b..6b75b6753e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00485_HotSpringWater/Q00485_HotSpringWater.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00485_HotSpringWater/Q00485_HotSpringWater.java
@@ -62,7 +62,7 @@ public class Q00485_HotSpringWater extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00492_TombRaiders/Q00492_TombRaiders.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00492_TombRaiders/Q00492_TombRaiders.java
index e45ffa88ae..78553efafa 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00492_TombRaiders/Q00492_TombRaiders.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00492_TombRaiders/Q00492_TombRaiders.java
@@ -59,7 +59,7 @@ public class Q00492_TombRaiders extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java
index 8380c30732..d8b8bd9e9e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java
@@ -53,7 +53,7 @@ public class Q00493_KickingOutUnwelcomeGuests extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java
index 0f9eb53194..4084aa0142 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java
@@ -49,7 +49,7 @@ public class Q00494_IncarnationOfGreedZellakaGroup extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java
index ccf3cd1614..e3fe44aa0f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java
@@ -49,7 +49,7 @@ public class Q00495_IncarnationOfJealousyPellineGroup extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java
index 366e0d572d..94df5d6174 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java
@@ -49,7 +49,7 @@ public class Q00496_IncarnationOfGluttonyKaliosGroup extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java
index 008f69dd2f..d1580e694f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java
@@ -49,7 +49,7 @@ public class Q00497_IncarnationOfGreedZellakaSolo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java
index fe6d1060e8..9585452d7d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java
@@ -49,7 +49,7 @@ public class Q00498_IncarnationOfJealousyPellineSolo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java
index 3023aa50c3..3c2e128522 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java
@@ -49,7 +49,7 @@ public class Q00499_IncarnationOfGluttonyKaliosSolo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
index 0bfb256a66..176b40ad56 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
@@ -69,7 +69,7 @@ public class Q00500_BrothersBoundInChains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
index 8facc4a8cd..6476fcc9c3 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
@@ -71,7 +71,7 @@ public class Q00511_AwlUnderFoot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
index eab4647ba2..31444f8866 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
@@ -58,7 +58,7 @@ public class Q00512_BladeUnderFoot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
index 0348f88e9b..f97ce90a8e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
@@ -50,7 +50,7 @@ public class Q00551_OlympiadStarter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
index 1a59edd6b7..b06358dc78 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
@@ -50,7 +50,7 @@ public class Q00553_OlympiadUndefeated extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00561_BasicMissionHarnakUndergroundRuins/Q00561_BasicMissionHarnakUndergroundRuins.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00561_BasicMissionHarnakUndergroundRuins/Q00561_BasicMissionHarnakUndergroundRuins.java
index 53f163366e..cfa2f5bc39 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00561_BasicMissionHarnakUndergroundRuins/Q00561_BasicMissionHarnakUndergroundRuins.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00561_BasicMissionHarnakUndergroundRuins/Q00561_BasicMissionHarnakUndergroundRuins.java
@@ -57,7 +57,7 @@ public class Q00561_BasicMissionHarnakUndergroundRuins extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/Q00562_BasicMissionAltarOfEvil.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/Q00562_BasicMissionAltarOfEvil.java
index caec736235..d8bd97e195 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/Q00562_BasicMissionAltarOfEvil.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/Q00562_BasicMissionAltarOfEvil.java
@@ -59,7 +59,7 @@ public class Q00562_BasicMissionAltarOfEvil extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00563_BasicMissionBloodySwampland/Q00563_BasicMissionBloodySwampland.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00563_BasicMissionBloodySwampland/Q00563_BasicMissionBloodySwampland.java
index 004f18a1af..d8dcecb501 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00563_BasicMissionBloodySwampland/Q00563_BasicMissionBloodySwampland.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00563_BasicMissionBloodySwampland/Q00563_BasicMissionBloodySwampland.java
@@ -52,7 +52,7 @@ public class Q00563_BasicMissionBloodySwampland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00564_BasicMissionKartiasLabyrinthSolo/Q00564_BasicMissionKartiasLabyrinthSolo.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00564_BasicMissionKartiasLabyrinthSolo/Q00564_BasicMissionKartiasLabyrinthSolo.java
index e7623f44b5..045a438def 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00564_BasicMissionKartiasLabyrinthSolo/Q00564_BasicMissionKartiasLabyrinthSolo.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00564_BasicMissionKartiasLabyrinthSolo/Q00564_BasicMissionKartiasLabyrinthSolo.java
@@ -52,7 +52,7 @@ public class Q00564_BasicMissionKartiasLabyrinthSolo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00565_BasicMissionFairySettlementWest/Q00565_BasicMissionFairySettlementWest.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00565_BasicMissionFairySettlementWest/Q00565_BasicMissionFairySettlementWest.java
index da8450a569..a71fac1255 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00565_BasicMissionFairySettlementWest/Q00565_BasicMissionFairySettlementWest.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00565_BasicMissionFairySettlementWest/Q00565_BasicMissionFairySettlementWest.java
@@ -60,7 +60,7 @@ public class Q00565_BasicMissionFairySettlementWest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00566_BasicMissionFairySettlementEast/Q00566_BasicMissionFairySettlementEast.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00566_BasicMissionFairySettlementEast/Q00566_BasicMissionFairySettlementEast.java
index b1dab8528f..13a04f411f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00566_BasicMissionFairySettlementEast/Q00566_BasicMissionFairySettlementEast.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00566_BasicMissionFairySettlementEast/Q00566_BasicMissionFairySettlementEast.java
@@ -60,7 +60,7 @@ public class Q00566_BasicMissionFairySettlementEast extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00567_BasicMissionIsleOfSouls/Q00567_BasicMissionIsleOfSouls.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00567_BasicMissionIsleOfSouls/Q00567_BasicMissionIsleOfSouls.java
index 94e73d544e..c0387e3227 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00567_BasicMissionIsleOfSouls/Q00567_BasicMissionIsleOfSouls.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00567_BasicMissionIsleOfSouls/Q00567_BasicMissionIsleOfSouls.java
@@ -55,7 +55,7 @@ public class Q00567_BasicMissionIsleOfSouls extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00568_SpecialMissionNornilsCave/Q00568_SpecialMissionNornilsCave.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00568_SpecialMissionNornilsCave/Q00568_SpecialMissionNornilsCave.java
index c2dda471f8..f55baea30c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00568_SpecialMissionNornilsCave/Q00568_SpecialMissionNornilsCave.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00568_SpecialMissionNornilsCave/Q00568_SpecialMissionNornilsCave.java
@@ -55,7 +55,7 @@ public class Q00568_SpecialMissionNornilsCave extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00569_BasicMissionSealOfShilen/Q00569_BasicMissionSealOfShilen.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00569_BasicMissionSealOfShilen/Q00569_BasicMissionSealOfShilen.java
index c2cc6249be..9ad439ff60 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00569_BasicMissionSealOfShilen/Q00569_BasicMissionSealOfShilen.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00569_BasicMissionSealOfShilen/Q00569_BasicMissionSealOfShilen.java
@@ -51,7 +51,7 @@ public class Q00569_BasicMissionSealOfShilen extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00570_SpecialMissionKartiasLabyrinthParty/Q00570_SpecialMissionKartiasLabyrinthParty.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00570_SpecialMissionKartiasLabyrinthParty/Q00570_SpecialMissionKartiasLabyrinthParty.java
index 0286f4afed..021dfd2334 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00570_SpecialMissionKartiasLabyrinthParty/Q00570_SpecialMissionKartiasLabyrinthParty.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00570_SpecialMissionKartiasLabyrinthParty/Q00570_SpecialMissionKartiasLabyrinthParty.java
@@ -49,7 +49,7 @@ public class Q00570_SpecialMissionKartiasLabyrinthParty extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00571_SpecialMissionProofOfUnityFieldRaid/Q00571_SpecialMissionProofOfUnityFieldRaid.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00571_SpecialMissionProofOfUnityFieldRaid/Q00571_SpecialMissionProofOfUnityFieldRaid.java
index 8bb700546b..1fa51e0924 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00571_SpecialMissionProofOfUnityFieldRaid/Q00571_SpecialMissionProofOfUnityFieldRaid.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00571_SpecialMissionProofOfUnityFieldRaid/Q00571_SpecialMissionProofOfUnityFieldRaid.java
@@ -74,7 +74,7 @@ public class Q00571_SpecialMissionProofOfUnityFieldRaid extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00572_SpecialMissionProofOfCourageFieldRaid/Q00572_SpecialMissionProofOfCourageFieldRaid.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00572_SpecialMissionProofOfCourageFieldRaid/Q00572_SpecialMissionProofOfCourageFieldRaid.java
index 600a2aba94..c1df40aa33 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00572_SpecialMissionProofOfCourageFieldRaid/Q00572_SpecialMissionProofOfCourageFieldRaid.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00572_SpecialMissionProofOfCourageFieldRaid/Q00572_SpecialMissionProofOfCourageFieldRaid.java
@@ -79,7 +79,7 @@ public class Q00572_SpecialMissionProofOfCourageFieldRaid extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00573_SpecialMissionProofOfStrengthFieldRaid/Q00573_SpecialMissionProofOfStrengthFieldRaid.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00573_SpecialMissionProofOfStrengthFieldRaid/Q00573_SpecialMissionProofOfStrengthFieldRaid.java
index a6f3ebf8bd..d25c7a7581 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00573_SpecialMissionProofOfStrengthFieldRaid/Q00573_SpecialMissionProofOfStrengthFieldRaid.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00573_SpecialMissionProofOfStrengthFieldRaid/Q00573_SpecialMissionProofOfStrengthFieldRaid.java
@@ -79,7 +79,7 @@ public class Q00573_SpecialMissionProofOfStrengthFieldRaid extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00574_SpecialMissionNornilsGarden/Q00574_SpecialMissionNornilsGarden.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00574_SpecialMissionNornilsGarden/Q00574_SpecialMissionNornilsGarden.java
index 7255a1d251..acf06ef049 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00574_SpecialMissionNornilsGarden/Q00574_SpecialMissionNornilsGarden.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00574_SpecialMissionNornilsGarden/Q00574_SpecialMissionNornilsGarden.java
@@ -53,7 +53,7 @@ public class Q00574_SpecialMissionNornilsGarden extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00576_SpecialMissionDefeatSpezion/Q00576_SpecialMissionDefeatSpezion.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00576_SpecialMissionDefeatSpezion/Q00576_SpecialMissionDefeatSpezion.java
index bea102f667..8843dd06d4 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00576_SpecialMissionDefeatSpezion/Q00576_SpecialMissionDefeatSpezion.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00576_SpecialMissionDefeatSpezion/Q00576_SpecialMissionDefeatSpezion.java
@@ -52,7 +52,7 @@ public class Q00576_SpecialMissionDefeatSpezion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00577_BasicMissionSilentValley/Q00577_BasicMissionSilentValley.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00577_BasicMissionSilentValley/Q00577_BasicMissionSilentValley.java
index ab3b4302ec..be7ba57420 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00577_BasicMissionSilentValley/Q00577_BasicMissionSilentValley.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00577_BasicMissionSilentValley/Q00577_BasicMissionSilentValley.java
@@ -52,7 +52,7 @@ public class Q00577_BasicMissionSilentValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00580_BeyondTheMemories/Q00580_BeyondTheMemories.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00580_BeyondTheMemories/Q00580_BeyondTheMemories.java
index 6a4cbc7cc8..1ffd6c1de5 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00580_BeyondTheMemories/Q00580_BeyondTheMemories.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00580_BeyondTheMemories/Q00580_BeyondTheMemories.java
@@ -87,7 +87,7 @@ public class Q00580_BeyondTheMemories extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00581_ThePurificationRitual/Q00581_ThePurificationRitual.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00581_ThePurificationRitual/Q00581_ThePurificationRitual.java
index ca81196dfe..5f925fce24 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00581_ThePurificationRitual/Q00581_ThePurificationRitual.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00581_ThePurificationRitual/Q00581_ThePurificationRitual.java
@@ -76,7 +76,7 @@ public class Q00581_ThePurificationRitual extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00582_WashBloodWithBlood/Q00582_WashBloodWithBlood.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00582_WashBloodWithBlood/Q00582_WashBloodWithBlood.java
index b1e14fd0e8..c019ae7c5d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00582_WashBloodWithBlood/Q00582_WashBloodWithBlood.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00582_WashBloodWithBlood/Q00582_WashBloodWithBlood.java
@@ -79,7 +79,7 @@ public class Q00582_WashBloodWithBlood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00583_MeaningOfSurvival/Q00583_MeaningOfSurvival.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00583_MeaningOfSurvival/Q00583_MeaningOfSurvival.java
index 9d628426d8..34e049ccb7 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00583_MeaningOfSurvival/Q00583_MeaningOfSurvival.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00583_MeaningOfSurvival/Q00583_MeaningOfSurvival.java
@@ -77,7 +77,7 @@ public class Q00583_MeaningOfSurvival extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00584_NeverSayGoodBye/Q00584_NeverSayGoodBye.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00584_NeverSayGoodBye/Q00584_NeverSayGoodBye.java
index 1af272b77e..a4addd8708 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00584_NeverSayGoodBye/Q00584_NeverSayGoodBye.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00584_NeverSayGoodBye/Q00584_NeverSayGoodBye.java
@@ -80,7 +80,7 @@ public class Q00584_NeverSayGoodBye extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00585_CantGoAgainstTheTime/Q00585_CantGoAgainstTheTime.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00585_CantGoAgainstTheTime/Q00585_CantGoAgainstTheTime.java
index 01371768ba..ee46da0fa7 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00585_CantGoAgainstTheTime/Q00585_CantGoAgainstTheTime.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00585_CantGoAgainstTheTime/Q00585_CantGoAgainstTheTime.java
@@ -72,7 +72,7 @@ public class Q00585_CantGoAgainstTheTime extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00586_MutatedCreatures/Q00586_MutatedCreatures.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00586_MutatedCreatures/Q00586_MutatedCreatures.java
index 9d985e8c90..5c793893ad 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00586_MutatedCreatures/Q00586_MutatedCreatures.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00586_MutatedCreatures/Q00586_MutatedCreatures.java
@@ -51,7 +51,7 @@ public class Q00586_MutatedCreatures extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00587_MoreAggressiveOperation/Q00587_MoreAggressiveOperation.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00587_MoreAggressiveOperation/Q00587_MoreAggressiveOperation.java
index fba5c2202c..cca3219ed2 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00587_MoreAggressiveOperation/Q00587_MoreAggressiveOperation.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00587_MoreAggressiveOperation/Q00587_MoreAggressiveOperation.java
@@ -78,7 +78,7 @@ public class Q00587_MoreAggressiveOperation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00588_HeadOnCrash/Q00588_HeadOnCrash.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00588_HeadOnCrash/Q00588_HeadOnCrash.java
index d22846f0ba..7b47113c9b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00588_HeadOnCrash/Q00588_HeadOnCrash.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00588_HeadOnCrash/Q00588_HeadOnCrash.java
@@ -55,7 +55,7 @@ public class Q00588_HeadOnCrash extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00589_ASecretChange/Q00589_ASecretChange.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00589_ASecretChange/Q00589_ASecretChange.java
index df44caee12..9663b63f20 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00589_ASecretChange/Q00589_ASecretChange.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00589_ASecretChange/Q00589_ASecretChange.java
@@ -57,7 +57,7 @@ public class Q00589_ASecretChange extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00590_ToEachTheirOwn/Q00590_ToEachTheirOwn.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00590_ToEachTheirOwn/Q00590_ToEachTheirOwn.java
index a8b256b892..d1e02e881d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00590_ToEachTheirOwn/Q00590_ToEachTheirOwn.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00590_ToEachTheirOwn/Q00590_ToEachTheirOwn.java
@@ -56,7 +56,7 @@ public class Q00590_ToEachTheirOwn extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00599_DemonsAndDimensionalEnergy/Q00599_DemonsAndDimensionalEnergy.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00599_DemonsAndDimensionalEnergy/Q00599_DemonsAndDimensionalEnergy.java
index 75437b19b1..fe490f4774 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00599_DemonsAndDimensionalEnergy/Q00599_DemonsAndDimensionalEnergy.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00599_DemonsAndDimensionalEnergy/Q00599_DemonsAndDimensionalEnergy.java
@@ -70,7 +70,7 @@ public class Q00599_DemonsAndDimensionalEnergy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00600_KeyToTheRefiningProcess/Q00600_KeyToTheRefiningProcess.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00600_KeyToTheRefiningProcess/Q00600_KeyToTheRefiningProcess.java
index e3d1cf0b49..6d61fa327f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00600_KeyToTheRefiningProcess/Q00600_KeyToTheRefiningProcess.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00600_KeyToTheRefiningProcess/Q00600_KeyToTheRefiningProcess.java
@@ -63,7 +63,7 @@ public class Q00600_KeyToTheRefiningProcess extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
index 295b613316..d362ed8b48 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
@@ -84,7 +84,7 @@ public class Q00617_GatherTheFlames extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
index 22d8a3f362..481380c065 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
@@ -65,7 +65,7 @@ public class Q00618_IntoTheFlame extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
index 24dc552a09..554a65b448 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
@@ -108,7 +108,7 @@ public class Q00620_FourGoblets extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = player.getQuestState(getName());
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
index effc3c81e3..e473202bfa 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
@@ -62,7 +62,7 @@ public class Q00621_EggDelivery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
index 8a857ca301..0aa311db9e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
@@ -62,7 +62,7 @@ public class Q00622_SpecialtyLiquorDelivery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
index a464df7f99..a0ed4ec2a8 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
@@ -66,7 +66,7 @@ public class Q00623_TheFinestFood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
index 335ef36527..882e4a1ad1 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
@@ -78,7 +78,7 @@ public class Q00627_HeartInSearchOfPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
index 6f6013cac1..ff2f3a5bfe 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
@@ -99,7 +99,7 @@ public class Q00648_AnIceMerchantsDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		final QuestState q115 = player.getQuestState(Q00115_TheOtherSideOfTruth.class.getSimpleName());
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
index e012de30f8..b36fd12f72 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
@@ -90,7 +90,7 @@ public class Q00662_AGameOfCards extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
index 3b05df07a2..51e520cc09 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
@@ -153,7 +153,7 @@ public class Q00663_SeductiveWhispers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00665_BasicTrainingForHunterGuildMember/Q00665_BasicTrainingForHunterGuildMember.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00665_BasicTrainingForHunterGuildMember/Q00665_BasicTrainingForHunterGuildMember.java
index d5ea1aeadc..1dd72a5854 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00665_BasicTrainingForHunterGuildMember/Q00665_BasicTrainingForHunterGuildMember.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00665_BasicTrainingForHunterGuildMember/Q00665_BasicTrainingForHunterGuildMember.java
@@ -64,7 +64,7 @@ public class Q00665_BasicTrainingForHunterGuildMember extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00666_HunterGuildMembersKnowledge/Q00666_HunterGuildMembersKnowledge.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00666_HunterGuildMembersKnowledge/Q00666_HunterGuildMembersKnowledge.java
index b39573ac0b..b1205ef9b6 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00666_HunterGuildMembersKnowledge/Q00666_HunterGuildMembersKnowledge.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00666_HunterGuildMembersKnowledge/Q00666_HunterGuildMembersKnowledge.java
@@ -69,7 +69,7 @@ public class Q00666_HunterGuildMembersKnowledge extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00667_HowToCoverShilensEyes/Q00667_HowToCoverShilensEyes.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00667_HowToCoverShilensEyes/Q00667_HowToCoverShilensEyes.java
index 462952ed55..d039ce3e6b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00667_HowToCoverShilensEyes/Q00667_HowToCoverShilensEyes.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00667_HowToCoverShilensEyes/Q00667_HowToCoverShilensEyes.java
@@ -61,7 +61,7 @@ public final class Q00667_HowToCoverShilensEyes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00668_ABattleWithTheGiants/Q00668_ABattleWithTheGiants.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00668_ABattleWithTheGiants/Q00668_ABattleWithTheGiants.java
index 0115611bea..9a2f5d7c44 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00668_ABattleWithTheGiants/Q00668_ABattleWithTheGiants.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00668_ABattleWithTheGiants/Q00668_ABattleWithTheGiants.java
@@ -58,7 +58,7 @@ public class Q00668_ABattleWithTheGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00669_DesperateFightWithTheDragons/Q00669_DesperateFightWithTheDragons.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00669_DesperateFightWithTheDragons/Q00669_DesperateFightWithTheDragons.java
index 86282d9458..808368ccf6 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00669_DesperateFightWithTheDragons/Q00669_DesperateFightWithTheDragons.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00669_DesperateFightWithTheDragons/Q00669_DesperateFightWithTheDragons.java
@@ -57,7 +57,7 @@ public class Q00669_DesperateFightWithTheDragons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00670_DefeatingTheLordOfSeed/Q00670_DefeatingTheLordOfSeed.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00670_DefeatingTheLordOfSeed/Q00670_DefeatingTheLordOfSeed.java
index 7d13e190f7..e8f1153c86 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00670_DefeatingTheLordOfSeed/Q00670_DefeatingTheLordOfSeed.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00670_DefeatingTheLordOfSeed/Q00670_DefeatingTheLordOfSeed.java
@@ -58,7 +58,7 @@ public class Q00670_DefeatingTheLordOfSeed extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00671_PathToFindingThePast/Q00671_PathToFindingThePast.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00671_PathToFindingThePast/Q00671_PathToFindingThePast.java
index bdf1b18f42..b033d03fa8 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00671_PathToFindingThePast/Q00671_PathToFindingThePast.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00671_PathToFindingThePast/Q00671_PathToFindingThePast.java
@@ -69,7 +69,7 @@ public class Q00671_PathToFindingThePast extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00672_ArchenemyEmbryo/Q00672_ArchenemyEmbryo.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00672_ArchenemyEmbryo/Q00672_ArchenemyEmbryo.java
index 596488f105..5b32e1a999 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00672_ArchenemyEmbryo/Q00672_ArchenemyEmbryo.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00672_ArchenemyEmbryo/Q00672_ArchenemyEmbryo.java
@@ -55,7 +55,7 @@ public class Q00672_ArchenemyEmbryo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00673_BelethAmbition/Q00673_BelethAmbition.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00673_BelethAmbition/Q00673_BelethAmbition.java
index 997841e0b2..a188d43e4d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00673_BelethAmbition/Q00673_BelethAmbition.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00673_BelethAmbition/Q00673_BelethAmbition.java
@@ -56,7 +56,7 @@ public class Q00673_BelethAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00674_ChangesInTheShadowOfTheMotherTree/Q00674_ChangesInTheShadowOfTheMotherTree.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00674_ChangesInTheShadowOfTheMotherTree/Q00674_ChangesInTheShadowOfTheMotherTree.java
index 2b5d58ddae..0273703923 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00674_ChangesInTheShadowOfTheMotherTree/Q00674_ChangesInTheShadowOfTheMotherTree.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00674_ChangesInTheShadowOfTheMotherTree/Q00674_ChangesInTheShadowOfTheMotherTree.java
@@ -72,7 +72,7 @@ public class Q00674_ChangesInTheShadowOfTheMotherTree extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00675_WhatTheThreadOfThePastShows/Q00675_WhatTheThreadOfThePastShows.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00675_WhatTheThreadOfThePastShows/Q00675_WhatTheThreadOfThePastShows.java
index c6b5ce237a..7762bddd90 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00675_WhatTheThreadOfThePastShows/Q00675_WhatTheThreadOfThePastShows.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00675_WhatTheThreadOfThePastShows/Q00675_WhatTheThreadOfThePastShows.java
@@ -64,7 +64,7 @@ public class Q00675_WhatTheThreadOfThePastShows extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
index 0278e46ec2..17895d5c45 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
@@ -69,7 +69,7 @@ public class Q00726_LightWithinTheDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
index da19640964..bd744f7aaa 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
@@ -57,7 +57,7 @@ public class Q00727_HopeWithinTheDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00737_ASwordHiddenInASmile/Q00737_ASwordHiddenInASmile.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00737_ASwordHiddenInASmile/Q00737_ASwordHiddenInASmile.java
index 1033d9d208..4095fdfb2b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00737_ASwordHiddenInASmile/Q00737_ASwordHiddenInASmile.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00737_ASwordHiddenInASmile/Q00737_ASwordHiddenInASmile.java
@@ -61,7 +61,7 @@ public class Q00737_ASwordHiddenInASmile extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00738_DimensionalExplorationOfTheUnworldlyVisitors/Q00738_DimensionalExplorationOfTheUnworldlyVisitors.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00738_DimensionalExplorationOfTheUnworldlyVisitors/Q00738_DimensionalExplorationOfTheUnworldlyVisitors.java
index 0956613cc1..8f63f869cb 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00738_DimensionalExplorationOfTheUnworldlyVisitors/Q00738_DimensionalExplorationOfTheUnworldlyVisitors.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00738_DimensionalExplorationOfTheUnworldlyVisitors/Q00738_DimensionalExplorationOfTheUnworldlyVisitors.java
@@ -72,7 +72,7 @@ public class Q00738_DimensionalExplorationOfTheUnworldlyVisitors extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00743_AtTheAltarOfOblivion/Q00743_AtTheAltarOfOblivion.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00743_AtTheAltarOfOblivion/Q00743_AtTheAltarOfOblivion.java
index 960a737453..8d82ae530f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00743_AtTheAltarOfOblivion/Q00743_AtTheAltarOfOblivion.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00743_AtTheAltarOfOblivion/Q00743_AtTheAltarOfOblivion.java
@@ -82,7 +82,7 @@ public class Q00743_AtTheAltarOfOblivion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00744_TheAlligatorHunterReturns/Q00744_TheAlligatorHunterReturns.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00744_TheAlligatorHunterReturns/Q00744_TheAlligatorHunterReturns.java
index 4230ffc9be..ec5091f5ff 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00744_TheAlligatorHunterReturns/Q00744_TheAlligatorHunterReturns.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00744_TheAlligatorHunterReturns/Q00744_TheAlligatorHunterReturns.java
@@ -65,7 +65,7 @@ public final class Q00744_TheAlligatorHunterReturns extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00745_TheOutlawsAreIncoming/Q00745_TheOutlawsAreIncoming.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00745_TheOutlawsAreIncoming/Q00745_TheOutlawsAreIncoming.java
index a78b4b775a..2e896b781d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00745_TheOutlawsAreIncoming/Q00745_TheOutlawsAreIncoming.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00745_TheOutlawsAreIncoming/Q00745_TheOutlawsAreIncoming.java
@@ -74,7 +74,7 @@ public class Q00745_TheOutlawsAreIncoming extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00747_DefendingTheForsakenPlains/Q00747_DefendingTheForsakenPlains.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00747_DefendingTheForsakenPlains/Q00747_DefendingTheForsakenPlains.java
index 2bf41c5de2..2ce7479e4a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00747_DefendingTheForsakenPlains/Q00747_DefendingTheForsakenPlains.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00747_DefendingTheForsakenPlains/Q00747_DefendingTheForsakenPlains.java
@@ -69,7 +69,7 @@ public final class Q00747_DefendingTheForsakenPlains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00748_EndlessRevenge/Q00748_EndlessRevenge.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00748_EndlessRevenge/Q00748_EndlessRevenge.java
index b7a4d1bf37..c5186f1275 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00748_EndlessRevenge/Q00748_EndlessRevenge.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00748_EndlessRevenge/Q00748_EndlessRevenge.java
@@ -70,7 +70,7 @@ public final class Q00748_EndlessRevenge extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00749_TiesWithTheGuardians/Q00749_TiesWithTheGuardians.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00749_TiesWithTheGuardians/Q00749_TiesWithTheGuardians.java
index eb3716794f..538ea2d365 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00749_TiesWithTheGuardians/Q00749_TiesWithTheGuardians.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00749_TiesWithTheGuardians/Q00749_TiesWithTheGuardians.java
@@ -57,7 +57,7 @@ public final class Q00749_TiesWithTheGuardians extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java
index 9161bfd4b9..31eace47ba 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java
@@ -72,7 +72,7 @@ public class Q00751_LiberatingTheSpirits extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java
index 3c5f3d9861..e22b624bc5 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java
@@ -70,7 +70,7 @@ public class Q00752_UncoverTheSecret extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java
index 6f5853054b..935c3a7c37 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java
@@ -78,7 +78,7 @@ public class Q00753_ReactingToACrisis extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00754_AssistingTheRebelForces/Q00754_AssistingTheRebelForces.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00754_AssistingTheRebelForces/Q00754_AssistingTheRebelForces.java
index efd21fd055..fbbb9eb5c6 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00754_AssistingTheRebelForces/Q00754_AssistingTheRebelForces.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00754_AssistingTheRebelForces/Q00754_AssistingTheRebelForces.java
@@ -54,7 +54,7 @@ public class Q00754_AssistingTheRebelForces extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00755_InNeedOfPetras/Q00755_InNeedOfPetras.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00755_InNeedOfPetras/Q00755_InNeedOfPetras.java
index 20aa2199c8..09d9216654 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00755_InNeedOfPetras/Q00755_InNeedOfPetras.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00755_InNeedOfPetras/Q00755_InNeedOfPetras.java
@@ -67,7 +67,7 @@ public class Q00755_InNeedOfPetras extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java
index 40e84f4dd0..9038173a19 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java
@@ -48,7 +48,7 @@ public class Q00756_TopQualityPetra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java
index 1927ac253f..0b6815a166 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java
@@ -71,7 +71,7 @@ public class Q00757_TriolsMovement extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java
index 0578c5952a..c777c72641 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java
@@ -70,7 +70,7 @@ public class Q00758_TheFallenKingsMen extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00759_TheDwarvenNightmareContinues/Q00759_TheDwarvenNightmareContinues.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00759_TheDwarvenNightmareContinues/Q00759_TheDwarvenNightmareContinues.java
index e0db615674..4715b055c5 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00759_TheDwarvenNightmareContinues/Q00759_TheDwarvenNightmareContinues.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00759_TheDwarvenNightmareContinues/Q00759_TheDwarvenNightmareContinues.java
@@ -68,7 +68,7 @@ public class Q00759_TheDwarvenNightmareContinues extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java
index e163658293..33169c48a7 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java
@@ -47,7 +47,7 @@ public class Q00760_BlockTheExit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java
index bbe8918eef..42b3fd1c01 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java
@@ -87,7 +87,7 @@ public class Q00761_AssistingTheGoldenRamArmy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java
index 709817b6a5..ac13b91b3e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java
@@ -116,7 +116,7 @@ public class Q00762_AnOminousRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java
index b22bbfddc0..80637b644a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java
@@ -76,7 +76,7 @@ public class Q00763_ADauntingTask extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00764_WeakeningTheVarkaSilenosForces/Q00764_WeakeningTheVarkaSilenosForces.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00764_WeakeningTheVarkaSilenosForces/Q00764_WeakeningTheVarkaSilenosForces.java
index 5e10448397..fe404d0596 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00764_WeakeningTheVarkaSilenosForces/Q00764_WeakeningTheVarkaSilenosForces.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00764_WeakeningTheVarkaSilenosForces/Q00764_WeakeningTheVarkaSilenosForces.java
@@ -73,7 +73,7 @@ public class Q00764_WeakeningTheVarkaSilenosForces extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00765_WeakeningTheKetraOrcForces/Q00765_WeakeningTheKetraOrcForces.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00765_WeakeningTheKetraOrcForces/Q00765_WeakeningTheKetraOrcForces.java
index c700da56d0..84017857a4 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00765_WeakeningTheKetraOrcForces/Q00765_WeakeningTheKetraOrcForces.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00765_WeakeningTheKetraOrcForces/Q00765_WeakeningTheKetraOrcForces.java
@@ -73,7 +73,7 @@ public class Q00765_WeakeningTheKetraOrcForces extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00773_ToCalmTheFlood/Q00773_ToCalmTheFlood.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00773_ToCalmTheFlood/Q00773_ToCalmTheFlood.java
index 1ff56aaed8..e8be8cda84 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00773_ToCalmTheFlood/Q00773_ToCalmTheFlood.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00773_ToCalmTheFlood/Q00773_ToCalmTheFlood.java
@@ -91,7 +91,7 @@ public class Q00773_ToCalmTheFlood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00774_DreamingOfPeace/Q00774_DreamingOfPeace.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00774_DreamingOfPeace/Q00774_DreamingOfPeace.java
index 51271afc55..26216ab6ef 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00774_DreamingOfPeace/Q00774_DreamingOfPeace.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00774_DreamingOfPeace/Q00774_DreamingOfPeace.java
@@ -88,7 +88,7 @@ public class Q00774_DreamingOfPeace extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java
index 50114439f2..c74b54e1c8 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java
@@ -82,7 +82,7 @@ public class Q00775_RetrievingTheChaosFragment extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java
index ac2f54fa8d..18b9f67179 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java
@@ -49,7 +49,7 @@ public class Q00776_SlayDarkLordEkimus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java
index dad6a31213..ff385c026f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java
@@ -50,7 +50,7 @@ public class Q00777_SlayDarkLordTiat extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java
index c2266256c4..9cf140a913 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java
@@ -76,7 +76,7 @@ public class Q00778_OperationRoaringFlame extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00779_UtilizeTheDarknessSeedOfDestruction/Q00779_UtilizeTheDarknessSeedOfDestruction.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00779_UtilizeTheDarknessSeedOfDestruction/Q00779_UtilizeTheDarknessSeedOfDestruction.java
index 15fa0b1e53..c6fac96851 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00779_UtilizeTheDarknessSeedOfDestruction/Q00779_UtilizeTheDarknessSeedOfDestruction.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00779_UtilizeTheDarknessSeedOfDestruction/Q00779_UtilizeTheDarknessSeedOfDestruction.java
@@ -72,7 +72,7 @@ public class Q00779_UtilizeTheDarknessSeedOfDestruction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00780_UtilizeTheDarknessSeedOfInfinity/Q00780_UtilizeTheDarknessSeedOfInfinity.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00780_UtilizeTheDarknessSeedOfInfinity/Q00780_UtilizeTheDarknessSeedOfInfinity.java
index a71bdf61dc..3820918c63 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00780_UtilizeTheDarknessSeedOfInfinity/Q00780_UtilizeTheDarknessSeedOfInfinity.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00780_UtilizeTheDarknessSeedOfInfinity/Q00780_UtilizeTheDarknessSeedOfInfinity.java
@@ -61,7 +61,7 @@ public class Q00780_UtilizeTheDarknessSeedOfInfinity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00781_UtilizeTheDarknessSeedOfAnnihilation/Q00781_UtilizeTheDarknessSeedOfAnnihilation.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00781_UtilizeTheDarknessSeedOfAnnihilation/Q00781_UtilizeTheDarknessSeedOfAnnihilation.java
index 190b971f36..d662d9fc6d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00781_UtilizeTheDarknessSeedOfAnnihilation/Q00781_UtilizeTheDarknessSeedOfAnnihilation.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00781_UtilizeTheDarknessSeedOfAnnihilation/Q00781_UtilizeTheDarknessSeedOfAnnihilation.java
@@ -78,7 +78,7 @@ public class Q00781_UtilizeTheDarknessSeedOfAnnihilation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00782_UtilizeTheDarknessSeedOfHellfire/Q00782_UtilizeTheDarknessSeedOfHellfire.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00782_UtilizeTheDarknessSeedOfHellfire/Q00782_UtilizeTheDarknessSeedOfHellfire.java
index 7feaaf443e..3b181f5417 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00782_UtilizeTheDarknessSeedOfHellfire/Q00782_UtilizeTheDarknessSeedOfHellfire.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00782_UtilizeTheDarknessSeedOfHellfire/Q00782_UtilizeTheDarknessSeedOfHellfire.java
@@ -79,7 +79,7 @@ public class Q00782_UtilizeTheDarknessSeedOfHellfire extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java
index f72f39a08d..0f9c11b687 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java
@@ -71,7 +71,7 @@ public class Q00783_VestigeOfTheMagicPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
@@ -175,17 +175,17 @@ public class Q00783_VestigeOfTheMagicPower extends Quest
 					else if (qs.isCond(5))
 					{
 						htmltext = "31595-05b.htm";
-						onAdvEvent(htmltext, npc, player);
+						onEvent(htmltext, npc, player);
 					}
 					else if (qs.isCond(6))
 					{
 						htmltext = "31595-06b.htm";
-						onAdvEvent(htmltext, npc, player);
+						onEvent(htmltext, npc, player);
 					}
 					else if (qs.isCond(7))
 					{
 						htmltext = "31595-07b.htm";
-						onAdvEvent(htmltext, npc, player);
+						onEvent(htmltext, npc, player);
 					}
 					else if (qs.isCond(2) || qs.isCond(3) || qs.isCond(4))
 					{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java
index 5f840ead5d..449c163fad 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java
@@ -77,7 +77,7 @@ public class Q00787_TheRoleOfAWatcher extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00789_WaitingForPaagrio/Q00789_WaitingForPaagrio.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00789_WaitingForPaagrio/Q00789_WaitingForPaagrio.java
index ab35b9c767..ea6997ed3a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00789_WaitingForPaagrio/Q00789_WaitingForPaagrio.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00789_WaitingForPaagrio/Q00789_WaitingForPaagrio.java
@@ -75,7 +75,7 @@ public final class Q00789_WaitingForPaagrio extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00790_ObtainingFerinsTrust/Q00790_ObtainingFerinsTrust.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00790_ObtainingFerinsTrust/Q00790_ObtainingFerinsTrust.java
index 7056a05ab3..a12633bddd 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00790_ObtainingFerinsTrust/Q00790_ObtainingFerinsTrust.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00790_ObtainingFerinsTrust/Q00790_ObtainingFerinsTrust.java
@@ -73,7 +73,7 @@ public class Q00790_ObtainingFerinsTrust extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00792_TheSuperionGiants/Q00792_TheSuperionGiants.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00792_TheSuperionGiants/Q00792_TheSuperionGiants.java
index a494fa2d3a..1f8af8f813 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00792_TheSuperionGiants/Q00792_TheSuperionGiants.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00792_TheSuperionGiants/Q00792_TheSuperionGiants.java
@@ -70,7 +70,7 @@ public class Q00792_TheSuperionGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00816_PlansToRepairTheStronghold/Q00816_PlansToRepairTheStronghold.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00816_PlansToRepairTheStronghold/Q00816_PlansToRepairTheStronghold.java
index 0507702506..2427136f91 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00816_PlansToRepairTheStronghold/Q00816_PlansToRepairTheStronghold.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00816_PlansToRepairTheStronghold/Q00816_PlansToRepairTheStronghold.java
@@ -65,7 +65,7 @@ public class Q00816_PlansToRepairTheStronghold extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00817_BlackAteliaResearch/Q00817_BlackAteliaResearch.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00817_BlackAteliaResearch/Q00817_BlackAteliaResearch.java
index 7296ee314b..e4de6eff53 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00817_BlackAteliaResearch/Q00817_BlackAteliaResearch.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00817_BlackAteliaResearch/Q00817_BlackAteliaResearch.java
@@ -58,7 +58,7 @@ public class Q00817_BlackAteliaResearch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00823_DisappearedRaceNewFairy/Q00823_DisappearedRaceNewFairy.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00823_DisappearedRaceNewFairy/Q00823_DisappearedRaceNewFairy.java
index cd55044b35..62d5dafe62 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00823_DisappearedRaceNewFairy/Q00823_DisappearedRaceNewFairy.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00823_DisappearedRaceNewFairy/Q00823_DisappearedRaceNewFairy.java
@@ -66,7 +66,7 @@ public class Q00823_DisappearedRaceNewFairy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00824_AttackTheCommandPost/Q00824_AttackTheCommandPost.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00824_AttackTheCommandPost/Q00824_AttackTheCommandPost.java
index db25590de0..c89f2abb8a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00824_AttackTheCommandPost/Q00824_AttackTheCommandPost.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00824_AttackTheCommandPost/Q00824_AttackTheCommandPost.java
@@ -51,7 +51,7 @@ public class Q00824_AttackTheCommandPost extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java
index 33c9979b4a..4f6a1dd284 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java
@@ -68,7 +68,7 @@ public class Q00826_InSearchOfTheSecretWeapon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java
index 8b7399c41e..739655c72f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java
@@ -89,7 +89,7 @@ public class Q00827_EinhasadsOrder extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00828_EvasBlessing/Q00828_EvasBlessing.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00828_EvasBlessing/Q00828_EvasBlessing.java
index 202e0fc3ca..72b34bd5f9 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00828_EvasBlessing/Q00828_EvasBlessing.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00828_EvasBlessing/Q00828_EvasBlessing.java
@@ -95,7 +95,7 @@ public class Q00828_EvasBlessing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00829_MaphrsSalvation/Q00829_MaphrsSalvation.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00829_MaphrsSalvation/Q00829_MaphrsSalvation.java
index 977c610974..457faaa28c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00829_MaphrsSalvation/Q00829_MaphrsSalvation.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00829_MaphrsSalvation/Q00829_MaphrsSalvation.java
@@ -54,7 +54,7 @@ public class Q00829_MaphrsSalvation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00830_TheWayOfTheGiantsPawn/Q00830_TheWayOfTheGiantsPawn.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00830_TheWayOfTheGiantsPawn/Q00830_TheWayOfTheGiantsPawn.java
index 1bac202074..64715ee4c7 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00830_TheWayOfTheGiantsPawn/Q00830_TheWayOfTheGiantsPawn.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00830_TheWayOfTheGiantsPawn/Q00830_TheWayOfTheGiantsPawn.java
@@ -89,7 +89,7 @@ public class Q00830_TheWayOfTheGiantsPawn extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java
index 9584d686bc..cb7bae51ab 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java
@@ -55,7 +55,7 @@ public class Q00831_SayhasScheme extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
index 755ff509f8..42c14d342e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
@@ -65,7 +65,7 @@ public class Q00833_DevilsTreasureTauti extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
index 6448125f2f..d2db3dae19 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
@@ -61,7 +61,7 @@ public class Q00835_PitiableMelisa extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00841_ContaminationContainment/Q00841_ContaminationContainment.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00841_ContaminationContainment/Q00841_ContaminationContainment.java
index d2e0a5f339..f11476f789 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00841_ContaminationContainment/Q00841_ContaminationContainment.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00841_ContaminationContainment/Q00841_ContaminationContainment.java
@@ -86,7 +86,7 @@ public final class Q00841_ContaminationContainment extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00842_CaptiveDemons/Q00842_CaptiveDemons.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00842_CaptiveDemons/Q00842_CaptiveDemons.java
index 6a3f793adb..7c93c26cf7 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00842_CaptiveDemons/Q00842_CaptiveDemons.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00842_CaptiveDemons/Q00842_CaptiveDemons.java
@@ -67,7 +67,7 @@ public class Q00842_CaptiveDemons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00843_GiantEvolutionControl/Q00843_GiantEvolutionControl.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00843_GiantEvolutionControl/Q00843_GiantEvolutionControl.java
index 17fbceb090..f66b6c4eec 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00843_GiantEvolutionControl/Q00843_GiantEvolutionControl.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00843_GiantEvolutionControl/Q00843_GiantEvolutionControl.java
@@ -80,7 +80,7 @@ public final class Q00843_GiantEvolutionControl extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00844_GiantsTreasure/Q00844_GiantsTreasure.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00844_GiantsTreasure/Q00844_GiantsTreasure.java
index ea0d277f7d..06827de98e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00844_GiantsTreasure/Q00844_GiantsTreasure.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00844_GiantsTreasure/Q00844_GiantsTreasure.java
@@ -63,7 +63,7 @@ public class Q00844_GiantsTreasure extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00845_SabotageTheEmbryoSupplies/Q00845_SabotageTheEmbryoSupplies.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00845_SabotageTheEmbryoSupplies/Q00845_SabotageTheEmbryoSupplies.java
index e4a2ecd1e9..c81c7e73bf 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00845_SabotageTheEmbryoSupplies/Q00845_SabotageTheEmbryoSupplies.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00845_SabotageTheEmbryoSupplies/Q00845_SabotageTheEmbryoSupplies.java
@@ -72,7 +72,7 @@ public class Q00845_SabotageTheEmbryoSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00846_BuildingUpStrength/Q00846_BuildingUpStrength.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00846_BuildingUpStrength/Q00846_BuildingUpStrength.java
index c003dafa91..69c93caa37 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00846_BuildingUpStrength/Q00846_BuildingUpStrength.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00846_BuildingUpStrength/Q00846_BuildingUpStrength.java
@@ -75,7 +75,7 @@ public final class Q00846_BuildingUpStrength extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
index 1140fc7490..2a6c62bb48 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
@@ -58,7 +58,7 @@ public class Q00901_HowLavasaurusesAreMade extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java
index b16bc679ac..d9d162c9f1 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java
@@ -77,7 +77,7 @@ public class Q00902_ReclaimOurEra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
index 8587c2f741..d15889aad7 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
@@ -55,7 +55,7 @@ public class Q00903_TheCallOfAntharas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
index 79522f8309..73589e1dbb 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
@@ -103,7 +103,7 @@ public class Q00905_RefinedDragonBlood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
index 3f6c9f9a30..4494d2a115 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
@@ -65,7 +65,7 @@ public class Q00906_TheCallOfValakas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00923_ShinedustExtraction/Q00923_ShinedustExtraction.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00923_ShinedustExtraction/Q00923_ShinedustExtraction.java
index 23a188fedb..a68c027b2a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00923_ShinedustExtraction/Q00923_ShinedustExtraction.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00923_ShinedustExtraction/Q00923_ShinedustExtraction.java
@@ -69,7 +69,7 @@ public class Q00923_ShinedustExtraction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00924_GiantOfTheRestorationRoom/Q00924_GiantOfTheRestorationRoom.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00924_GiantOfTheRestorationRoom/Q00924_GiantOfTheRestorationRoom.java
index de9e6695cc..5fe6d77b8b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00924_GiantOfTheRestorationRoom/Q00924_GiantOfTheRestorationRoom.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00924_GiantOfTheRestorationRoom/Q00924_GiantOfTheRestorationRoom.java
@@ -66,7 +66,7 @@ public class Q00924_GiantOfTheRestorationRoom extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java
index 0c68f67f34..9c53c37390 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java
@@ -58,7 +58,7 @@ public class Q00926_30DaySearchOperation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java
index 18391c86e3..a162ef4426 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java
@@ -65,7 +65,7 @@ public class Q00928_100DaySubjugationOperation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00930_DisparagingThePhantoms/Q00930_DisparagingThePhantoms.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00930_DisparagingThePhantoms/Q00930_DisparagingThePhantoms.java
index 28bb494903..755b411c57 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00930_DisparagingThePhantoms/Q00930_DisparagingThePhantoms.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00930_DisparagingThePhantoms/Q00930_DisparagingThePhantoms.java
@@ -80,7 +80,7 @@ public class Q00930_DisparagingThePhantoms extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00931_MemoriesOfTheWind/Q00931_MemoriesOfTheWind.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00931_MemoriesOfTheWind/Q00931_MemoriesOfTheWind.java
index 5f92dba5cd..31ffff4f32 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00931_MemoriesOfTheWind/Q00931_MemoriesOfTheWind.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00931_MemoriesOfTheWind/Q00931_MemoriesOfTheWind.java
@@ -78,7 +78,7 @@ public class Q00931_MemoriesOfTheWind extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00932_SayhasEnergy/Q00932_SayhasEnergy.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00932_SayhasEnergy/Q00932_SayhasEnergy.java
index 374f7566ba..2682626efb 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00932_SayhasEnergy/Q00932_SayhasEnergy.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00932_SayhasEnergy/Q00932_SayhasEnergy.java
@@ -68,7 +68,7 @@ public class Q00932_SayhasEnergy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java
index 784084e18f..3f3674f408 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java
@@ -79,7 +79,7 @@ public class Q00937_ToReviveTheFishingGuild extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java
index fcaea628f2..14766f9216 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java
@@ -73,7 +73,7 @@ public class Q00938_TheFishermansOtherHobby extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
index aea1e23329..adb2982ac1 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
@@ -48,7 +48,7 @@ public class Q10282_ToTheSeedOfAnnihilation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
index e5310632bd..dc9e9a1de4 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
@@ -51,7 +51,7 @@ public class Q10283_RequestOfIceMerchant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java
index c8822c8a8a..fb0cefa677 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java
@@ -54,7 +54,7 @@ public class Q10284_AcquisitionOfDivineSword extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
index a5a7eaace6..d0294d0369 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
@@ -55,7 +55,7 @@ public class Q10285_MeetingSirra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
index b9a00e8388..94f82457bd 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
@@ -56,7 +56,7 @@ public class Q10286_ReunionWithSirra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
index c072297d38..d98cd117bd 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
@@ -50,7 +50,7 @@ public class Q10287_StoryOfThoseLeft extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
index 8ae5f96306..fe0e24dfe8 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
@@ -54,7 +54,7 @@ public class Q10290_LandDragonConqueror extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
index 093062bde0..554a7ac150 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
@@ -52,7 +52,7 @@ public class Q10291_FireDragonDestroyer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
index 4f42181d0b..38e346b1cd 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
@@ -65,7 +65,7 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java
index 9578509dc1..f80fbdc02b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java
@@ -57,7 +57,7 @@ public class Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java
index 72d0ca7ed5..0ddc585beb 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java
@@ -95,7 +95,7 @@ public class Q10294_SevenSignsToTheMonasteryOfSilence extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java
index 747a9b8e55..fff91fc378 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java
@@ -105,7 +105,7 @@ public class Q10295_SevenSignsSolinasTomb extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java
index e4cf9dbdf6..f350112a68 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java
@@ -60,7 +60,7 @@ public class Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java
index fbcd6311a7..990366217f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java
@@ -50,7 +50,7 @@ public class Q10297_GrandOpeningComeToOurPub extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java
index c7a0f3a27b..44f2de8a14 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java
@@ -71,7 +71,7 @@ public class Q10301_ShadowOfTerrorBlackishRedFog extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10302_UnsettlingShadowAndRumors/Q10302_UnsettlingShadowAndRumors.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10302_UnsettlingShadowAndRumors/Q10302_UnsettlingShadowAndRumors.java
index 35634b2208..0ef255822a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10302_UnsettlingShadowAndRumors/Q10302_UnsettlingShadowAndRumors.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10302_UnsettlingShadowAndRumors/Q10302_UnsettlingShadowAndRumors.java
@@ -51,7 +51,7 @@ public class Q10302_UnsettlingShadowAndRumors extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java
index 075ada8600..77e10de1fd 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java
@@ -75,7 +75,7 @@ public class Q10303_CrossroadsBetweenLightAndDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java
index 66cd2f1407..331fdb471c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java
@@ -75,7 +75,7 @@ public class Q10304_ForForgottenHeroes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java
index 679a617f05..f1df52055e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java
@@ -53,7 +53,7 @@ public class Q10305_UnstoppableFutileEfforts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10306_TheCorruptedLeader/Q10306_TheCorruptedLeader.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10306_TheCorruptedLeader/Q10306_TheCorruptedLeader.java
index 6c34bbf0ec..e400458693 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10306_TheCorruptedLeader/Q10306_TheCorruptedLeader.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10306_TheCorruptedLeader/Q10306_TheCorruptedLeader.java
@@ -59,7 +59,7 @@ public class Q10306_TheCorruptedLeader extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java
index 836ba2610b..b557c0b277 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java
@@ -56,7 +56,7 @@ public class Q10307_TheCorruptedLeaderHisTruth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10310_TwistedCreationTree/Q10310_TwistedCreationTree.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10310_TwistedCreationTree/Q10310_TwistedCreationTree.java
index 9a5f3e93df..6eb9953cdc 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10310_TwistedCreationTree/Q10310_TwistedCreationTree.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10310_TwistedCreationTree/Q10310_TwistedCreationTree.java
@@ -56,7 +56,7 @@ public class Q10310_TwistedCreationTree extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java
index 9e2c35dd09..8971512507 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java
@@ -46,7 +46,7 @@ public class Q10311_PeacefulDaysAreOver extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java
index c7dc807cdf..40c76b9e2f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java
@@ -55,7 +55,7 @@ public class Q10312_AbandonedGodsCreature extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java
index 8f25603bcc..a17c3ebaf6 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java
@@ -49,7 +49,7 @@ public class Q10315_ToThePrisonOfDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java
index 9c05b1f86e..eed57ef8dc 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java
@@ -56,7 +56,7 @@ public class Q10316_UndecayingMemoryOfThePast extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java
index a92657082e..cb331da1d7 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java
@@ -46,7 +46,7 @@ public class Q10317_OrbisWitch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java
index b92fa5339e..d79519ea24 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java
@@ -68,7 +68,7 @@ public class Q10318_DecayingDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java
index 6400c4120b..1638f8129a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java
@@ -58,7 +58,7 @@ public class Q10320_LetsGoToTheCentralSquare extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java
index 8a5ff73015..d256763eca 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java
@@ -47,7 +47,7 @@ public class Q10321_QualificationsOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java
index 4f48c0b900..b374578bd5 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java
@@ -58,7 +58,7 @@ public class Q10330_ToTheRuinsOfYeSagira extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java
index 23babca5f8..6675e7090b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java
@@ -71,7 +71,7 @@ public class Q10331_StartOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10332_ToughRoad/Q10332_ToughRoad.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10332_ToughRoad/Q10332_ToughRoad.java
index 64f3357d45..1251f64744 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10332_ToughRoad/Q10332_ToughRoad.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10332_ToughRoad/Q10332_ToughRoad.java
@@ -57,7 +57,7 @@ public class Q10332_ToughRoad extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java
index 4e03c773a8..6a7dbf118d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java
@@ -65,7 +65,7 @@ public class Q10333_DisappearedSakum extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10334_ReportingTheStatusOfTheWindmillHill/Q10334_ReportingTheStatusOfTheWindmillHill.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10334_ReportingTheStatusOfTheWindmillHill/Q10334_ReportingTheStatusOfTheWindmillHill.java
index 48650b1ce0..da883a8f14 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10334_ReportingTheStatusOfTheWindmillHill/Q10334_ReportingTheStatusOfTheWindmillHill.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10334_ReportingTheStatusOfTheWindmillHill/Q10334_ReportingTheStatusOfTheWindmillHill.java
@@ -49,7 +49,7 @@ public class Q10334_ReportingTheStatusOfTheWindmillHill extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java
index 3e39536a87..46e88abfab 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java
@@ -58,7 +58,7 @@ public class Q10335_RequestToFindSakum extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10336_DividedSakumKanilov/Q10336_DividedSakumKanilov.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10336_DividedSakumKanilov/Q10336_DividedSakumKanilov.java
index aa5e5614ce..488bc68fca 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10336_DividedSakumKanilov/Q10336_DividedSakumKanilov.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10336_DividedSakumKanilov/Q10336_DividedSakumKanilov.java
@@ -56,7 +56,7 @@ public class Q10336_DividedSakumKanilov extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java
index f2e21d8f93..19c5ac1817 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java
@@ -58,7 +58,7 @@ public class Q10337_SakumsImpact extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
index edc0bdf638..b92033f3e6 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
@@ -66,7 +66,7 @@ public class Q10338_SeizeYourDestiny extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java
index 9bb47bafb8..718b70bbcd 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java
@@ -48,7 +48,7 @@ public class Q10341_DayOfDestinyHumansFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10341_DayOfDestinyHumansFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java
index 715453f3bb..071deb3562 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java
@@ -48,7 +48,7 @@ public class Q10342_DayOfDestinyElvenFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10342_DayOfDestinyElvenFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java
index b958ae1683..5701012e2c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java
@@ -48,7 +48,7 @@ public class Q10343_DayOfDestinyDarkElfsFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10343_DayOfDestinyDarkElfsFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java
index 3a9540d6f0..ff5519a3f1 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java
@@ -48,7 +48,7 @@ public class Q10344_DayOfDestinyOrcsFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10344_DayOfDestinyOrcsFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java
index f0b38f0d8f..9ad485a695 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java
@@ -48,7 +48,7 @@ public class Q10345_DayOfDestinyDwarfsFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10345_DayOfDestinyDwarfsFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java
index 0f3195f574..5690e3622f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java
@@ -48,7 +48,7 @@ public class Q10346_DayOfDestinyKamaelsFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10346_DayOfDestinyKamaelsFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java
index 2874c31889..6a7bf0c265 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java
@@ -51,7 +51,7 @@ public class Q10351_OwnerOfHall extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java
index 1175e2cdd1..18cd204fc0 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java
@@ -94,7 +94,7 @@ public class Q10353_CertificationOfValue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java
index ea20f5fe52..c1723c3065 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java
@@ -51,7 +51,7 @@ public class Q10354_ResurrectedOwnerOfHall extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10355_BlacksmithsSoul1/Q10355_BlacksmithsSoul1.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10355_BlacksmithsSoul1/Q10355_BlacksmithsSoul1.java
index 16e5c07fbf..28629cd353 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10355_BlacksmithsSoul1/Q10355_BlacksmithsSoul1.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10355_BlacksmithsSoul1/Q10355_BlacksmithsSoul1.java
@@ -73,7 +73,7 @@ public class Q10355_BlacksmithsSoul1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10356_BlacksmithsSoul2/Q10356_BlacksmithsSoul2.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10356_BlacksmithsSoul2/Q10356_BlacksmithsSoul2.java
index 34ddbeb550..92d621ebe8 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10356_BlacksmithsSoul2/Q10356_BlacksmithsSoul2.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10356_BlacksmithsSoul2/Q10356_BlacksmithsSoul2.java
@@ -65,7 +65,7 @@ public class Q10356_BlacksmithsSoul2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java
index d180f6cc32..3f55b11c38 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java
@@ -59,7 +59,7 @@ public class Q10358_DividedSakumPoslof extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10359_TracesOfEvil/Q10359_TracesOfEvil.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10359_TracesOfEvil/Q10359_TracesOfEvil.java
index 06b030511a..be3a0cd2a8 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10359_TracesOfEvil/Q10359_TracesOfEvil.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10359_TracesOfEvil/Q10359_TracesOfEvil.java
@@ -69,7 +69,7 @@ public class Q10359_TracesOfEvil extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java
index 9f01a049cf..56eaa948f2 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java
@@ -89,7 +89,7 @@ public class Q10360_CertificationOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java
index de64b241ea..8080af8df8 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java
@@ -59,7 +59,7 @@ public class Q10362_CertificationOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java
index 52a0d77960..e7071d4011 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java
@@ -61,7 +61,7 @@ public class Q10363_RequestOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java
index a3f167bb3b..2cad7041b8 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java
@@ -59,7 +59,7 @@ public class Q10364_ObligationsOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/Q10365_ForTheSearchdogKing.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/Q10365_ForTheSearchdogKing.java
index e121324c80..fa5575aaba 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/Q10365_ForTheSearchdogKing.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/Q10365_ForTheSearchdogKing.java
@@ -57,7 +57,7 @@ public class Q10365_ForTheSearchdogKing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java
index affa7852ba..f4baa88fde 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java
@@ -62,7 +62,7 @@ public class Q10366_ReportOnTheSituationAtTheRuins extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10369_NoblesseSoulTesting/Q10369_NoblesseSoulTesting.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10369_NoblesseSoulTesting/Q10369_NoblesseSoulTesting.java
index 236fe0146e..511af97acc 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10369_NoblesseSoulTesting/Q10369_NoblesseSoulTesting.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10369_NoblesseSoulTesting/Q10369_NoblesseSoulTesting.java
@@ -122,11 +122,11 @@ public class Q10369_NoblesseSoulTesting extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player == null)
 		{
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
@@ -321,7 +321,7 @@ public class Q10369_NoblesseSoulTesting extends Quest
 									final Quest instance = QuestManager.getInstance().getQuest(EvasHiddenSpace.class.getSimpleName());
 									if (instance != null)
 									{
-										instance.onAdvEvent("enterInstance", npc, player);
+										instance.onEvent("enterInstance", npc, player);
 									}
 									htmltext = null;
 									break;
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10373_ExploringTheDimensionSealingTheDimension/Q10373_ExploringTheDimensionSealingTheDimension.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10373_ExploringTheDimensionSealingTheDimension/Q10373_ExploringTheDimensionSealingTheDimension.java
index 7056e8b72a..425b0c979d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10373_ExploringTheDimensionSealingTheDimension/Q10373_ExploringTheDimensionSealingTheDimension.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10373_ExploringTheDimensionSealingTheDimension/Q10373_ExploringTheDimensionSealingTheDimension.java
@@ -44,7 +44,7 @@ public class Q10373_ExploringTheDimensionSealingTheDimension extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java
index 255a3ce354..6a38565c9f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java
@@ -59,7 +59,7 @@ public class Q10377_TheInvadedExecutionGrounds extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10378_WeedingWork/Q10378_WeedingWork.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10378_WeedingWork/Q10378_WeedingWork.java
index e55058d9a5..cc498e2821 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10378_WeedingWork/Q10378_WeedingWork.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10378_WeedingWork/Q10378_WeedingWork.java
@@ -57,7 +57,7 @@ public class Q10378_WeedingWork extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10379_AnUninvitedGuest/Q10379_AnUninvitedGuest.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10379_AnUninvitedGuest/Q10379_AnUninvitedGuest.java
index 8502410bee..e227de28c7 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10379_AnUninvitedGuest/Q10379_AnUninvitedGuest.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10379_AnUninvitedGuest/Q10379_AnUninvitedGuest.java
@@ -69,7 +69,7 @@ public class Q10379_AnUninvitedGuest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10380_TheExecutionersExecution/Q10380_TheExecutionersExecution.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10380_TheExecutionersExecution/Q10380_TheExecutionersExecution.java
index 7b59d40bcb..5b4910c43e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10380_TheExecutionersExecution/Q10380_TheExecutionersExecution.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10380_TheExecutionersExecution/Q10380_TheExecutionersExecution.java
@@ -67,7 +67,7 @@ public class Q10380_TheExecutionersExecution extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java
index 3fdb1d2625..1a0550ce7a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java
@@ -49,7 +49,7 @@ public class Q10381_ToTheSeedOfHellfire extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10382_DayOfLiberation/Q10382_DayOfLiberation.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10382_DayOfLiberation/Q10382_DayOfLiberation.java
index 29de22db80..bf7a89cbc4 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10382_DayOfLiberation/Q10382_DayOfLiberation.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10382_DayOfLiberation/Q10382_DayOfLiberation.java
@@ -48,7 +48,7 @@ public class Q10382_DayOfLiberation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java
index 5a50c186ec..97fd290cdb 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java
@@ -61,7 +61,7 @@ public class Q10383_FergasonsOffer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java
index 11188fdada..9aba58dd1e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java
@@ -52,7 +52,7 @@ public class Q10384_AnAudienceWithTauti extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10385_RedThreadOfFate/Q10385_RedThreadOfFate.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10385_RedThreadOfFate/Q10385_RedThreadOfFate.java
index e16cde08bf..1a97e6d7de 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10385_RedThreadOfFate/Q10385_RedThreadOfFate.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10385_RedThreadOfFate/Q10385_RedThreadOfFate.java
@@ -120,7 +120,7 @@ public class Q10385_RedThreadOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -756,7 +756,7 @@ public class Q10385_RedThreadOfFate extends Quest
 						final Quest instance = QuestManager.getInstance().getQuest(TalkingIslandPast.class.getSimpleName());
 						if (instance != null)
 						{
-							instance.onAdvEvent("enterInstance", npc, player);
+							instance.onEvent("enterInstance", npc, player);
 						}
 					}
 					break;
@@ -844,7 +844,7 @@ public class Q10385_RedThreadOfFate extends Quest
 							final Quest instance = QuestManager.getInstance().getQuest(TalkingIslandPast.class.getSimpleName());
 							if (instance != null)
 							{
-								instance.onAdvEvent("enterInstance", npc, player);
+								instance.onEvent("enterInstance", npc, player);
 							}
 							break;
 						}
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10386_MysteriousJourney/Q10386_MysteriousJourney.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10386_MysteriousJourney/Q10386_MysteriousJourney.java
index 199681b2fa..51a014c8bf 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10386_MysteriousJourney/Q10386_MysteriousJourney.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10386_MysteriousJourney/Q10386_MysteriousJourney.java
@@ -50,7 +50,7 @@ public class Q10386_MysteriousJourney extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10387_SoullessOne/Q10387_SoullessOne.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10387_SoullessOne/Q10387_SoullessOne.java
index 3b4e70d070..90284f0de9 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10387_SoullessOne/Q10387_SoullessOne.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10387_SoullessOne/Q10387_SoullessOne.java
@@ -54,7 +54,7 @@ public class Q10387_SoullessOne extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java
index 174ea1a300..e5a8517a69 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java
@@ -46,7 +46,7 @@ public class Q10388_ConspiracyBehindDoor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java
index 6d60016a06..619cf89fa5 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java
@@ -66,7 +66,7 @@ public class Q10389_TheVoiceOfAuthority extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10390_KekropusLetter/Q10390_KekropusLetter.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10390_KekropusLetter/Q10390_KekropusLetter.java
index 267f3c669f..d55e74b0a5 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10390_KekropusLetter/Q10390_KekropusLetter.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10390_KekropusLetter/Q10390_KekropusLetter.java
@@ -67,7 +67,7 @@ public class Q10390_KekropusLetter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10391_ASuspiciousHelper/Q10391_ASuspiciousHelper.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10391_ASuspiciousHelper/Q10391_ASuspiciousHelper.java
index 52f96af258..e9ad07b210 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10391_ASuspiciousHelper/Q10391_ASuspiciousHelper.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10391_ASuspiciousHelper/Q10391_ASuspiciousHelper.java
@@ -51,7 +51,7 @@ public class Q10391_ASuspiciousHelper extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10392_FailureAndItsConsequences/Q10392_FailureAndItsConsequences.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10392_FailureAndItsConsequences/Q10392_FailureAndItsConsequences.java
index bf10758dda..7fb2e89ae5 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10392_FailureAndItsConsequences/Q10392_FailureAndItsConsequences.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10392_FailureAndItsConsequences/Q10392_FailureAndItsConsequences.java
@@ -59,7 +59,7 @@ public class Q10392_FailureAndItsConsequences extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10393_KekropusLetterAClueCompleted/Q10393_KekropusLetterAClueCompleted.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10393_KekropusLetterAClueCompleted/Q10393_KekropusLetterAClueCompleted.java
index 8c98c0dbf8..b1f8d64e2e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10393_KekropusLetterAClueCompleted/Q10393_KekropusLetterAClueCompleted.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10393_KekropusLetterAClueCompleted/Q10393_KekropusLetterAClueCompleted.java
@@ -58,7 +58,7 @@ public class Q10393_KekropusLetterAClueCompleted extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java
index 4156426b80..ac75f9b6c9 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java
@@ -54,7 +54,7 @@ public class Q10394_MutualBenefit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java
index 2475b9b253..2602e8faa6 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java
@@ -65,7 +65,7 @@ public class Q10395_NotATraitor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player, false);
 		if (st == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10401_KekropusLetterDecodingTheBadge/Q10401_KekropusLetterDecodingTheBadge.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10401_KekropusLetterDecodingTheBadge/Q10401_KekropusLetterDecodingTheBadge.java
index f9a1f2697f..c80d7c0959 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10401_KekropusLetterDecodingTheBadge/Q10401_KekropusLetterDecodingTheBadge.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10401_KekropusLetterDecodingTheBadge/Q10401_KekropusLetterDecodingTheBadge.java
@@ -58,7 +58,7 @@ public class Q10401_KekropusLetterDecodingTheBadge extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java
index e94bd7c4f5..a510527418 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java
@@ -63,7 +63,7 @@ public class Q10402_NowhereToTurn extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10403_TheGuardianGiant/Q10403_TheGuardianGiant.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10403_TheGuardianGiant/Q10403_TheGuardianGiant.java
index 94c094f26e..05712622f1 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10403_TheGuardianGiant/Q10403_TheGuardianGiant.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10403_TheGuardianGiant/Q10403_TheGuardianGiant.java
@@ -63,7 +63,7 @@ public class Q10403_TheGuardianGiant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10404_KekropusLetterAHiddenMeaning/Q10404_KekropusLetterAHiddenMeaning.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10404_KekropusLetterAHiddenMeaning/Q10404_KekropusLetterAHiddenMeaning.java
index 0fc3f84dab..5539f5f591 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10404_KekropusLetterAHiddenMeaning/Q10404_KekropusLetterAHiddenMeaning.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10404_KekropusLetterAHiddenMeaning/Q10404_KekropusLetterAHiddenMeaning.java
@@ -58,7 +58,7 @@ public class Q10404_KekropusLetterAHiddenMeaning extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10405_KartiasSeed/Q10405_KartiasSeed.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10405_KartiasSeed/Q10405_KartiasSeed.java
index 42291ddcaf..ef7e7396db 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10405_KartiasSeed/Q10405_KartiasSeed.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10405_KartiasSeed/Q10405_KartiasSeed.java
@@ -66,7 +66,7 @@ public class Q10405_KartiasSeed extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java
index 327c51112a..f4ede19821 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java
@@ -55,7 +55,7 @@ public class Q10406_BeforeDarknessBearsFruit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10408_KekropusLetterTheSwampOfScreams/Q10408_KekropusLetterTheSwampOfScreams.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10408_KekropusLetterTheSwampOfScreams/Q10408_KekropusLetterTheSwampOfScreams.java
index 85a688fa3e..26e516a179 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10408_KekropusLetterTheSwampOfScreams/Q10408_KekropusLetterTheSwampOfScreams.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10408_KekropusLetterTheSwampOfScreams/Q10408_KekropusLetterTheSwampOfScreams.java
@@ -58,7 +58,7 @@ public class Q10408_KekropusLetterTheSwampOfScreams extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java
index f5af9f664d..dce8f9986b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java
@@ -48,7 +48,7 @@ public class Q10409_ASuspiciousVagabondInTheSwamp extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java
index 77b3ca56b2..49f9797292 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java
@@ -73,7 +73,7 @@ public class Q10410_EmbryoInTheSwampOfScreams extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10411_KekropusLetterTheForestOfTheDead/Q10411_KekropusLetterTheForestOfTheDead.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10411_KekropusLetterTheForestOfTheDead/Q10411_KekropusLetterTheForestOfTheDead.java
index 1ff743da57..c5aeebf51e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10411_KekropusLetterTheForestOfTheDead/Q10411_KekropusLetterTheForestOfTheDead.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10411_KekropusLetterTheForestOfTheDead/Q10411_KekropusLetterTheForestOfTheDead.java
@@ -58,7 +58,7 @@ public class Q10411_KekropusLetterTheForestOfTheDead extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java
index 2bcc230a31..79c93ddebe 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java
@@ -48,7 +48,7 @@ public class Q10412_ASuspiciousVagabondInTheForest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java
index 368315d6d6..1260efb4f7 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java
@@ -102,7 +102,7 @@ public class Q10413_EmbryoInTheForestOfTheDead extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10414_KekropusLetterWithCourage/Q10414_KekropusLetterWithCourage.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10414_KekropusLetterWithCourage/Q10414_KekropusLetterWithCourage.java
index 4b6fcca87c..13b925da20 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10414_KekropusLetterWithCourage/Q10414_KekropusLetterWithCourage.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10414_KekropusLetterWithCourage/Q10414_KekropusLetterWithCourage.java
@@ -58,7 +58,7 @@ public class Q10414_KekropusLetterWithCourage extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10415_KekropusLetterWithWisdom/Q10415_KekropusLetterWithWisdom.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10415_KekropusLetterWithWisdom/Q10415_KekropusLetterWithWisdom.java
index 299f20a84e..95dd7f85c1 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10415_KekropusLetterWithWisdom/Q10415_KekropusLetterWithWisdom.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10415_KekropusLetterWithWisdom/Q10415_KekropusLetterWithWisdom.java
@@ -59,7 +59,7 @@ public class Q10415_KekropusLetterWithWisdom extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java
index 59961329d7..3436179c13 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java
@@ -67,7 +67,7 @@ public class Q10416_InSearchOfTheEyeOfArgos extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java
index cd8a331434..601dddd028 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java
@@ -72,7 +72,7 @@ public class Q10417_DaimonTheWhiteEyed extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10418_TheImmortalPirateKing/Q10418_TheImmortalPirateKing.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10418_TheImmortalPirateKing/Q10418_TheImmortalPirateKing.java
index 239ef8a3a7..d6d93746c2 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10418_TheImmortalPirateKing/Q10418_TheImmortalPirateKing.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10418_TheImmortalPirateKing/Q10418_TheImmortalPirateKing.java
@@ -48,7 +48,7 @@ public class Q10418_TheImmortalPirateKing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10419_KekropusLetterKampfsWhereabouts/Q10419_KekropusLetterKampfsWhereabouts.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10419_KekropusLetterKampfsWhereabouts/Q10419_KekropusLetterKampfsWhereabouts.java
index 010fdc756a..86053d8d12 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10419_KekropusLetterKampfsWhereabouts/Q10419_KekropusLetterKampfsWhereabouts.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10419_KekropusLetterKampfsWhereabouts/Q10419_KekropusLetterKampfsWhereabouts.java
@@ -58,7 +58,7 @@ public class Q10419_KekropusLetterKampfsWhereabouts extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10420_TheVarkaSilenosSupporters/Q10420_TheVarkaSilenosSupporters.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10420_TheVarkaSilenosSupporters/Q10420_TheVarkaSilenosSupporters.java
index d7bd1e9006..2e9aeebde8 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10420_TheVarkaSilenosSupporters/Q10420_TheVarkaSilenosSupporters.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10420_TheVarkaSilenosSupporters/Q10420_TheVarkaSilenosSupporters.java
@@ -75,7 +75,7 @@ public class Q10420_TheVarkaSilenosSupporters extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10421_AssassinationOfTheVarkaSilenosCommander/Q10421_AssassinationOfTheVarkaSilenosCommander.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10421_AssassinationOfTheVarkaSilenosCommander/Q10421_AssassinationOfTheVarkaSilenosCommander.java
index b466969c97..2d6adc18da 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10421_AssassinationOfTheVarkaSilenosCommander/Q10421_AssassinationOfTheVarkaSilenosCommander.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10421_AssassinationOfTheVarkaSilenosCommander/Q10421_AssassinationOfTheVarkaSilenosCommander.java
@@ -51,7 +51,7 @@ public class Q10421_AssassinationOfTheVarkaSilenosCommander extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java
index 080ce0ebad..d68989ef8a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java
@@ -55,7 +55,7 @@ public class Q10422_AssassinationOfTheVarkaSilenosChief extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java
index b8823b8e7a..dc76dc4f94 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java
@@ -88,7 +88,7 @@ public class Q10423_EmbryoStrongholdRaid extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10424_KekropusLetterBelosWhereabouts/Q10424_KekropusLetterBelosWhereabouts.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10424_KekropusLetterBelosWhereabouts/Q10424_KekropusLetterBelosWhereabouts.java
index 071af1eb3d..1f7aa6f81a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10424_KekropusLetterBelosWhereabouts/Q10424_KekropusLetterBelosWhereabouts.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10424_KekropusLetterBelosWhereabouts/Q10424_KekropusLetterBelosWhereabouts.java
@@ -58,7 +58,7 @@ public class Q10424_KekropusLetterBelosWhereabouts extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10425_TheKetraOrcSupporters/Q10425_TheKetraOrcSupporters.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10425_TheKetraOrcSupporters/Q10425_TheKetraOrcSupporters.java
index 2fd6da992d..ae30164989 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10425_TheKetraOrcSupporters/Q10425_TheKetraOrcSupporters.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10425_TheKetraOrcSupporters/Q10425_TheKetraOrcSupporters.java
@@ -78,7 +78,7 @@ public class Q10425_TheKetraOrcSupporters extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10426_AssassinationOfTheKetraOrcCommander/Q10426_AssassinationOfTheKetraOrcCommander.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10426_AssassinationOfTheKetraOrcCommander/Q10426_AssassinationOfTheKetraOrcCommander.java
index 094dcd36c3..1ed6ed4388 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10426_AssassinationOfTheKetraOrcCommander/Q10426_AssassinationOfTheKetraOrcCommander.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10426_AssassinationOfTheKetraOrcCommander/Q10426_AssassinationOfTheKetraOrcCommander.java
@@ -53,7 +53,7 @@ public class Q10426_AssassinationOfTheKetraOrcCommander extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java
index ccd9df0ad1..56f5951419 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java
@@ -55,7 +55,7 @@ public class Q10427_AssassinationOfTheKetraOrcChief extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10445_AnImpendingThreat/Q10445_AnImpendingThreat.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10445_AnImpendingThreat/Q10445_AnImpendingThreat.java
index c78d904936..dac215a5b1 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10445_AnImpendingThreat/Q10445_AnImpendingThreat.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10445_AnImpendingThreat/Q10445_AnImpendingThreat.java
@@ -53,7 +53,7 @@ public class Q10445_AnImpendingThreat extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java
index bb70f87faa..4649f7548e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java
@@ -58,7 +58,7 @@ public class Q10446_HitAndRun extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java
index c49b98c92d..c173bf24b6 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java
@@ -74,7 +74,7 @@ public class Q10447_TimingIsEverything extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10450_ADarkAmbition/Q10450_ADarkAmbition.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10450_ADarkAmbition/Q10450_ADarkAmbition.java
index c3f232b499..8f085a2197 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10450_ADarkAmbition/Q10450_ADarkAmbition.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10450_ADarkAmbition/Q10450_ADarkAmbition.java
@@ -49,7 +49,7 @@ public class Q10450_ADarkAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10453_StoppingTheWindDragon/Q10453_StoppingTheWindDragon.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10453_StoppingTheWindDragon/Q10453_StoppingTheWindDragon.java
index 3b567c5d04..6a74beb026 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10453_StoppingTheWindDragon/Q10453_StoppingTheWindDragon.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10453_StoppingTheWindDragon/Q10453_StoppingTheWindDragon.java
@@ -46,7 +46,7 @@ public class Q10453_StoppingTheWindDragon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java
index 133390e3ed..b58a5b6e94 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java
@@ -49,7 +49,7 @@ public class Q10454_FinalEmbryoApostle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java
index b6cec7570e..7268e0de45 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java
@@ -50,7 +50,7 @@ public class Q10455_ElikiasLetter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10456_OperationRescue/Q10456_OperationRescue.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10456_OperationRescue/Q10456_OperationRescue.java
index f38ae9e388..7da35bc35f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10456_OperationRescue/Q10456_OperationRescue.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10456_OperationRescue/Q10456_OperationRescue.java
@@ -66,7 +66,7 @@ public class Q10456_OperationRescue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10457_KefensisIllusion/Q10457_KefensisIllusion.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10457_KefensisIllusion/Q10457_KefensisIllusion.java
index 907cca5e98..32d56eba4b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10457_KefensisIllusion/Q10457_KefensisIllusion.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10457_KefensisIllusion/Q10457_KefensisIllusion.java
@@ -65,7 +65,7 @@ public class Q10457_KefensisIllusion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java
index fc5b941631..11718fe3dc 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java
@@ -54,7 +54,7 @@ public class Q10459_ASickAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10460_ReturnOfTheAlligatorHunter/Q10460_ReturnOfTheAlligatorHunter.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10460_ReturnOfTheAlligatorHunter/Q10460_ReturnOfTheAlligatorHunter.java
index e8890d2fdb..5220e36a95 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10460_ReturnOfTheAlligatorHunter/Q10460_ReturnOfTheAlligatorHunter.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10460_ReturnOfTheAlligatorHunter/Q10460_ReturnOfTheAlligatorHunter.java
@@ -60,7 +60,7 @@ public class Q10460_ReturnOfTheAlligatorHunter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10472_WindsOfFateEncroachingShadows/Q10472_WindsOfFateEncroachingShadows.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10472_WindsOfFateEncroachingShadows/Q10472_WindsOfFateEncroachingShadows.java
index c4e70d36b7..a4733734be 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10472_WindsOfFateEncroachingShadows/Q10472_WindsOfFateEncroachingShadows.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10472_WindsOfFateEncroachingShadows/Q10472_WindsOfFateEncroachingShadows.java
@@ -109,7 +109,7 @@ public class Q10472_WindsOfFateEncroachingShadows extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
index bacbb7058b..ad79a5980b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
@@ -73,7 +73,7 @@ public class Q10501_ZakenEmbroideredSoulCloak extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (player.getLevel() >= MIN_LEVEL) && event.equals("32612-04.html"))
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
index d1678a7601..38f4514197 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
@@ -73,7 +73,7 @@ public class Q10502_FreyaEmbroideredSoulCloak extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (player.getLevel() >= MIN_LEVEL) && event.equals("32612-04.html"))
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
index 224940ecd9..08aa62d532 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
@@ -74,7 +74,7 @@ public class Q10503_FrintezzaEmbroideredSoulCloak extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (player.getLevel() >= MIN_LEVEL) && event.equals("32612-04.html"))
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java
index b150a02b38..d81d398014 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java
@@ -66,7 +66,7 @@ public class Q10504_JewelOfAntharas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java
index 0c9360d9b7..e598298776 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java
@@ -66,7 +66,7 @@ public class Q10505_JewelOfValakas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java
index a6a457bcfa..876a5665b7 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java
@@ -59,7 +59,7 @@ public class Q10521_QueenNavarisLetterVarkaSilenosBarracks extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10522_TheDarkSecretOfVarkaSilenos/Q10522_TheDarkSecretOfVarkaSilenos.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10522_TheDarkSecretOfVarkaSilenos/Q10522_TheDarkSecretOfVarkaSilenos.java
index 703a1ac8bc..9564458b27 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10522_TheDarkSecretOfVarkaSilenos/Q10522_TheDarkSecretOfVarkaSilenos.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10522_TheDarkSecretOfVarkaSilenos/Q10522_TheDarkSecretOfVarkaSilenos.java
@@ -73,7 +73,7 @@ public class Q10522_TheDarkSecretOfVarkaSilenos extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10523_TheAssassinationOfTheVarkaSilenosCommander/Q10523_TheAssassinationOfTheVarkaSilenosCommander.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10523_TheAssassinationOfTheVarkaSilenosCommander/Q10523_TheAssassinationOfTheVarkaSilenosCommander.java
index bc88c09827..66a58918c5 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10523_TheAssassinationOfTheVarkaSilenosCommander/Q10523_TheAssassinationOfTheVarkaSilenosCommander.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10523_TheAssassinationOfTheVarkaSilenosCommander/Q10523_TheAssassinationOfTheVarkaSilenosCommander.java
@@ -55,7 +55,7 @@ public class Q10523_TheAssassinationOfTheVarkaSilenosCommander extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief.java
index 73761de539..f501b9bbee 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief.java
@@ -58,7 +58,7 @@ public class Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief extends Ques
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10525_QueenNavarisLetterKetraOrcOutpost/Q10525_QueenNavarisLetterKetraOrcOutpost.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10525_QueenNavarisLetterKetraOrcOutpost/Q10525_QueenNavarisLetterKetraOrcOutpost.java
index c6f3ba7642..facbaa4be9 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10525_QueenNavarisLetterKetraOrcOutpost/Q10525_QueenNavarisLetterKetraOrcOutpost.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10525_QueenNavarisLetterKetraOrcOutpost/Q10525_QueenNavarisLetterKetraOrcOutpost.java
@@ -58,7 +58,7 @@ public class Q10525_QueenNavarisLetterKetraOrcOutpost extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10526_TheDarkSecretOfTheKetraOrcs/Q10526_TheDarkSecretOfTheKetraOrcs.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10526_TheDarkSecretOfTheKetraOrcs/Q10526_TheDarkSecretOfTheKetraOrcs.java
index 95b5d6c43d..038e8661b8 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10526_TheDarkSecretOfTheKetraOrcs/Q10526_TheDarkSecretOfTheKetraOrcs.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10526_TheDarkSecretOfTheKetraOrcs/Q10526_TheDarkSecretOfTheKetraOrcs.java
@@ -78,7 +78,7 @@ public class Q10526_TheDarkSecretOfTheKetraOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10527_TheAssassinationOfTheKetraOrcCommander/Q10527_TheAssassinationOfTheKetraOrcCommander.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10527_TheAssassinationOfTheKetraOrcCommander/Q10527_TheAssassinationOfTheKetraOrcCommander.java
index 7cca4304fb..16beb3437e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10527_TheAssassinationOfTheKetraOrcCommander/Q10527_TheAssassinationOfTheKetraOrcCommander.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10527_TheAssassinationOfTheKetraOrcCommander/Q10527_TheAssassinationOfTheKetraOrcCommander.java
@@ -56,7 +56,7 @@ public class Q10527_TheAssassinationOfTheKetraOrcCommander extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10528_TheAssassinationOfTheKetraOrcChief/Q10528_TheAssassinationOfTheKetraOrcChief.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10528_TheAssassinationOfTheKetraOrcChief/Q10528_TheAssassinationOfTheKetraOrcChief.java
index 02307626f3..713ac08316 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10528_TheAssassinationOfTheKetraOrcChief/Q10528_TheAssassinationOfTheKetraOrcChief.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10528_TheAssassinationOfTheKetraOrcChief/Q10528_TheAssassinationOfTheKetraOrcChief.java
@@ -59,7 +59,7 @@ public class Q10528_TheAssassinationOfTheKetraOrcChief extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10529_IvoryTowersResearchSeaOfSporesJournal/Q10529_IvoryTowersResearchSeaOfSporesJournal.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10529_IvoryTowersResearchSeaOfSporesJournal/Q10529_IvoryTowersResearchSeaOfSporesJournal.java
index 48755350a4..ffe670f3ff 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10529_IvoryTowersResearchSeaOfSporesJournal/Q10529_IvoryTowersResearchSeaOfSporesJournal.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10529_IvoryTowersResearchSeaOfSporesJournal/Q10529_IvoryTowersResearchSeaOfSporesJournal.java
@@ -75,7 +75,7 @@ public final class Q10529_IvoryTowersResearchSeaOfSporesJournal extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10530_KekropusLetterTheDragonsTransition/Q10530_KekropusLetterTheDragonsTransition.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10530_KekropusLetterTheDragonsTransition/Q10530_KekropusLetterTheDragonsTransition.java
index 9db51e963f..1ab3652531 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10530_KekropusLetterTheDragonsTransition/Q10530_KekropusLetterTheDragonsTransition.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10530_KekropusLetterTheDragonsTransition/Q10530_KekropusLetterTheDragonsTransition.java
@@ -61,7 +61,7 @@ public class Q10530_KekropusLetterTheDragonsTransition extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10531_OddHappeningsAtDragonValley/Q10531_OddHappeningsAtDragonValley.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10531_OddHappeningsAtDragonValley/Q10531_OddHappeningsAtDragonValley.java
index 0b6cb61f4c..b366a824aa 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10531_OddHappeningsAtDragonValley/Q10531_OddHappeningsAtDragonValley.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10531_OddHappeningsAtDragonValley/Q10531_OddHappeningsAtDragonValley.java
@@ -72,7 +72,7 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java
index f8f9d1af2c..c67fbd555d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java
@@ -68,7 +68,7 @@ public class Q10532_UncoveringTheConspiracy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10534_HatchlingResearch/Q10534_HatchlingResearch.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10534_HatchlingResearch/Q10534_HatchlingResearch.java
index ca8ea7ebfa..32a839c147 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10534_HatchlingResearch/Q10534_HatchlingResearch.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10534_HatchlingResearch/Q10534_HatchlingResearch.java
@@ -52,7 +52,7 @@ public class Q10534_HatchlingResearch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10537_KamaelDisarray/Q10537_KamaelDisarray.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10537_KamaelDisarray/Q10537_KamaelDisarray.java
index 3f641802c2..63def42cfb 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10537_KamaelDisarray/Q10537_KamaelDisarray.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10537_KamaelDisarray/Q10537_KamaelDisarray.java
@@ -82,7 +82,7 @@ public class Q10537_KamaelDisarray extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10538_GiantsEvolution/Q10538_GiantsEvolution.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10538_GiantsEvolution/Q10538_GiantsEvolution.java
index 80fcb4b8a5..268d03297d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10538_GiantsEvolution/Q10538_GiantsEvolution.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10538_GiantsEvolution/Q10538_GiantsEvolution.java
@@ -60,7 +60,7 @@ public class Q10538_GiantsEvolution extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10539_EnergySupplyCutoffPlan/Q10539_EnergySupplyCutoffPlan.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10539_EnergySupplyCutoffPlan/Q10539_EnergySupplyCutoffPlan.java
index f97a6b1c21..4be23c454e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10539_EnergySupplyCutoffPlan/Q10539_EnergySupplyCutoffPlan.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10539_EnergySupplyCutoffPlan/Q10539_EnergySupplyCutoffPlan.java
@@ -61,7 +61,7 @@ public class Q10539_EnergySupplyCutoffPlan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10540_ThwartingMimirsPlan/Q10540_ThwartingMimirsPlan.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10540_ThwartingMimirsPlan/Q10540_ThwartingMimirsPlan.java
index aa8e864fb4..6462015e4a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10540_ThwartingMimirsPlan/Q10540_ThwartingMimirsPlan.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10540_ThwartingMimirsPlan/Q10540_ThwartingMimirsPlan.java
@@ -49,7 +49,7 @@ public class Q10540_ThwartingMimirsPlan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java
index d8806aaa46..2399b6f6f5 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java
@@ -76,7 +76,7 @@ public class Q10541_TrainLikeTheRealThing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java
index ac33019628..829bfe060e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java
@@ -64,7 +64,7 @@ public class Q10542_SearchingForNewPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java
index 5258465884..75e34abc11 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java
@@ -61,7 +61,7 @@ public class Q10543_SheddingWeight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10544_SeekerSupplies/Q10544_SeekerSupplies.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10544_SeekerSupplies/Q10544_SeekerSupplies.java
index 3c2f520f5b..02fcd6edca 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10544_SeekerSupplies/Q10544_SeekerSupplies.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10544_SeekerSupplies/Q10544_SeekerSupplies.java
@@ -71,7 +71,7 @@ public class Q10544_SeekerSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10552_ChallengeBalthusKnight/Q10552_ChallengeBalthusKnight.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10552_ChallengeBalthusKnight/Q10552_ChallengeBalthusKnight.java
index 8464944096..bf629ee65a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10552_ChallengeBalthusKnight/Q10552_ChallengeBalthusKnight.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10552_ChallengeBalthusKnight/Q10552_ChallengeBalthusKnight.java
@@ -68,7 +68,7 @@ public final class Q10552_ChallengeBalthusKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
@@ -87,7 +87,7 @@ public final class Q10552_ChallengeBalthusKnight extends Quest
 			final Quest instance = QuestManager.getInstance().getQuest(HatchlingNest.class.getSimpleName());
 			if (instance != null)
 			{
-				instance.onAdvEvent("enterInstance", npc, player);
+				instance.onEvent("enterInstance", npc, player);
 			}
 			htmltext = "tarti_balthus_q10552_03.htm";
 		}
@@ -125,7 +125,7 @@ public final class Q10552_ChallengeBalthusKnight extends Quest
 							final Quest instance = QuestManager.getInstance().getQuest(HatchlingNest.class.getSimpleName());
 							if (instance != null)
 							{
-								instance.onAdvEvent("enterInstance", npc, player);
+								instance.onEvent("enterInstance", npc, player);
 							}
 							htmltext = "tarti_balthus_q10552_04.htm";
 							break;
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10553_WhatMattersMoreThanAbility/Q10553_WhatMattersMoreThanAbility.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10553_WhatMattersMoreThanAbility/Q10553_WhatMattersMoreThanAbility.java
index f6b7a9381e..3583d34894 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10553_WhatMattersMoreThanAbility/Q10553_WhatMattersMoreThanAbility.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10553_WhatMattersMoreThanAbility/Q10553_WhatMattersMoreThanAbility.java
@@ -67,7 +67,7 @@ public final class Q10553_WhatMattersMoreThanAbility extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
@@ -181,7 +181,7 @@ public final class Q10553_WhatMattersMoreThanAbility extends Quest
 					final Quest instance = QuestManager.getInstance().getQuest(HatchlingCage.class.getSimpleName());
 					if (instance != null)
 					{
-						instance.onAdvEvent("enterInstance", npc, player);
+						instance.onEvent("enterInstance", npc, player);
 					}
 					break;
 				}
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10554_GiftForYou/Q10554_GiftForYou.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10554_GiftForYou/Q10554_GiftForYou.java
index c9bbea2e2c..014c860046 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10554_GiftForYou/Q10554_GiftForYou.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10554_GiftForYou/Q10554_GiftForYou.java
@@ -63,7 +63,7 @@ public final class Q10554_GiftForYou extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10555_ChargeAtAntharas/Q10555_ChargeAtAntharas.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10555_ChargeAtAntharas/Q10555_ChargeAtAntharas.java
index 5b4a982cea..21bea2b08a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10555_ChargeAtAntharas/Q10555_ChargeAtAntharas.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10555_ChargeAtAntharas/Q10555_ChargeAtAntharas.java
@@ -73,7 +73,7 @@ public final class Q10555_ChargeAtAntharas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
@@ -165,7 +165,7 @@ public final class Q10555_ChargeAtAntharas extends Quest
 							final Quest instance = QuestManager.getInstance().getQuest(AntharasNest.class.getSimpleName());
 							if (instance != null)
 							{
-								instance.onAdvEvent("startGemDragonsAttack", npc, player);
+								instance.onEvent("startGemDragonsAttack", npc, player);
 							}
 							qs.setCond(2, true);
 							player.getVariables().set(PlayerVariables.BALTHUS_PHASE, 3);
@@ -340,7 +340,7 @@ public final class Q10555_ChargeAtAntharas extends Quest
 					final Quest instance = QuestManager.getInstance().getQuest(AntharasNest.class.getSimpleName());
 					if (instance != null)
 					{
-						instance.onAdvEvent("enterInstance", npc, player);
+						instance.onEvent("enterInstance", npc, player);
 					}
 					break;
 				}
@@ -373,7 +373,7 @@ public final class Q10555_ChargeAtAntharas extends Quest
 					final Quest instance = QuestManager.getInstance().getQuest(AntharasNest.class.getSimpleName());
 					if (instance != null)
 					{
-						instance.onAdvEvent("startAntharasProgress", npc, killer);
+						instance.onEvent("startAntharasProgress", npc, killer);
 					}
 				}
 			}
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10556_ForgottenPowerStartOfFate/Q10556_ForgottenPowerStartOfFate.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10556_ForgottenPowerStartOfFate/Q10556_ForgottenPowerStartOfFate.java
index f1eb9e3f1f..126b03bda2 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10556_ForgottenPowerStartOfFate/Q10556_ForgottenPowerStartOfFate.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10556_ForgottenPowerStartOfFate/Q10556_ForgottenPowerStartOfFate.java
@@ -137,7 +137,7 @@ public final class Q10556_ForgottenPowerStartOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
@@ -298,7 +298,7 @@ public final class Q10556_ForgottenPowerStartOfFate extends Quest
 					final Quest abelius = QuestManager.getInstance().getQuest(PowerOfAbelius.class.getSimpleName());
 					if (abelius != null)
 					{
-						abelius.onAdvEvent("enterInstance", npc, player);
+						abelius.onEvent("enterInstance", npc, player);
 					}
 					break;
 				}
@@ -308,7 +308,7 @@ public final class Q10556_ForgottenPowerStartOfFate extends Quest
 					final Quest sapyros = QuestManager.getInstance().getQuest(PowerOfSapyros.class.getSimpleName());
 					if (sapyros != null)
 					{
-						sapyros.onAdvEvent("enterInstance", npc, player);
+						sapyros.onEvent("enterInstance", npc, player);
 					}
 					break;
 				}
@@ -318,7 +318,7 @@ public final class Q10556_ForgottenPowerStartOfFate extends Quest
 					final Quest kashnaga = QuestManager.getInstance().getQuest(PowerOfKashnaga.class.getSimpleName());
 					if (kashnaga != null)
 					{
-						kashnaga.onAdvEvent("enterInstance", npc, player);
+						kashnaga.onEvent("enterInstance", npc, player);
 					}
 					break;
 				}
@@ -328,7 +328,7 @@ public final class Q10556_ForgottenPowerStartOfFate extends Quest
 					final Quest cranigg = QuestManager.getInstance().getQuest(PowerOfCranigg.class.getSimpleName());
 					if (cranigg != null)
 					{
-						cranigg.onAdvEvent("enterInstance", npc, player);
+						cranigg.onEvent("enterInstance", npc, player);
 					}
 					break;
 				}
@@ -338,7 +338,7 @@ public final class Q10556_ForgottenPowerStartOfFate extends Quest
 					final Quest naviarope = QuestManager.getInstance().getQuest(PowerOfNaviarope.class.getSimpleName());
 					if (naviarope != null)
 					{
-						naviarope.onAdvEvent("enterInstance", npc, player);
+						naviarope.onEvent("enterInstance", npc, player);
 					}
 					break;
 				}
@@ -348,7 +348,7 @@ public final class Q10556_ForgottenPowerStartOfFate extends Quest
 					final Quest raister = QuestManager.getInstance().getQuest(PowerOfRaister.class.getSimpleName());
 					if (raister != null)
 					{
-						raister.onAdvEvent("enterInstance", npc, player);
+						raister.onEvent("enterInstance", npc, player);
 					}
 					break;
 				}
@@ -358,7 +358,7 @@ public final class Q10556_ForgottenPowerStartOfFate extends Quest
 					final Quest soltkreig = QuestManager.getInstance().getQuest(PowerOfSoltkreig.class.getSimpleName());
 					if (soltkreig != null)
 					{
-						soltkreig.onAdvEvent("enterInstance", npc, player);
+						soltkreig.onEvent("enterInstance", npc, player);
 					}
 					break;
 				}
@@ -368,7 +368,7 @@ public final class Q10556_ForgottenPowerStartOfFate extends Quest
 					final Quest lakcis = QuestManager.getInstance().getQuest(PowerOfLakcis.class.getSimpleName());
 					if (lakcis != null)
 					{
-						lakcis.onAdvEvent("enterInstance", npc, player);
+						lakcis.onEvent("enterInstance", npc, player);
 					}
 					break;
 				}
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10557_NewPowerWindsOfFate/Q10557_NewPowerWindsOfFate.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10557_NewPowerWindsOfFate/Q10557_NewPowerWindsOfFate.java
index a2cf99e670..f171fa8294 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10557_NewPowerWindsOfFate/Q10557_NewPowerWindsOfFate.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10557_NewPowerWindsOfFate/Q10557_NewPowerWindsOfFate.java
@@ -85,7 +85,7 @@ public final class Q10557_NewPowerWindsOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
@@ -180,7 +180,7 @@ public final class Q10557_NewPowerWindsOfFate extends Quest
 					final Quest faeron = QuestManager.getInstance().getQuest(FaeronVillage.class.getSimpleName());
 					if (faeron != null)
 					{
-						faeron.onAdvEvent("enterInstance", npc, player);
+						faeron.onEvent("enterInstance", npc, player);
 						switch (player.getClassId())
 						{
 							case EVISCERATOR_BALTHUS:
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10559_BeforeTheGuide/Q10559_BeforeTheGuide.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10559_BeforeTheGuide/Q10559_BeforeTheGuide.java
index 901a1fcb40..fd81b435f3 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10559_BeforeTheGuide/Q10559_BeforeTheGuide.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10559_BeforeTheGuide/Q10559_BeforeTheGuide.java
@@ -52,7 +52,7 @@ public final class Q10559_BeforeTheGuide extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10560_WayOfWanderingKnight/Q10560_WayOfWanderingKnight.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10560_WayOfWanderingKnight/Q10560_WayOfWanderingKnight.java
index add8bfc25b..9feef45665 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10560_WayOfWanderingKnight/Q10560_WayOfWanderingKnight.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10560_WayOfWanderingKnight/Q10560_WayOfWanderingKnight.java
@@ -80,7 +80,7 @@ public class Q10560_WayOfWanderingKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		final ClassId classId = player.getClassId();
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/Q10561_AcrossTheDeathLine.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/Q10561_AcrossTheDeathLine.java
index 9fc87aa701..f382802aae 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/Q10561_AcrossTheDeathLine.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/Q10561_AcrossTheDeathLine.java
@@ -58,7 +58,7 @@ public class Q10561_AcrossTheDeathLine extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10562_TakeUpArms/Q10562_TakeUpArms.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10562_TakeUpArms/Q10562_TakeUpArms.java
index 295605bcf8..2240a09db5 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10562_TakeUpArms/Q10562_TakeUpArms.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10562_TakeUpArms/Q10562_TakeUpArms.java
@@ -55,7 +55,7 @@ public class Q10562_TakeUpArms extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10563_ControlOfPower/Q10563_ControlOfPower.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10563_ControlOfPower/Q10563_ControlOfPower.java
index 59f2a942da..4c3ded8c3e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10563_ControlOfPower/Q10563_ControlOfPower.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10563_ControlOfPower/Q10563_ControlOfPower.java
@@ -61,7 +61,7 @@ public final class Q10563_ControlOfPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10564_ProveProgress/Q10564_ProveProgress.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10564_ProveProgress/Q10564_ProveProgress.java
index 47435da877..160354e383 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10564_ProveProgress/Q10564_ProveProgress.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10564_ProveProgress/Q10564_ProveProgress.java
@@ -60,7 +60,7 @@ public final class Q10564_ProveProgress extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10565_NothingIsImpossible/Q10565_NothingIsImpossible.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10565_NothingIsImpossible/Q10565_NothingIsImpossible.java
index 4c5000589d..725d04cd4a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10565_NothingIsImpossible/Q10565_NothingIsImpossible.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10565_NothingIsImpossible/Q10565_NothingIsImpossible.java
@@ -60,7 +60,7 @@ public final class Q10565_NothingIsImpossible extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
index 06dce8cce6..98043cea28 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
@@ -54,7 +54,7 @@ public class Q10566_BestChoice extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10567_SpecialMissionNornilsGarden/Q10567_SpecialMissionNornilsGarden.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10567_SpecialMissionNornilsGarden/Q10567_SpecialMissionNornilsGarden.java
index 6550a4d03e..a1f7ff00f3 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10567_SpecialMissionNornilsGarden/Q10567_SpecialMissionNornilsGarden.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10567_SpecialMissionNornilsGarden/Q10567_SpecialMissionNornilsGarden.java
@@ -54,7 +54,7 @@ public class Q10567_SpecialMissionNornilsGarden extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10568_KamaelsTechnologicalAdvancement/Q10568_KamaelsTechnologicalAdvancement.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10568_KamaelsTechnologicalAdvancement/Q10568_KamaelsTechnologicalAdvancement.java
index ce6037f64c..02b831dc03 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10568_KamaelsTechnologicalAdvancement/Q10568_KamaelsTechnologicalAdvancement.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10568_KamaelsTechnologicalAdvancement/Q10568_KamaelsTechnologicalAdvancement.java
@@ -64,7 +64,7 @@ public class Q10568_KamaelsTechnologicalAdvancement extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10569_DeclarationOfWar/Q10569_DeclarationOfWar.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10569_DeclarationOfWar/Q10569_DeclarationOfWar.java
index 947ea94aeb..4bb0999643 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10569_DeclarationOfWar/Q10569_DeclarationOfWar.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10569_DeclarationOfWar/Q10569_DeclarationOfWar.java
@@ -82,7 +82,7 @@ public class Q10569_DeclarationOfWar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10571_StrategicReconciliation/Q10571_StrategicReconciliation.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10571_StrategicReconciliation/Q10571_StrategicReconciliation.java
index 19234b84e3..f913993474 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10571_StrategicReconciliation/Q10571_StrategicReconciliation.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10571_StrategicReconciliation/Q10571_StrategicReconciliation.java
@@ -68,7 +68,7 @@ public class Q10571_StrategicReconciliation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java
index d47e535813..6ee4c52622 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java
@@ -74,7 +74,7 @@ public class Q10575_LetsGoFishing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java
index fbe765e74c..0e131f0668 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java
@@ -62,7 +62,7 @@ public class Q10576_GlitteringWeapons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java
index 1e62f333cb..546829376d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java
@@ -63,7 +63,7 @@ public class Q10577_TemperARustingBlade extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java
index 77b8eb101c..19bc9449dd 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java
@@ -63,7 +63,7 @@ public class Q10578_TheSoulOfASword extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java
index fc3a65c076..d7dbc2a6cb 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java
@@ -67,7 +67,7 @@ public class Q10579_ContainingTheAttributePower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10594_FergasonsScheme/Q10594_FergasonsScheme.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10594_FergasonsScheme/Q10594_FergasonsScheme.java
index 5c64dfa8cf..a897c26670 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10594_FergasonsScheme/Q10594_FergasonsScheme.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10594_FergasonsScheme/Q10594_FergasonsScheme.java
@@ -81,7 +81,7 @@ public final class Q10594_FergasonsScheme extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10597_EscapeToTheShadowOfTheMotherTree/Q10597_EscapeToTheShadowOfTheMotherTree.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10597_EscapeToTheShadowOfTheMotherTree/Q10597_EscapeToTheShadowOfTheMotherTree.java
index cf0beab6c6..287e636fb4 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10597_EscapeToTheShadowOfTheMotherTree/Q10597_EscapeToTheShadowOfTheMotherTree.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10597_EscapeToTheShadowOfTheMotherTree/Q10597_EscapeToTheShadowOfTheMotherTree.java
@@ -78,7 +78,7 @@ public class Q10597_EscapeToTheShadowOfTheMotherTree extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10598_WithAllYourMight/Q10598_WithAllYourMight.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10598_WithAllYourMight/Q10598_WithAllYourMight.java
index 0830015b97..11d8243e30 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10598_WithAllYourMight/Q10598_WithAllYourMight.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10598_WithAllYourMight/Q10598_WithAllYourMight.java
@@ -79,7 +79,7 @@ public class Q10598_WithAllYourMight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10599_ThreadOfFateHangingOnTheMotherTree/Q10599_ThreadOfFateHangingOnTheMotherTree.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10599_ThreadOfFateHangingOnTheMotherTree/Q10599_ThreadOfFateHangingOnTheMotherTree.java
index b87a0c021d..02d436c330 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10599_ThreadOfFateHangingOnTheMotherTree/Q10599_ThreadOfFateHangingOnTheMotherTree.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10599_ThreadOfFateHangingOnTheMotherTree/Q10599_ThreadOfFateHangingOnTheMotherTree.java
@@ -78,7 +78,7 @@ public class Q10599_ThreadOfFateHangingOnTheMotherTree extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/Q10658_MakkumInTheDimension.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/Q10658_MakkumInTheDimension.java
index 4345dfeba7..1f1ee2e21d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/Q10658_MakkumInTheDimension.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/Q10658_MakkumInTheDimension.java
@@ -50,7 +50,7 @@ public class Q10658_MakkumInTheDimension extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java
index 593c0d4936..e2bb80f5e5 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java
@@ -46,7 +46,7 @@ public class Q10701_TheRoadToDestruction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java
index 1ede0c4ba5..ba1153cd88 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java
@@ -46,7 +46,7 @@ public class Q10702_TheRoadToInfinity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java
index 2ee25d6af7..253b12cda4 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java
@@ -48,7 +48,7 @@ public class Q10703_BottleOfIstinasSoul extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java
index 23bae467b4..9e799c2fcb 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java
@@ -48,7 +48,7 @@ public class Q10704_BottleOfOctavisSoul extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java
index 94c10b561b..4c8ae1432b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java
@@ -48,7 +48,7 @@ public class Q10705_BottleOfTautisSoul extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java
index 2ad335bca3..9314434523 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java
@@ -71,7 +71,7 @@ public class Q10707_FlamesOfSorrow extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10709_TheStolenSeed/Q10709_TheStolenSeed.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10709_TheStolenSeed/Q10709_TheStolenSeed.java
index 7d9bf40f18..3cd7fe939a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10709_TheStolenSeed/Q10709_TheStolenSeed.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10709_TheStolenSeed/Q10709_TheStolenSeed.java
@@ -61,7 +61,7 @@ public class Q10709_TheStolenSeed extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (event.equals("action"))
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10710_LifeEnergyRepository/Q10710_LifeEnergyRepository.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10710_LifeEnergyRepository/Q10710_LifeEnergyRepository.java
index 8d8e2f2b35..62d33a8141 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10710_LifeEnergyRepository/Q10710_LifeEnergyRepository.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10710_LifeEnergyRepository/Q10710_LifeEnergyRepository.java
@@ -63,7 +63,7 @@ public class Q10710_LifeEnergyRepository extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (event.equals("action"))
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java
index 90003a043d..b6033b061d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java
@@ -46,7 +46,7 @@ public class Q10732_AForeignLand extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java
index 68becfc508..5bfca316b6 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java
@@ -52,7 +52,7 @@ public class Q10733_TheTestForSurvival extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java
index f71a8b29ac..dcb36039c8 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java
@@ -66,7 +66,7 @@ public class Q10734_DoOrDie extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java
index 6d51149018..fa1ffbfa27 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java
@@ -64,7 +64,7 @@ public class Q10735_ASpecialPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("33942-02.htm"))
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java
index 0712537c40..acc37c20ee 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java
@@ -63,7 +63,7 @@ public class Q10736_ASpecialPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("33943-02.htm"))
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java
index 86c056d93c..9d73490f3e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java
@@ -58,7 +58,7 @@ public class Q10737_GrakonsWarehouse extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java
index 18f6b4c6f8..f521e5f773 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java
@@ -51,7 +51,7 @@ public class Q10738_AnInnerBeauty extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java
index 4be8b937de..de9928d437 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java
@@ -65,7 +65,7 @@ public class Q10739_SupplyAndDemand extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java
index 051ea28cf9..d0313db269 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java
@@ -66,7 +66,7 @@ public class Q10740_NeverForget extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java
index 012d6a6263..fbf1a8b449 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java
@@ -57,7 +57,7 @@ public class Q10741_ADraughtForTheCold extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java
index e8c5f68163..ce6111db32 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java
@@ -62,7 +62,7 @@ public class Q10742_AFurryFriend extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java
index 51d978fd10..09456b6da9 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java
@@ -64,7 +64,7 @@ public class Q10743_StrangeFungus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java
index d81ff1fbc5..557934c425 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java
@@ -53,7 +53,7 @@ public class Q10744_StrongerThanSteel extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java
index 779a5affd6..dc292e67e4 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java
@@ -60,7 +60,7 @@ public class Q10745_TheSecretIngredients extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java
index 3774d264f0..811ce0b27c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java
@@ -57,7 +57,7 @@ public class Q10746_SeeTheWorld extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10748_MysteriousSuggestion1/Q10748_MysteriousSuggestion1.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10748_MysteriousSuggestion1/Q10748_MysteriousSuggestion1.java
index bf24739d4a..1db27a83de 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10748_MysteriousSuggestion1/Q10748_MysteriousSuggestion1.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10748_MysteriousSuggestion1/Q10748_MysteriousSuggestion1.java
@@ -54,7 +54,7 @@ public final class Q10748_MysteriousSuggestion1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10749_MysteriousSuggestion2/Q10749_MysteriousSuggestion2.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10749_MysteriousSuggestion2/Q10749_MysteriousSuggestion2.java
index 2e1b4f7932..fe683bb978 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10749_MysteriousSuggestion2/Q10749_MysteriousSuggestion2.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10749_MysteriousSuggestion2/Q10749_MysteriousSuggestion2.java
@@ -54,7 +54,7 @@ public final class Q10749_MysteriousSuggestion2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java
index 3cda144c48..f14723434f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java
@@ -98,7 +98,7 @@ public class Q10751_WindsOfFateEncounters extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java
index 6f75ff5ee7..b5d2e9720e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java
@@ -88,7 +88,7 @@ public class Q10752_WindsOfFateAPromise extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java
index 9802c626ae..8e72c775cf 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java
@@ -134,7 +134,7 @@ public class Q10753_WindsOfFateChoices extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10755_LettersFromTheQueenWindyHill/Q10755_LettersFromTheQueenWindyHill.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10755_LettersFromTheQueenWindyHill/Q10755_LettersFromTheQueenWindyHill.java
index 9aeaecedea..80d7827ec7 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10755_LettersFromTheQueenWindyHill/Q10755_LettersFromTheQueenWindyHill.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10755_LettersFromTheQueenWindyHill/Q10755_LettersFromTheQueenWindyHill.java
@@ -55,7 +55,7 @@ public class Q10755_LettersFromTheQueenWindyHill extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java
index 54f0924c8c..9addb06f6a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java
@@ -62,7 +62,7 @@ public class Q10756_AnInterdimensionalDraft extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java
index 145db2ec08..dc432da6f6 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java
@@ -59,7 +59,7 @@ public class Q10757_QuietingTheStorm extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10758_TheOathOfTheWind/Q10758_TheOathOfTheWind.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10758_TheOathOfTheWind/Q10758_TheOathOfTheWind.java
index 3782633f40..e8dbe9f291 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10758_TheOathOfTheWind/Q10758_TheOathOfTheWind.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10758_TheOathOfTheWind/Q10758_TheOathOfTheWind.java
@@ -54,7 +54,7 @@ public class Q10758_TheOathOfTheWind extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10760_LettersFromTheQueenOrcBarracks/Q10760_LettersFromTheQueenOrcBarracks.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10760_LettersFromTheQueenOrcBarracks/Q10760_LettersFromTheQueenOrcBarracks.java
index bb676024ab..9f1c80b400 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10760_LettersFromTheQueenOrcBarracks/Q10760_LettersFromTheQueenOrcBarracks.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10760_LettersFromTheQueenOrcBarracks/Q10760_LettersFromTheQueenOrcBarracks.java
@@ -55,7 +55,7 @@ public class Q10760_LettersFromTheQueenOrcBarracks extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java
index 74e8a89490..03a6b4b178 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java
@@ -65,7 +65,7 @@ public class Q10761_AnOrcInLove extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10762_MarionetteSpirit/Q10762_MarionetteSpirit.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10762_MarionetteSpirit/Q10762_MarionetteSpirit.java
index 0279f9aef0..ac750884a2 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10762_MarionetteSpirit/Q10762_MarionetteSpirit.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10762_MarionetteSpirit/Q10762_MarionetteSpirit.java
@@ -55,7 +55,7 @@ public class Q10762_MarionetteSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java
index 6bc6ed9b18..eb9e67177a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java
@@ -54,7 +54,7 @@ public class Q10763_TerrifyingChertuba extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java
index 54e982a6cd..dead250e0c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java
@@ -62,7 +62,7 @@ public class Q10764_FreeSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10766_ANewCraft/Q10766_ANewCraft.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10766_ANewCraft/Q10766_ANewCraft.java
index 41157ee92b..5fbafa35b2 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10766_ANewCraft/Q10766_ANewCraft.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10766_ANewCraft/Q10766_ANewCraft.java
@@ -63,7 +63,7 @@ public class Q10766_ANewCraft extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java
index 6fb43e4cd6..a82c8271e6 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java
@@ -60,7 +60,7 @@ public class Q10767_AWholeNewLevelOfAlchemy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10769_LettersFromTheQueenCrumaTowerPart1/Q10769_LettersFromTheQueenCrumaTowerPart1.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10769_LettersFromTheQueenCrumaTowerPart1/Q10769_LettersFromTheQueenCrumaTowerPart1.java
index 14fa88b6b0..0fedc60418 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10769_LettersFromTheQueenCrumaTowerPart1/Q10769_LettersFromTheQueenCrumaTowerPart1.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10769_LettersFromTheQueenCrumaTowerPart1/Q10769_LettersFromTheQueenCrumaTowerPart1.java
@@ -57,7 +57,7 @@ public class Q10769_LettersFromTheQueenCrumaTowerPart1 extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java
index 11ac5492a7..9b878bd1a3 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java
@@ -60,7 +60,7 @@ public class Q10770_InSearchOfTheGrail extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java
index 4fe64a9f90..73772df5d2 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java
@@ -59,7 +59,7 @@ public class Q10771_VolatilePower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java
index a50cba337e..ebffb6b105 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java
@@ -58,7 +58,7 @@ public class Q10772_ReportsFromCrumaTowerPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java
index 85a6afcd02..40a7457f6e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java
@@ -55,7 +55,7 @@ public class Q10774_LettersFromTheQueenCrumaTowerPart2 extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java
index 9d8bfdd905..7776d3ba24 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java
@@ -63,7 +63,7 @@ public class Q10775_InSearchOfAnAncientGiant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java
index 6e0b12b13b..546391adfd 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java
@@ -69,7 +69,7 @@ public class Q10776_TheWrathOfTheGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java
index ad558a3c03..d96d425c06 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java
@@ -58,7 +58,7 @@ public class Q10777_ReportsFromCrumaTowerPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java
index 5dbea0b0ab..0e573f61a1 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java
@@ -55,7 +55,7 @@ public class Q10782_LettersFromTheQueenForsakenPlains extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java
index 04985fcd86..fb1188c3bf 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java
@@ -78,7 +78,7 @@ public class Q10783_TracesOfAnAmbush extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java
index 3e45259f8b..35165252b5 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java
@@ -66,7 +66,7 @@ public class Q10784_TheBrokenDevice extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java
index d8a021d469..9ce2946641 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java
@@ -55,7 +55,7 @@ public class Q10785_LettersFromTheQueenFieldsOfMassacre extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java
index e4aeb0a6c5..2a4efba6af 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java
@@ -72,7 +72,7 @@ public class Q10786_ResidentProblemSolver extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java
index a7cb5255a2..9e9e5ca51c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java
@@ -57,7 +57,7 @@ public class Q10787_ASpyMission extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java
index ee85567199..8b65f6fe1b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java
@@ -55,7 +55,7 @@ public class Q10789_LettersFromTheQueenSwampOfScreams extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java
index afdcde07a8..33df51f29a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java
@@ -73,7 +73,7 @@ public class Q10790_AMercenaryHelper extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java
index 2feff9b2af..d2c915008b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java
@@ -64,7 +64,7 @@ public class Q10791_TheManOfMystery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java
index 7549d9fa2f..416446e0e7 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java
@@ -55,7 +55,7 @@ public class Q10792_LettersFromTheQueenForestOfTheDead extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java
index b4aed022a7..353be489ac 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java
@@ -70,7 +70,7 @@ public class Q10793_SaveTheSouls extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java
index 0b66df0e5c..97425eba70 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java
@@ -94,7 +94,7 @@ public class Q10794_InvestigateTheForest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java
index 8df3dc83d3..bc6700e073 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java
@@ -40,7 +40,7 @@ public class Q10795_LettersFromTheQueenWallOfAgros extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java
index 26b6a34591..29464f9357 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java
@@ -66,7 +66,7 @@ public class Q10796_TheEyeThatDefiedTheGods extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
index 95fb61323c..34b86f9dc1 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
@@ -71,7 +71,7 @@ public class Q10797_CrossingFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java
index cd5f8935e1..c168bb844b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java
@@ -56,7 +56,7 @@ public class Q10798_LettersFromTheQueenDragonValley extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java
index 092c19afb8..21165874a3 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java
@@ -69,7 +69,7 @@ public class Q10799_StrangeThingsAfootInTheValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java
index 6355ffa405..b72f3e4a66 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java
@@ -69,7 +69,7 @@ public class Q10800_ReconnaissanceAtDragonValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
index b1dca4d5b3..15fc371c1a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
@@ -55,7 +55,7 @@ public class Q10801_TheDimensionalWarpPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
index 1339720830..1b0c8d74d0 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
@@ -56,7 +56,7 @@ public class Q10802_TheDimensionalWarpPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
index 117f5cc53e..4cae513e93 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
@@ -57,7 +57,7 @@ public class Q10803_TheDimensionalWarpPart3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
index 124823783a..f16e276a8f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
@@ -57,7 +57,7 @@ public class Q10804_TheDimensionalWarpPart4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
index a6796e0c63..b80b2b6ae5 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
@@ -57,7 +57,7 @@ public class Q10805_TheDimensionalWarpPart5 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
index d6ecba6b8e..5a8d67d930 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
@@ -56,7 +56,7 @@ public class Q10806_TheDimensionalWarpPart6 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
index 12462309a1..393bbe074c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
@@ -56,7 +56,7 @@ public class Q10807_TheDimensionalWarpPart7 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
index 7d5ba5aa23..48d283830c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
@@ -56,7 +56,7 @@ public class Q10811_ExaltedOneWhoFacesTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java
index d213b06ea2..d5f92b57d9 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java
@@ -114,7 +114,7 @@ public class Q10812_FacingSadness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10813_ForGlory/Q10813_ForGlory.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10813_ForGlory/Q10813_ForGlory.java
index 76fd620dde..89b572a2cc 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10813_ForGlory/Q10813_ForGlory.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10813_ForGlory/Q10813_ForGlory.java
@@ -58,7 +58,7 @@ public class Q10813_ForGlory extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java
index e487e06324..f583c8098b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java
@@ -75,7 +75,7 @@ public class Q10814_BefittingOfTheStatus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java
index e389fbdfcc..7f9ac0bd7d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java
@@ -66,7 +66,7 @@ public class Q10815_StepUp extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
index fdbdca62a6..e00434acbe 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
@@ -57,7 +57,7 @@ public class Q10817_ExaltedOneWhoOvercomesTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java
index 22cbb61194..0f898acae0 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java
@@ -64,7 +64,7 @@ public class Q10818_ConfrontingAGiantMonster extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10819_ForHonor/Q10819_ForHonor.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10819_ForHonor/Q10819_ForHonor.java
index d3d25867b9..250f860227 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10819_ForHonor/Q10819_ForHonor.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10819_ForHonor/Q10819_ForHonor.java
@@ -62,7 +62,7 @@ public class Q10819_ForHonor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10820_RelationshipsBefittingOfTheStatus/Q10820_RelationshipsBefittingOfTheStatus.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10820_RelationshipsBefittingOfTheStatus/Q10820_RelationshipsBefittingOfTheStatus.java
index d23b38f64a..126444e4a6 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10820_RelationshipsBefittingOfTheStatus/Q10820_RelationshipsBefittingOfTheStatus.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10820_RelationshipsBefittingOfTheStatus/Q10820_RelationshipsBefittingOfTheStatus.java
@@ -58,7 +58,7 @@ public class Q10820_RelationshipsBefittingOfTheStatus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10821_HelpingOthers/Q10821_HelpingOthers.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10821_HelpingOthers/Q10821_HelpingOthers.java
index 0ad084443b..bdbb8b5edb 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10821_HelpingOthers/Q10821_HelpingOthers.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10821_HelpingOthers/Q10821_HelpingOthers.java
@@ -55,7 +55,7 @@ public class Q10821_HelpingOthers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
index 6bf1ee6a4e..a795ecb975 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
@@ -59,7 +59,7 @@ public class Q10823_ExaltedOneWhoShattersTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java
index 68dd1f489a..b9d8b3ecb3 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java
@@ -55,7 +55,7 @@ public class Q10824_ConfrontingTheGreatestDanger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java
index d9982218ab..f62d1ec44d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java
@@ -61,7 +61,7 @@ public class Q10825_ForVictory extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10826_LuckBefittingOfTheStatus/Q10826_LuckBefittingOfTheStatus.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10826_LuckBefittingOfTheStatus/Q10826_LuckBefittingOfTheStatus.java
index 3ce9e62843..a74f6b22e4 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10826_LuckBefittingOfTheStatus/Q10826_LuckBefittingOfTheStatus.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10826_LuckBefittingOfTheStatus/Q10826_LuckBefittingOfTheStatus.java
@@ -76,7 +76,7 @@ public class Q10826_LuckBefittingOfTheStatus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10827_StepUpToLead/Q10827_StepUpToLead.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10827_StepUpToLead/Q10827_StepUpToLead.java
index 35fcab2537..73a3168454 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10827_StepUpToLead/Q10827_StepUpToLead.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10827_StepUpToLead/Q10827_StepUpToLead.java
@@ -58,7 +58,7 @@ public class Q10827_StepUpToLead extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10829_InSearchOfTheCause/Q10829_InSearchOfTheCause.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10829_InSearchOfTheCause/Q10829_InSearchOfTheCause.java
index 8f4b8ea015..8d961007e0 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10829_InSearchOfTheCause/Q10829_InSearchOfTheCause.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10829_InSearchOfTheCause/Q10829_InSearchOfTheCause.java
@@ -49,7 +49,7 @@ public class Q10829_InSearchOfTheCause extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/Q10830_TheLostGardenOfSpirits.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/Q10830_TheLostGardenOfSpirits.java
index f5a77a8c46..f1e8fcac8e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/Q10830_TheLostGardenOfSpirits.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/Q10830_TheLostGardenOfSpirits.java
@@ -63,7 +63,7 @@ public class Q10830_TheLostGardenOfSpirits extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10831_UnbelievableSight/Q10831_UnbelievableSight.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10831_UnbelievableSight/Q10831_UnbelievableSight.java
index 292e487dbb..09e8f8bffb 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10831_UnbelievableSight/Q10831_UnbelievableSight.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10831_UnbelievableSight/Q10831_UnbelievableSight.java
@@ -64,7 +64,7 @@ public class Q10831_UnbelievableSight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10832_EnergyOfSadnessAndAnger/Q10832_EnergyOfSadnessAndAnger.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10832_EnergyOfSadnessAndAnger/Q10832_EnergyOfSadnessAndAnger.java
index c3ba629f61..69125c3c8e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10832_EnergyOfSadnessAndAnger/Q10832_EnergyOfSadnessAndAnger.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10832_EnergyOfSadnessAndAnger/Q10832_EnergyOfSadnessAndAnger.java
@@ -79,7 +79,7 @@ public class Q10832_EnergyOfSadnessAndAnger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10833_PutTheQueenOfSpiritsToSleep/Q10833_PutTheQueenOfSpiritsToSleep.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10833_PutTheQueenOfSpiritsToSleep/Q10833_PutTheQueenOfSpiritsToSleep.java
index f139198949..0072e5d723 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10833_PutTheQueenOfSpiritsToSleep/Q10833_PutTheQueenOfSpiritsToSleep.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10833_PutTheQueenOfSpiritsToSleep/Q10833_PutTheQueenOfSpiritsToSleep.java
@@ -56,7 +56,7 @@ public class Q10833_PutTheQueenOfSpiritsToSleep extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10836_DisappearedClanMember/Q10836_DisappearedClanMember.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10836_DisappearedClanMember/Q10836_DisappearedClanMember.java
index 3b3f852c70..3230d13891 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10836_DisappearedClanMember/Q10836_DisappearedClanMember.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10836_DisappearedClanMember/Q10836_DisappearedClanMember.java
@@ -59,7 +59,7 @@ public class Q10836_DisappearedClanMember extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10837_LookingForTheBlackbirdClanMember/Q10837_LookingForTheBlackbirdClanMember.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10837_LookingForTheBlackbirdClanMember/Q10837_LookingForTheBlackbirdClanMember.java
index 217cabf9fb..a83cf4e3fa 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10837_LookingForTheBlackbirdClanMember/Q10837_LookingForTheBlackbirdClanMember.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10837_LookingForTheBlackbirdClanMember/Q10837_LookingForTheBlackbirdClanMember.java
@@ -54,7 +54,7 @@ public class Q10837_LookingForTheBlackbirdClanMember extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java
index 2ef2a3e32e..6b0de70720 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java
@@ -64,7 +64,7 @@ public class Q10838_TheReasonForNotBeingAbleToGetOut extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java
index 248d9275e5..c4ba15bb8f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java
@@ -61,7 +61,7 @@ public class Q10839_BlackbirdsNameValue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java
index 218f86f996..1a12c524a9 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java
@@ -63,7 +63,7 @@ public class Q10840_TimeToRecover extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java
index 8cf3b7506e..cae50c4972 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java
@@ -53,7 +53,7 @@ public class Q10841_DeepInsideAteliaFortress extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10843_AnomalyInTheEnchantedValley/Q10843_AnomalyInTheEnchantedValley.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10843_AnomalyInTheEnchantedValley/Q10843_AnomalyInTheEnchantedValley.java
index e1712c2ba9..ae707e925f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10843_AnomalyInTheEnchantedValley/Q10843_AnomalyInTheEnchantedValley.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10843_AnomalyInTheEnchantedValley/Q10843_AnomalyInTheEnchantedValley.java
@@ -48,7 +48,7 @@ public class Q10843_AnomalyInTheEnchantedValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10844_BloodyBattleSeizingSupplies/Q10844_BloodyBattleSeizingSupplies.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10844_BloodyBattleSeizingSupplies/Q10844_BloodyBattleSeizingSupplies.java
index 3a18492bfa..95e9f265f1 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10844_BloodyBattleSeizingSupplies/Q10844_BloodyBattleSeizingSupplies.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10844_BloodyBattleSeizingSupplies/Q10844_BloodyBattleSeizingSupplies.java
@@ -56,7 +56,7 @@ public class Q10844_BloodyBattleSeizingSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10845_BloodyBattleRescueTheSmiths/Q10845_BloodyBattleRescueTheSmiths.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10845_BloodyBattleRescueTheSmiths/Q10845_BloodyBattleRescueTheSmiths.java
index 262fbdc4b5..632574f511 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10845_BloodyBattleRescueTheSmiths/Q10845_BloodyBattleRescueTheSmiths.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10845_BloodyBattleRescueTheSmiths/Q10845_BloodyBattleRescueTheSmiths.java
@@ -62,7 +62,7 @@ public final class Q10845_BloodyBattleRescueTheSmiths extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = event;
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10846_BloodyBattleMeetingTheCommander/Q10846_BloodyBattleMeetingTheCommander.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10846_BloodyBattleMeetingTheCommander/Q10846_BloodyBattleMeetingTheCommander.java
index 6a229188da..e3d0e59e43 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10846_BloodyBattleMeetingTheCommander/Q10846_BloodyBattleMeetingTheCommander.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10846_BloodyBattleMeetingTheCommander/Q10846_BloodyBattleMeetingTheCommander.java
@@ -53,7 +53,7 @@ public class Q10846_BloodyBattleMeetingTheCommander extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10848_TrialsBeforeTheBattle/Q10848_TrialsBeforeTheBattle.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10848_TrialsBeforeTheBattle/Q10848_TrialsBeforeTheBattle.java
index 868ecb9bdc..cad927beb2 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10848_TrialsBeforeTheBattle/Q10848_TrialsBeforeTheBattle.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10848_TrialsBeforeTheBattle/Q10848_TrialsBeforeTheBattle.java
@@ -58,7 +58,7 @@ public final class Q10848_TrialsBeforeTheBattle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10849_TrialsForAdaptation/Q10849_TrialsForAdaptation.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10849_TrialsForAdaptation/Q10849_TrialsForAdaptation.java
index 8f77ff4caf..437e5c9a8e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10849_TrialsForAdaptation/Q10849_TrialsForAdaptation.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10849_TrialsForAdaptation/Q10849_TrialsForAdaptation.java
@@ -76,7 +76,7 @@ public class Q10849_TrialsForAdaptation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10851_ElvenBotany/Q10851_ElvenBotany.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10851_ElvenBotany/Q10851_ElvenBotany.java
index d22f5130b5..e74becd0de 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10851_ElvenBotany/Q10851_ElvenBotany.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10851_ElvenBotany/Q10851_ElvenBotany.java
@@ -58,7 +58,7 @@ public class Q10851_ElvenBotany extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10852_TheMotherTreeRevivalProject/Q10852_TheMotherTreeRevivalProject.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10852_TheMotherTreeRevivalProject/Q10852_TheMotherTreeRevivalProject.java
index 650f2a8248..ea67637b49 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10852_TheMotherTreeRevivalProject/Q10852_TheMotherTreeRevivalProject.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10852_TheMotherTreeRevivalProject/Q10852_TheMotherTreeRevivalProject.java
@@ -82,7 +82,7 @@ public class Q10852_TheMotherTreeRevivalProject extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10853_ToWeakenTheGiants/Q10853_ToWeakenTheGiants.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10853_ToWeakenTheGiants/Q10853_ToWeakenTheGiants.java
index d631d47348..70eddc1c55 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10853_ToWeakenTheGiants/Q10853_ToWeakenTheGiants.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10853_ToWeakenTheGiants/Q10853_ToWeakenTheGiants.java
@@ -60,7 +60,7 @@ public final class Q10853_ToWeakenTheGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10854_ToSeizeTheFortress/Q10854_ToSeizeTheFortress.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10854_ToSeizeTheFortress/Q10854_ToSeizeTheFortress.java
index 0f131cd3d9..dbdc97fc8b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10854_ToSeizeTheFortress/Q10854_ToSeizeTheFortress.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10854_ToSeizeTheFortress/Q10854_ToSeizeTheFortress.java
@@ -77,7 +77,7 @@ public final class Q10854_ToSeizeTheFortress extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = event;
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10856_SuperionAppears/Q10856_SuperionAppears.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10856_SuperionAppears/Q10856_SuperionAppears.java
index 6beea62bcf..37c5a21afe 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10856_SuperionAppears/Q10856_SuperionAppears.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10856_SuperionAppears/Q10856_SuperionAppears.java
@@ -45,7 +45,7 @@ public class Q10856_SuperionAppears extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10857_SecretTeleport/Q10857_SecretTeleport.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10857_SecretTeleport/Q10857_SecretTeleport.java
index 80fce78d5e..8db2ad22a1 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10857_SecretTeleport/Q10857_SecretTeleport.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10857_SecretTeleport/Q10857_SecretTeleport.java
@@ -69,7 +69,7 @@ public class Q10857_SecretTeleport extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10858_QueenRamonaControllerOfTheVessel/Q10858_QueenRamonaControllerOfTheVessel.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10858_QueenRamonaControllerOfTheVessel/Q10858_QueenRamonaControllerOfTheVessel.java
index 8343b8e737..6adf4b1901 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10858_QueenRamonaControllerOfTheVessel/Q10858_QueenRamonaControllerOfTheVessel.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10858_QueenRamonaControllerOfTheVessel/Q10858_QueenRamonaControllerOfTheVessel.java
@@ -50,7 +50,7 @@ public class Q10858_QueenRamonaControllerOfTheVessel extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10859_OwnTheEarthAndTheHeavens/Q10859_OwnTheEarthAndTheHeavens.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10859_OwnTheEarthAndTheHeavens/Q10859_OwnTheEarthAndTheHeavens.java
index d4ac9e202b..f5e36c2340 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10859_OwnTheEarthAndTheHeavens/Q10859_OwnTheEarthAndTheHeavens.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10859_OwnTheEarthAndTheHeavens/Q10859_OwnTheEarthAndTheHeavens.java
@@ -50,7 +50,7 @@ public class Q10859_OwnTheEarthAndTheHeavens extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
index 9fbdc244ba..88771cce29 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
@@ -57,7 +57,7 @@ public class Q10873_ExaltedReachingAnotherLevel extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10874_AgainstTheNewEnemy/Q10874_AgainstTheNewEnemy.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10874_AgainstTheNewEnemy/Q10874_AgainstTheNewEnemy.java
index 3e4007dfe2..62cde0f803 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10874_AgainstTheNewEnemy/Q10874_AgainstTheNewEnemy.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10874_AgainstTheNewEnemy/Q10874_AgainstTheNewEnemy.java
@@ -103,7 +103,7 @@ public class Q10874_AgainstTheNewEnemy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10875_ForReputation/Q10875_ForReputation.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10875_ForReputation/Q10875_ForReputation.java
index f022445f8b..c4c5405e4a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10875_ForReputation/Q10875_ForReputation.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10875_ForReputation/Q10875_ForReputation.java
@@ -53,7 +53,7 @@ public class Q10875_ForReputation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10876_LeadersGrace/Q10876_LeadersGrace.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10876_LeadersGrace/Q10876_LeadersGrace.java
index 05cb70e278..db3a2b2c73 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10876_LeadersGrace/Q10876_LeadersGrace.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10876_LeadersGrace/Q10876_LeadersGrace.java
@@ -56,7 +56,7 @@ public class Q10876_LeadersGrace extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10877_BreakThroughCrisis/Q10877_BreakThroughCrisis.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10877_BreakThroughCrisis/Q10877_BreakThroughCrisis.java
index 8f0c4a3231..929436212f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10877_BreakThroughCrisis/Q10877_BreakThroughCrisis.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10877_BreakThroughCrisis/Q10877_BreakThroughCrisis.java
@@ -59,7 +59,7 @@ public class Q10877_BreakThroughCrisis extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java
index 9fa54a275d..a291386f62 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java
@@ -57,7 +57,7 @@ public class Q10879_ExaltedGuideToPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10880_TheLastOneStanding/Q10880_TheLastOneStanding.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10880_TheLastOneStanding/Q10880_TheLastOneStanding.java
index 4154dcb533..a18705914f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10880_TheLastOneStanding/Q10880_TheLastOneStanding.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10880_TheLastOneStanding/Q10880_TheLastOneStanding.java
@@ -126,7 +126,7 @@ public class Q10880_TheLastOneStanding extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10881_ForThePride/Q10881_ForThePride.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10881_ForThePride/Q10881_ForThePride.java
index 60f565fe71..c3ccdaa708 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10881_ForThePride/Q10881_ForThePride.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10881_ForThePride/Q10881_ForThePride.java
@@ -56,7 +56,7 @@ public class Q10881_ForThePride extends Quest
 	private static final int MIN_LEVEL = 104;
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10882_VictoryCollection/Q10882_VictoryCollection.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10882_VictoryCollection/Q10882_VictoryCollection.java
index 0b64afccd2..8ae5ea873e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10882_VictoryCollection/Q10882_VictoryCollection.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10882_VictoryCollection/Q10882_VictoryCollection.java
@@ -78,7 +78,7 @@ public class Q10882_VictoryCollection extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10883_ImmortalHonor/Q10883_ImmortalHonor.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10883_ImmortalHonor/Q10883_ImmortalHonor.java
index ba80484f13..3bb1ae6dd2 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10883_ImmortalHonor/Q10883_ImmortalHonor.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10883_ImmortalHonor/Q10883_ImmortalHonor.java
@@ -57,7 +57,7 @@ public class Q10883_ImmortalHonor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10891_AtANewPlace/Q10891_AtANewPlace.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10891_AtANewPlace/Q10891_AtANewPlace.java
index 3703c4b3ad..d46aa19eee 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10891_AtANewPlace/Q10891_AtANewPlace.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10891_AtANewPlace/Q10891_AtANewPlace.java
@@ -49,7 +49,7 @@ public class Q10891_AtANewPlace extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10892_RevengeOneStepAtATime/Q10892_RevengeOneStepAtATime.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10892_RevengeOneStepAtATime/Q10892_RevengeOneStepAtATime.java
index ba10e4624a..88fa2da9dd 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10892_RevengeOneStepAtATime/Q10892_RevengeOneStepAtATime.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10892_RevengeOneStepAtATime/Q10892_RevengeOneStepAtATime.java
@@ -82,7 +82,7 @@ public class Q10892_RevengeOneStepAtATime extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/ThirdClassTransferQuest.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
index b230b12a5b..e0ee0b931a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
@@ -133,7 +133,7 @@ public abstract class ThirdClassTransferQuest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/vehicles/AirShipController.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/vehicles/AirShipController.java
index 682f3b238b..ee534c5f04 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/vehicles/AirShipController.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/vehicles/AirShipController.java
@@ -117,7 +117,7 @@ public abstract class AirShipController extends AbstractNpcAI
 	private static final SystemMessage SM_NEED_MORE = new SystemMessage(SystemMessageId.AN_AIRSHIP_CANNOT_BE_SUMMONED_BECAUSE_YOU_DON_T_HAVE_ENOUGH_S1).addItemName(STARSTONE);
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("summon".equalsIgnoreCase(event))
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
index a1ff9f0e0a..c5dc6f515f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
@@ -162,7 +162,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player.isTransformed())
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
index 7ff39fb0c0..8675a7ec2c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
@@ -51,7 +51,7 @@ public class AllianceMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!"9001-01.htm".equals(event) && (player.getClan() == null))
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
index 0100a1e9c5..b14f3cb0bd 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
@@ -74,7 +74,7 @@ public class ClanMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LEADER_REQUIRED.containsKey(event) && !player.isClanLeader())
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/Quest.java
index 270725d319..09e6c336cc 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/Quest.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/Quest.java
@@ -247,7 +247,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -269,7 +269,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -560,7 +560,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 			{
 				player.setSimulatedTalking(false);
 			}
-			res = onAdvEvent(event, npc, player);
+			res = onEvent(event, npc, player);
 		}
 		catch (Exception e)
 		{
@@ -1038,12 +1038,11 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 */
 	public String onDeath(Creature killer, Creature victim, QuestState qs)
 	{
-		return onAdvEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
+		return onEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
 	}
 	
 	/**
 	 * This function is called whenever a player clicks on a link in a quest dialog and whenever a timer fires.<br>
-	 * If is not overridden by a subclass, then default to the returned value of the simpler (and older) {@link #onEvent(String, QuestState)} override.<br>
 	 * If the player has a quest state, use it as parameter in the next call, otherwise return null.
 	 * @param event this parameter contains a string identifier for the event.<br>
 	 *            Generally, this string is passed directly via the link.<br>
@@ -1062,35 +1061,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 *            This parameter may be {@code null} in certain circumstances.
 	 * @return the text returned by the event (may be {@code null}, a filename or just text)
 	 */
-	public String onAdvEvent(String event, Npc npc, Player player)
-	{
-		if (player != null)
-		{
-			final QuestState qs = player.getQuestState(getName());
-			if (qs != null)
-			{
-				return onEvent(event, qs);
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * This function is called in place of {@link #onAdvEvent(String, Npc, Player)} if the former is not implemented.<br>
-	 * If a script contains both {@link #onAdvEvent(String, Npc, Player)} and this implementation, then this method will never be called unless the script's {@link #onAdvEvent(String, Npc, Player)} explicitly calls this method.
-	 * @param event this parameter contains a string identifier for the event.<br>
-	 *            Generally, this string is passed directly via the link.<br>
-	 *            For example:<br>
-	 *            <code>
-	 *            &lt;a action="bypass -h Quest 626_ADarkTwilight 31517-01.htm"&gt;hello&lt;/a&gt;
-	 *            </code><br>
-	 *            The above link sets the event variable to "31517-01.htm" for the quest 626_ADarkTwilight.<br>
-	 *            In the case of timers, this will be the name of the timer.<br>
-	 *            This parameter serves as a sort of identifier.
-	 * @param qs this parameter contains a reference to the quest state of the player who used the link or started the timer.
-	 * @return the text returned by the event (may be {@code null}, a filename or just text)
-	 */
-	public String onEvent(String event, QuestState qs)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return null;
 	}
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java
index 3246831bf4..62d6ebb211 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java
@@ -47,7 +47,7 @@ public class Herphah extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java
index 235fd9d2a3..086f8aeab5 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java
@@ -47,7 +47,7 @@ public class Penny extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java
index 2ab35f83dc..6740fe6383 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java
@@ -46,7 +46,7 @@ public class Ruine extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
index e85df039b0..0ebae68471 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
@@ -73,7 +73,7 @@ public class AncientArcanCity extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CHANGE_STATE"))
 		{
@@ -107,7 +107,7 @@ public class AncientArcanCity extends AbstractNpcAI
 				cat.broadcastSocialAction(2);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
index d76c158f9e..d38ceb917e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
@@ -42,7 +42,7 @@ public class Lykus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
index 4fd3e87bb7..92979a713e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
@@ -39,7 +39,7 @@ public class Mumu extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
index 56ceed0cda..34c3cc9100 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
@@ -329,7 +329,7 @@ public class AteliaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/AteliaFortress/TeleportDevice/TeleportDevice.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/AteliaFortress/TeleportDevice/TeleportDevice.java
index 9ea87d2149..7ff361c8e1 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/AteliaFortress/TeleportDevice/TeleportDevice.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/AteliaFortress/TeleportDevice/TeleportDevice.java
@@ -45,7 +45,7 @@ public class TeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player.getFactionLevel(Faction.KINGDOM_ROYAL_GUARDS) < 3)
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java
index e589643825..af3454fafd 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java
@@ -62,7 +62,7 @@ public class AteliaRefinery extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
index c87c4e9224..a2a2891b57 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
@@ -56,7 +56,7 @@ public class BabyPets extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("HEAL") && (player != null))
 		{
@@ -78,7 +78,7 @@ public class BabyPets extends AbstractNpcAI
 				cancelQuestTimer("HEAL", null, player);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGOUT)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
index b0153ef5da..f0f610c8b9 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
@@ -56,7 +56,7 @@ public class ImprovedBabyPets extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player != null)
 		{
@@ -108,7 +108,7 @@ public class ImprovedBabyPets extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
index 6b4a147550..301899a76f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
@@ -42,7 +42,7 @@ public class Tunatun extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/BlackbirdCampsite/BlackbirdCampsite.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/BlackbirdCampsite/BlackbirdCampsite.java
index 8940c4c672..984a0abd2e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/BlackbirdCampsite/BlackbirdCampsite.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/BlackbirdCampsite/BlackbirdCampsite.java
@@ -48,7 +48,7 @@ public class BlackbirdCampsite extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -81,7 +81,7 @@ public class BlackbirdCampsite extends AbstractNpcAI
 				return "34434-5.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java
index f6485e07b4..2693ef7a00 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java
@@ -48,7 +48,7 @@ public class Alarm extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Player player0 = npc.getVariables().getObject("player0", Player.class);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
index a2b4810dfa..ad01bdba4a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
@@ -46,14 +46,14 @@ public class CrumaTower extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("MESSAGE") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_GO_TO_UNDERGROUND_LV_3_USING_THE_ELEVATOR_IN_THE_BACK);
 			startQuestTimer(event, 15000, npc, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
index 7cab0d9caf..9ac87f3024 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
@@ -77,7 +77,7 @@ public class FrightenedRagnaOrc extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
index ee5d44d59e..db9d7838fc 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
@@ -53,7 +53,7 @@ public class DragonVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("Spawn".equals(event))
 		{
@@ -104,7 +104,7 @@ public class DragonVortex extends AbstractNpcAI
 		{
 			npc.setScriptValue(0);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
index de54d68cf6..ce248d3f8f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
@@ -53,7 +53,7 @@ public class LairOfAntharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CHECK_HOME") && (npc != null) && !npc.isDead())
 		{
@@ -67,7 +67,7 @@ public class LairOfAntharas extends AbstractNpcAI
 				npc.broadcastPacket(new ValidateLocation(npc));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
index bf46d16542..c4e625c565 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
@@ -55,7 +55,7 @@ public class LeopardDragonHachling extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && event.equals("MOVE_TO_TRANSFORM"))
 		{
@@ -77,7 +77,7 @@ public class LeopardDragonHachling extends AbstractNpcAI
 				npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, nearestLocation(npc));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
index 04396d3683..6f794f4008 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
@@ -40,13 +40,13 @@ public class MercenaryCaptain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THE_EASTERN_PART_OF_DRAGON_VALLEY_IS_MUCH_MORE_DANGEROUS_THAN_THE_WEST_BE_CAREFUL));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
index 13dfbd313b..324120327b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
@@ -61,10 +61,10 @@ public class MercenaryTeleport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		player.teleToLocation(LOCATIONS.get(event), true);
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DragonValley/Namo.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
index 99057c816c..f21c497157 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
@@ -40,13 +40,13 @@ public class Namo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THIS_PLACE_SWARMS_WITH_DRAGONS_BY_DAY_AND_UNDEAD_BY_NIGHT));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
index 32c7beb400..c02404f76a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
@@ -40,13 +40,13 @@ public class Rakun extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THIS_PLACE_SWARMS_WITH_DRAGONS_BY_DAY_AND_UNDEAD_BY_NIGHT));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
index 349976c56b..cc5487971c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
@@ -72,7 +72,7 @@ public class SeparatedSoul extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LOCATIONS.containsKey(event))
 		{
@@ -98,7 +98,7 @@ public class SeparatedSoul extends AbstractNpcAI
 				return "no-items.htm";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java
index 2125fca0d8..870b8a5820 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java
@@ -50,7 +50,7 @@ public class Celestiel extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java
index 4cb6303606..8d927f12d2 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java
@@ -48,7 +48,7 @@ public class FlowerBud extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("spawn") && npc.isDead())
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
index 8ca5f0c7d4..a3b3d2da62 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
@@ -49,7 +49,7 @@ public class AltarOfSouls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -96,7 +96,7 @@ public class AltarOfSouls extends AbstractNpcAI
 				return "33920-9.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
index 47beace94a..c82e8969f1 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
@@ -41,7 +41,7 @@ public class RemembranceTower extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("action") && npc.isScriptValue(0))
 		{
@@ -54,7 +54,7 @@ public class RemembranceTower extends AbstractNpcAI
 			npc.setScriptValue(0);
 			npc.broadcastPacket(new OnEventTrigger(EMMITER_ID, false));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
index 39625630cd..0d3824cd68 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
@@ -60,7 +60,7 @@ public class LargeCocoon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -138,7 +138,7 @@ public class LargeCocoon extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
index d4a9137f8d..20aad104b0 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
@@ -41,7 +41,7 @@ public class KrateisCube extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
index 54f813c829..c1de7e5630 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
@@ -365,7 +365,7 @@ public class TalentShow extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((event == null) || event.isEmpty())
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
index 099500e9bb..8dea4780a1 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
@@ -41,7 +41,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -54,7 +54,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 				npc.deleteMe();
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_DAY_NIGHT_CHANGE)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
index 8029a17703..20dfae5ccf 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
@@ -88,7 +88,7 @@ public class ForgeOfTheGods extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
index ba045bd19c..39fcc5a8d7 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
@@ -84,7 +84,7 @@ public class Rooney extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport") && !npc.isDecayed())
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
index a3bc5828d9..40c8ad2e0d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
@@ -87,7 +87,7 @@ public class GainakSiege extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("GAINAK_WAR"))
 		{
@@ -129,7 +129,7 @@ public class GainakSiege extends AbstractNpcAI
 				ZoneManager.getInstance().getZoneById(GAINAK_TOWN_ZONE.getId(), PeaceZone.class).setEnabled(false);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
index 27e969e0c9..955c7ddd25 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
@@ -46,7 +46,7 @@ public class Lailly extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
index 35274b2de7..ca8919593a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
@@ -128,7 +128,7 @@ public class TavernEmployee extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
index c99c7cdf42..0ff79c4f5d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
@@ -76,7 +76,7 @@ public class Apherus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("buff"))
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
index 06a75493ac..d7944dd6f3 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
@@ -40,7 +40,7 @@ public class ApherusLookout extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		if (event.equals("open_bag"))
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
index e984558e2c..0d30623e93 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
@@ -48,7 +48,7 @@ public class GardenWatchman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -78,7 +78,7 @@ public class GardenWatchman extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
index 02b6a47091..42752aea0c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
@@ -42,7 +42,7 @@ public class GenesisVines extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CAST_SKILL") && npc.isScriptValue(1))
 		{
@@ -58,7 +58,7 @@ public class GenesisVines extends AbstractNpcAI
 			npc.setScriptValue(0);
 			npc.deleteMe();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
index 3216884d13..ab0d91e3cd 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
@@ -53,7 +53,7 @@ public class Statues extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("fight"))
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfSpirits/Belas/Belas.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfSpirits/Belas/Belas.java
index 526cfce78f..00cfa7a674 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfSpirits/Belas/Belas.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfSpirits/Belas/Belas.java
@@ -44,7 +44,7 @@ public class Belas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfSpirits/Dinford/Dinford.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfSpirits/Dinford/Dinford.java
index 6f9f40ec3c..742cc37560 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfSpirits/Dinford/Dinford.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfSpirits/Dinford/Dinford.java
@@ -46,7 +46,7 @@ public class Dinford extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java
index bdffef8294..386587cc49 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java
@@ -40,7 +40,7 @@ public class Eubina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
index 29ccfb6308..64246fbb51 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
@@ -46,7 +46,7 @@ public class FuryKiku extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -76,7 +76,7 @@ public class FuryKiku extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
index 7c2b546530..203f873b61 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
@@ -50,7 +50,7 @@ public class Isabella extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAWN"))
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java
index fab023bab3..5e9e8d3a57 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java
@@ -40,7 +40,7 @@ public class Rotoeh extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
index dc07df1c2f..a7ab45ea5e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
@@ -42,7 +42,7 @@ public class GiantsCave extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
index 50c14b79bb..20f3adf32d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
@@ -57,7 +57,7 @@ public class Kekropus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
index d4c54fcddd..9e41be2b4a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
@@ -82,7 +82,7 @@ public class Spirit extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -102,7 +102,7 @@ public class Spirit extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Heine/WrapGate.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
index eb934ee4dc..bd1d86a743 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
@@ -43,7 +43,7 @@ public class WrapGate extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("enter_hellbound".equals(event))
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java
index 245a039160..074991c7f8 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java
@@ -79,7 +79,7 @@ public class EnchantedMegaliths extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
index e49050b695..c4486b2670 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
@@ -39,7 +39,7 @@ public class LeonaBlackbird extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
index 888a2980ef..5923d188eb 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
@@ -60,7 +60,7 @@ public class Theorn extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
index e026f3cd57..5ef95aed5e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
@@ -47,7 +47,7 @@ public class Merlot extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/ImperialTomb/BloodySuccubus.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/ImperialTomb/BloodySuccubus.java
index 1f56178ded..2ab48d235a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/ImperialTomb/BloodySuccubus.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/ImperialTomb/BloodySuccubus.java
@@ -118,7 +118,7 @@ public class BloodySuccubus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
index 8ca61e5e9b..78ff485aca 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
@@ -218,7 +218,7 @@ public class FourSepulchers extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
index 6ea0a0760f..14c4560f16 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
@@ -43,7 +43,7 @@ public class Zenya extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
index 2b048463f8..99e8fa6078 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
@@ -63,7 +63,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -135,7 +135,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 				npc.reduceCurrentHp(500, npc, null); // poison kills Fafurion if he is not healed
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
index 2a0a8014f8..d4dc25aab8 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
@@ -47,7 +47,7 @@ public class Rignos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -90,7 +90,7 @@ public class Rignos extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
index 43e2c64226..af4b116516 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
@@ -57,7 +57,7 @@ public class HillsOfGold extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -75,7 +75,7 @@ public class HillsOfGold extends AbstractNpcAI
 			});
 			startQuestTimer("SPICULA_AGGRO", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
index edf9416113..efaf6d6bf8 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
@@ -61,7 +61,7 @@ public class AvantGarde extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
index 37f35f00f8..ac8772d975 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
@@ -108,7 +108,7 @@ public class KetraOrcSupport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
index 6c1085f7d0..f253eadcb6 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
@@ -38,13 +38,13 @@ public class El extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_USE_THE_JUMP_BOARD_TO_GET_STRAIGHT_TO_THE_2ND_FLOOR, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
index 92b4915758..085300cd9c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
@@ -47,7 +47,7 @@ public class Erda extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
@@ -113,7 +113,7 @@ public class Erda extends AbstractNpcAI
 		{
 			player.teleToLocation(CAMILLE_LOC, true);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
index 282d7a6326..debef79252 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
@@ -58,7 +58,7 @@ public class GeneralDilios extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("command_"))
 		{
@@ -87,7 +87,7 @@ public class GeneralDilios extends AbstractNpcAI
 				startQuestTimer("guard_animation_" + (value + 1), 1500, null, null);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
index 0a84cf47a0..b4dbbc74ae 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
@@ -47,7 +47,7 @@ public class Lekon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
index e4edb350d4..3cdddadb06 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
@@ -56,7 +56,7 @@ public class LindviorScene extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -109,7 +109,7 @@ public class LindviorScene extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public void scheduleNextLindviorVisit()
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
index 43c01dcd8b..8f6933b116 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
@@ -57,7 +57,7 @@ public class Nottingale extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
index 975e4a2614..b0ded82d61 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
@@ -38,13 +38,13 @@ public class Plenos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_BE_TELEPORTED_TO_EACH_SEED_IF_YOU_VOLUNTEER_WHY_NOT_TRY, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
index 18f2110178..7fc2284ccb 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
@@ -46,7 +46,7 @@ public class SeedTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -75,7 +75,7 @@ public class SeedTeleportDevice extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
index 23b5c50033..c8498cbee5 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
@@ -49,7 +49,7 @@ public class MithrilMinesTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int index = Integer.parseInt(event) - 1;
 		if (LOCS.length > index)
@@ -57,7 +57,7 @@ public class MithrilMinesTeleporter extends AbstractNpcAI
 			final Location loc = LOCS[index];
 			player.teleToLocation(loc, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
index 6f4192f837..e5abb08edb 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
@@ -84,7 +84,7 @@ public class MonasteryOfSilence extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -132,7 +132,7 @@ public class MonasteryOfSilence extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
index 9a2ee10f60..434807bd9e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
@@ -62,7 +62,7 @@ public class PaganTeleporters extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
index 7eed58ebec..1c6e6ba756 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
@@ -60,7 +60,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -90,7 +90,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI
 				instanceScript.notifyEvent(event, npc, player);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
index 9d4b3bde33..781bfa3af3 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
@@ -39,13 +39,13 @@ public class Fioren extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("startMovie"))
 		{
 			playMovie(player, Movie.SI_BARLOG_STORY);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java
index 9c52a15e19..2d6d808bad 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java
@@ -93,7 +93,7 @@ public class PlainsOfLizardman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("fantasy_mushroom") && (npc != null) && (player != null))
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
index f2332c3567..37bd258812 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
@@ -179,7 +179,7 @@ public class PrimevalIsle extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -239,7 +239,7 @@ public class PrimevalIsle extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
index 5ffc401682..6a166ec683 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
@@ -74,7 +74,7 @@ public class Kaysen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
index 619d9e57f4..ceb8d8a7b9 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
@@ -63,7 +63,7 @@ public class NervasTemporaryPrison extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
index b8b803e57f..43691cef06 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
@@ -38,14 +38,14 @@ public class RoAGuard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THIS_IS_RUINS_OF_AGONY_WHERE_KANILOV_IS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
index f3af67aba7..dd2a52bdc5 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
@@ -38,14 +38,14 @@ public class RoDGuard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THIS_IS_THE_RUINS_OF_AGONY_WHERE_POSLOF_IS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
index 5e57a9fb94..a19c1d4085 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
@@ -48,7 +48,7 @@ public class AltarOfSacrifice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("msg_text"))
 		{
@@ -68,7 +68,7 @@ public class AltarOfSacrifice extends AbstractNpcAI
 			startQuestTimer("msg_text", 135000, npc, null);
 			_jenas_guard.setScriptValue(0);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
index a025e62542..b50f530164 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
@@ -147,7 +147,7 @@ public class Venom extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
index ed4ce2d782..cd89ebcb9e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
@@ -43,7 +43,7 @@ public class Klemis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("portInside"))
 		{
@@ -56,7 +56,7 @@ public class Klemis extends AbstractNpcAI
 				return "32734-01.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
index d66782538a..c1db3c8180 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
@@ -80,7 +80,7 @@ public class Maguen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || (player == null))
 		{
@@ -163,7 +163,7 @@ public class Maguen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
index 344d65a44f..d5ab73ff74 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
@@ -48,7 +48,7 @@ public class Nemo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
index 251458ea98..ae26a6c701 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
@@ -297,7 +297,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("ChangeSeedsStatus"))
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
index d6f644fa86..765deb4a7d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
@@ -51,7 +51,7 @@ public class Seyo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (npc == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
index f213bbec6c..f62aa835e8 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
@@ -132,7 +132,7 @@ public class SelMahumDrill extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -188,7 +188,7 @@ public class SelMahumDrill extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
index 4d3891946f..4e0a01cea2 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
@@ -83,7 +83,7 @@ public class SelMahumSquad extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -189,7 +189,7 @@ public class SelMahumSquad extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
index ebf70cc5ae..6ba58ffc8e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
@@ -197,7 +197,7 @@ public class StakatoNest extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || (player == null) || npc.isDead())
 		{
@@ -225,7 +225,7 @@ public class StakatoNest extends AbstractNpcAI
 			addAttackPlayerDesire(spawned, player);
 			npc.deleteMe();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private static Monster checkMinion(Npc npc)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
index 356608d0fc..49a25ec26b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
@@ -47,7 +47,7 @@ public class StakatoNestTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int index = Integer.parseInt(event) - 1;
 		if (LOCS.length > index)
@@ -65,7 +65,7 @@ public class StakatoNestTeleporter extends AbstractNpcAI
 			}
 			player.teleToLocation(loc, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
index 4a64afbd00..ba580c2dad 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
@@ -44,7 +44,7 @@ public class Apprentice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("rideKukuru"))
 		{
@@ -61,7 +61,7 @@ public class Apprentice extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TRY_RIDING_A_KUKURI, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
index 727bf5903a..8661548dcc 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
@@ -97,7 +97,7 @@ public class AwakeningMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
index cd6185a888..8ed7701c68 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
@@ -38,7 +38,7 @@ public class Banette extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
@@ -62,7 +62,7 @@ public class Banette extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
index 87e0629227..858331ae3e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
@@ -38,13 +38,13 @@ public class Bink extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TALKING_ISLAND_VILLAGE_IS_REALLY_BEAUTIFUL, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
index e439d986ad..5d231aa00d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
@@ -45,7 +45,7 @@ public class BoyAndGirl extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_CHANGEWEAP"))
 		{
@@ -66,7 +66,7 @@ public class BoyAndGirl extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, npc.getId() == BOY ? NpcStringId.WEEE : NpcStringId.BOYS_ARE_SO_ANNOYING);
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
index ff53080809..22d19b3496 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
@@ -41,7 +41,7 @@ public class Devno extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -74,7 +74,7 @@ public class Devno extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
index a4f08b8c99..18c04b2e7e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
@@ -42,7 +42,7 @@ public class DrillSergeant extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SOCIAL_SHOW"))
 		{
@@ -66,7 +66,7 @@ public class DrillSergeant extends AbstractNpcAI
 				npc.broadcastSocialAction(socialActionId);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
index 8e3f9e5943..83363ef157 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
@@ -41,7 +41,7 @@ public class Eleve extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Eleve extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
index b8863b9963..114728632b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
@@ -44,13 +44,13 @@ public class Gagabu extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, GAGABU_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
index 44dab7df42..d490504792 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
@@ -38,14 +38,14 @@ public class Galad extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSocialAction(3);
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.OCCASIONALLY_RARE_JEWELS_OF_GIANTS_ARE_DISCOVERED_IN_THE_BEACH, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
index a0c7f71816..3a56943e20 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
@@ -52,7 +52,7 @@ public class GiantSoldiers extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
index a703c40323..b94d2f9624 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
@@ -38,7 +38,7 @@ public class GuardSoldier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -49,7 +49,7 @@ public class GuardSoldier extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(2);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
index b26d9fd748..1b0dd65c82 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
@@ -43,7 +43,7 @@ public class Hadel extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
index bdb70d1f2d..d7ff70d9a0 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
@@ -38,7 +38,7 @@ public class Handermonkey extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE") && (npc != null))
 		{
@@ -54,7 +54,7 @@ public class Handermonkey extends AbstractNpcAI
 				npc.broadcastSocialAction(9);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
index b8370bffe7..5ea0569424 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
@@ -60,7 +60,7 @@ public class Hardin extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = getHtmlMessage(player);
 		if (htmltext != null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
index a8bded51f1..536ee7f5cd 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
@@ -58,7 +58,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("HARNAK_SPAWN"))
 		{
@@ -70,7 +70,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
 				_templates.forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName), null));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private static class zoneInfo
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
index 3c2080e85a..03dca71bb5 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
@@ -55,13 +55,13 @@ public class HurnakMobMsg extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("ATTACK"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomEntry(ON_ATTACK_MSG));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
index 81f6617329..7055381eab 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
@@ -38,14 +38,14 @@ public class Hera extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomBoolean() ? NpcStringId.DOES_THE_GODDESS_SEE_WHAT_SHE_HAS_DONE : NpcStringId.WHY_HAVE_THE_HEROES_ABANDONED_US);
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
index 7003ad014d..2b6a1a1e51 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
@@ -38,7 +38,7 @@ public class Heymond extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
@@ -62,7 +62,7 @@ public class Heymond extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
index 52ce99be7f..8033f3c1ec 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
@@ -38,7 +38,7 @@ public class Holly extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -48,7 +48,7 @@ public class Holly extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(6);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
index 3f9141b931..e11490debc 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
@@ -41,7 +41,7 @@ public class Karonf extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Karonf extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
index 597cfd80f2..c102b0cc4c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
@@ -44,7 +44,7 @@ public class Luderic extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -54,7 +54,7 @@ public class Luderic extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(1);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
index 0c07720a0a..08de6143f0 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
@@ -45,13 +45,13 @@ public class Lumi extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, LUMI_SHOUT[getRandom(3)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
index 68b2789416..3bdb8de60b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
@@ -38,13 +38,13 @@ public class Mahram extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.ALCHEMY_IS_A_SCIENCE_AND_AN_ART, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
index e00fd6c98c..85117713a0 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
@@ -38,13 +38,13 @@ public class Mai extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EVERY_RACE_BUILT_A_PIECE_OF_THIS_VILLAGE, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
index dcd47a9822..2d44f1568a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
@@ -38,13 +38,13 @@ public class MarinSmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.HMM_IS_THIS_STILL_A_DECENT_WEAPON, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
index d5e5496e16..0d4e8f79e3 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
@@ -41,7 +41,7 @@ public class Marsha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Marsha extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
index aa9eb0eb87..81bc246742 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
@@ -43,7 +43,7 @@ public class Milia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("gludioAirship"))
 		{
@@ -53,7 +53,7 @@ public class Milia extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SPEAK_WITH_ME_ABOUT_TRAVELING_AROUND_ADEN, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
index b1e037eb5a..933c139b8c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
@@ -64,7 +64,7 @@ public class MonkOfChaos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
index f6cd83883a..0bedb09eb6 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
@@ -41,7 +41,7 @@ public class Morgan extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Morgan extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
index e7ce45a4e5..fd5e025cd2 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
@@ -40,7 +40,7 @@ public class Oris extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SOCIAL_ACTION_1"))
 		{
@@ -55,7 +55,7 @@ public class Oris extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_HAVEN_T_FELT_THIS_GOOD_IN_AGES, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
index 328de6a4df..34ae4f55b6 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
@@ -49,7 +49,7 @@ public class Pantheon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
index 869ebf3119..e44fe2e373 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
@@ -152,7 +152,7 @@ public class Raina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
index 4c8862c733..8d66a71766 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
@@ -41,7 +41,7 @@ public class Rubentis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Rubentis extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
index d5c86cee97..87e1df4a6b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
@@ -38,14 +38,14 @@ public class Ruks extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomBoolean() ? NpcStringId.THE_SEVEN_SIGNS_ENDED : NpcStringId.WE_NEED_TO_FIND_HER_WEAKNESS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
index cc9a63c666..880532e52c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
@@ -38,13 +38,13 @@ public class Sebion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TIS_A_SCRATCH, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
index fa3cc06633..4b05120bde 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
@@ -38,13 +38,13 @@ public class Shannon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.LOOK_AT_ALL_THE_NEWBIES_HA_HA_HA, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
index 219ac48515..7fd067c374 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
@@ -44,13 +44,13 @@ public class Sodian extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, SODIAN_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
index e11dfb9aaf..8413c93bc8 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
@@ -44,13 +44,13 @@ public class Stiller extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, STILLER_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
index b10f044196..d196091a8e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
@@ -38,13 +38,13 @@ public class Theodore extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.AND_NOW_YOUR_JOURNEY_BEGINS, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
index 4290aa8fc6..8e4f8ed738 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
@@ -38,7 +38,7 @@ public class TomaJunior extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -49,7 +49,7 @@ public class TomaJunior extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(6);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java
index 219f1f4879..1e4bdb3ff1 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java
@@ -48,7 +48,7 @@ public class Toyron extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true);
 		if (event.equals("museum_teleport"))
@@ -62,7 +62,7 @@ public class Toyron extends AbstractNpcAI
 				player.teleToLocation(MUSEUM_OUT);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
index c3aa031317..78ce6f2c8c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
@@ -38,7 +38,7 @@ public class TrainningSoldier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -55,7 +55,7 @@ public class TrainningSoldier extends AbstractNpcAI
 			}
 			startQuestTimer("START_ATTACK", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
index 848196c047..b92e79413b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
@@ -63,7 +63,7 @@ public class Trandon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String[] substrings = event.split(" ");
 		if (substrings.length < 1)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
index 8cd3cd965d..b65bd9a7ad 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
@@ -42,7 +42,7 @@ public class YeSagiraGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -56,7 +56,7 @@ public class YeSagiraGuards extends AbstractNpcAI
 			}
 			startQuestTimer("GUARD_AGGRO", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
index 007d0e13d3..a4e0c941bd 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
@@ -88,7 +88,7 @@ public class YeSegiraTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LOCATIONS.containsKey(event))
 		{
@@ -111,7 +111,7 @@ public class YeSegiraTeleportDevice extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_PLAYER_CREATE)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java
index e546cbc086..be903e83d2 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java
@@ -87,7 +87,7 @@ public class ToIVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int npcId = npc.getId();
 		
@@ -133,7 +133,7 @@ public class ToIVortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
index 2c8e967539..4bb6be2086 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
@@ -40,7 +40,7 @@ public class Acateo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("give_circlet"))
 		{
@@ -51,7 +51,7 @@ public class Acateo extends AbstractNpcAI
 			giveItems(player, ACADEMY_CIRCLET, 1);
 			return "33905-2.html";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TownOfGoddard/Cerenas/Cerenas.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TownOfGoddard/Cerenas/Cerenas.java
index 4b87f5ec09..f2df150f21 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TownOfGoddard/Cerenas/Cerenas.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TownOfGoddard/Cerenas/Cerenas.java
@@ -41,7 +41,7 @@ public class Cerenas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(Q10369_NoblesseSoulTesting.class.getSimpleName());
 		String htmltext = null;
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
index 949fb8f279..48ca778074 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
@@ -108,7 +108,7 @@ public class VarkaSilenosSupport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
index b7fb571500..3a94d3d378 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
@@ -43,7 +43,7 @@ public class ElmoredenServantsGhost extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("teleport1") || event.equals("teleport2"))
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
index 427084ea7a..150fee7dfb 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
@@ -83,7 +83,7 @@ public class Wastelands extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || !npc.isSpawned())
 		{
@@ -184,7 +184,7 @@ public class Wastelands extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
index 61678a5cb2..5e24c8040c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
@@ -47,7 +47,7 @@ public class ZealotOfShilen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -75,7 +75,7 @@ public class ZealotOfShilen extends AbstractNpcAI
 			}
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
index 2da266ca0e..ab6a6ebc3e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
@@ -38,14 +38,14 @@ public class Commando extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.WE_RE_COLLECTING_SEEKER_OF_ADEN);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Anais/Anais.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Anais/Anais.java
index 74fe879672..823d08142f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Anais/Anais.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Anais/Anais.java
@@ -75,7 +75,7 @@ public class Anais extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -134,7 +134,7 @@ public class Anais extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
index a4a93ce801..97936f1ddc 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
@@ -114,7 +114,7 @@ public class Anakim extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -187,7 +187,7 @@ public class Anakim extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Anakim/AnakimBoss.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Anakim/AnakimBoss.java
index e082cf6354..d3b785f7e1 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Anakim/AnakimBoss.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Anakim/AnakimBoss.java
@@ -51,7 +51,7 @@ public class AnakimBoss extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -64,7 +64,7 @@ public class AnakimBoss extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Anakim/AnakimElitePriest.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Anakim/AnakimElitePriest.java
index 21f3ff12cb..8511577c7b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Anakim/AnakimElitePriest.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Anakim/AnakimElitePriest.java
@@ -46,7 +46,7 @@ public class AnakimElitePriest extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -59,7 +59,7 @@ public class AnakimElitePriest extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index d236e19d43..a5157acfc7 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -193,7 +193,7 @@ public class Antharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -605,7 +605,7 @@ public class Antharas extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 0fea286d69..e6080d34c6 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -164,7 +164,7 @@ public class Baium extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -478,7 +478,7 @@ public class Baium extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
index 992eae3c7c..7bea095520 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
@@ -105,7 +105,7 @@ public class BalokWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -115,7 +115,7 @@ public class BalokWarzone extends AbstractInstance
 				takeItems(player, PRISON_KEY, -1);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
index 82eb8ff86d..eac165de8b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
@@ -72,7 +72,7 @@ public class BaylorWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -124,7 +124,7 @@ public class BaylorWarzone extends AbstractInstance
 				player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index b5a24845bb..3748875859 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -126,7 +126,7 @@ public class Beleth extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -536,7 +536,7 @@ public class Beleth extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
index e2770b5bec..b768e563e9 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
@@ -49,7 +49,7 @@ public class Wormhole extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Camille/Camille.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Camille/Camille.java
index 24757df47d..ee0ad1539f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Camille/Camille.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Camille/Camille.java
@@ -54,7 +54,7 @@ public class Camille extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class Camille extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Core/Core.java
index 344ad52a0a..34584c31c3 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -143,7 +143,7 @@ public class Core extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
@@ -162,7 +162,7 @@ public class Core extends AbstractNpcAI
 			_minions.forEach(Attackable::decayMe);
 			_minions.clear();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Cyrax/Cyrax.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Cyrax/Cyrax.java
index 3cf963c685..b5a3be172b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Cyrax/Cyrax.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Cyrax/Cyrax.java
@@ -48,7 +48,7 @@ public class Cyrax extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -61,7 +61,7 @@ public class Cyrax extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Cyrax/TempleEliteWizard.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Cyrax/TempleEliteWizard.java
index 1b68f87df9..33d0e6b941 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Cyrax/TempleEliteWizard.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Cyrax/TempleEliteWizard.java
@@ -44,7 +44,7 @@ public class TempleEliteWizard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleEliteWizard extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/ChoirOfDarkness.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/ChoirOfDarkness.java
index c07620df2f..22735a6228 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/ChoirOfDarkness.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/ChoirOfDarkness.java
@@ -44,7 +44,7 @@ public class ChoirOfDarkness extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class ChoirOfDarkness extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/Etina.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/Etina.java
index 21647bc333..3f20e07ce9 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/Etina.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/Etina.java
@@ -47,7 +47,7 @@ public class Etina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -60,7 +60,7 @@ public class Etina extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
index e7275b843f..47455b4c67 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
@@ -348,7 +348,7 @@ public class EtisVanEtina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -515,7 +515,7 @@ public class EtisVanEtina extends AbstractNpcAI
 			}
 			
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private void clean()
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleDarkJudge.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleDarkJudge.java
index 609abafe5c..c89586710f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleDarkJudge.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleDarkJudge.java
@@ -44,7 +44,7 @@ public class GreatTempleDarkJudge extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class GreatTempleDarkJudge extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleSoulGuide.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleSoulGuide.java
index 7ffe33d918..a08a1c79c2 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleSoulGuide.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleSoulGuide.java
@@ -44,7 +44,7 @@ public class GreatTempleSoulGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class GreatTempleSoulGuide extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/JudgeOfHeresy.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/JudgeOfHeresy.java
index acfba50e7d..a9e53959c5 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/JudgeOfHeresy.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/JudgeOfHeresy.java
@@ -44,7 +44,7 @@ public class JudgeOfHeresy extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class JudgeOfHeresy extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/Kain.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/Kain.java
index 8c81abebe3..7b910760fd 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/Kain.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/Kain.java
@@ -46,7 +46,7 @@ public class Kain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -59,7 +59,7 @@ public class Kain extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/LiberatorOfLust.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/LiberatorOfLust.java
index 081d00456a..628d8f4399 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/LiberatorOfLust.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/LiberatorOfLust.java
@@ -44,7 +44,7 @@ public class LiberatorOfLust extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class LiberatorOfLust extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/SeekerOfDespair.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/SeekerOfDespair.java
index 4cb190b064..b9fadc44ad 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/SeekerOfDespair.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/SeekerOfDespair.java
@@ -44,7 +44,7 @@ public class SeekerOfDespair extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class SeekerOfDespair extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/SoulDestroyer.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/SoulDestroyer.java
index defafa1d95..7382c7e319 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/SoulDestroyer.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/SoulDestroyer.java
@@ -44,7 +44,7 @@ public class SoulDestroyer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class SoulDestroyer extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleArchon.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleArchon.java
index ba2d56ecf9..85dc410977 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleArchon.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleArchon.java
@@ -44,7 +44,7 @@ public class TempleArchon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleArchon extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleDarkWizard.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleDarkWizard.java
index c92187c67e..ff892ea50e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleDarkWizard.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleDarkWizard.java
@@ -44,7 +44,7 @@ public class TempleDarkWizard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleDarkWizard extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleFlameMaster.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleFlameMaster.java
index 57a930ddd5..341a3663b7 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleFlameMaster.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleFlameMaster.java
@@ -44,7 +44,7 @@ public class TempleFlameMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleFlameMaster extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleHighPriest.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleHighPriest.java
index df735b07c3..df68ee43c3 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleHighPriest.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleHighPriest.java
@@ -44,7 +44,7 @@ public class TempleHighPriest extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleHighPriest extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Fafurion/EliteWizard.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Fafurion/EliteWizard.java
index e776d5739f..2b85d8c0e0 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Fafurion/EliteWizard.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Fafurion/EliteWizard.java
@@ -44,7 +44,7 @@ public class EliteWizard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class EliteWizard extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
index a7388f6ffc..5b7563d8e5 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
@@ -104,7 +104,7 @@ public class Fafurion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Fafurion/FafurionBoss.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Fafurion/FafurionBoss.java
index d297cd7906..eb953be1a0 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Fafurion/FafurionBoss.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Fafurion/FafurionBoss.java
@@ -60,7 +60,7 @@ public class FafurionBoss extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -73,7 +73,7 @@ public class FafurionBoss extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
index 859e6fc695..ed664b4197 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
@@ -65,7 +65,7 @@ public class IceQueensCastle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class IceQueensCastle extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
index a07501ed22..9f3772a47d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
@@ -160,7 +160,7 @@ public class IceQueensCastleBattle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterEasy"))
 		{
@@ -700,7 +700,7 @@ public class IceQueensCastleBattle extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
index 7fa44d08d6..21e250c482 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
@@ -45,7 +45,7 @@ public class Jinia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
index 5bc0aacffb..b17d1828c5 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
@@ -165,7 +165,7 @@ public class LastImperialTomb extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
index 282b9f8fbc..254c891bc5 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
@@ -62,7 +62,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Helios/Helios.java
index d6de973ec6..8288e0626c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Helios/Helios.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Helios/Helios.java
@@ -320,7 +320,7 @@ public class Helios extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Helios/Helios1.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Helios/Helios1.java
index 7eb394719d..5d2364fbc0 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Helios/Helios1.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Helios/Helios1.java
@@ -45,7 +45,7 @@ public class Helios1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -58,7 +58,7 @@ public class Helios1 extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Helios/Helios2.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Helios/Helios2.java
index 2147bd52c0..abe0cc400e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Helios/Helios2.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Helios/Helios2.java
@@ -45,7 +45,7 @@ public class Helios2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -58,7 +58,7 @@ public class Helios2 extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Helios/Helios3.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Helios/Helios3.java
index 364dce85de..8e293ad2a4 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Helios/Helios3.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Helios/Helios3.java
@@ -46,7 +46,7 @@ public class Helios3 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -59,7 +59,7 @@ public class Helios3 extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java
index 404237e0fa..29b64fa20b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java
@@ -44,7 +44,7 @@ public class RoyalArchmageMinion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class RoyalArchmageMinion extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
index e4260628ce..d61884c91b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
@@ -92,7 +92,7 @@ public class IstinaCavern extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance instance = npc.getInstanceWorld();
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
index 27728f34c1..f1945e2def 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
@@ -40,7 +40,7 @@ public class Rumiese extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
index b94d17f47b..ae0e6aaef9 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
@@ -141,7 +141,7 @@ public class Kelbim extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -281,7 +281,7 @@ public class Kelbim extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
index 9f677053b2..c3e066a466 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
@@ -137,7 +137,7 @@ public class KimerianCommon extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance instance = npc.getInstanceWorld();
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
index 9199e144f3..a037e718d9 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
@@ -113,7 +113,7 @@ public class Lilith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -187,7 +187,7 @@ public class Lilith extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lilith/LilithBoss.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lilith/LilithBoss.java
index e0d6b0f02c..9ce319723c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lilith/LilithBoss.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lilith/LilithBoss.java
@@ -51,7 +51,7 @@ public class LilithBoss extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -64,7 +64,7 @@ public class LilithBoss extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lilith/LilithEliteShaman.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lilith/LilithEliteShaman.java
index bfe6a2aff9..cdd63a05f9 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lilith/LilithEliteShaman.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lilith/LilithEliteShaman.java
@@ -47,7 +47,7 @@ public class LilithEliteShaman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -60,7 +60,7 @@ public class LilithEliteShaman extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/LimitBarrier.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/LimitBarrier.java
index 8687d3d796..5421f2edb3 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/LimitBarrier.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/LimitBarrier.java
@@ -113,7 +113,7 @@ public class LimitBarrier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -142,7 +142,7 @@ public class LimitBarrier extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
index 5b16c333e2..ced833a889 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
@@ -49,7 +49,7 @@ public class KatoSicanus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
index 2bd8aeb2c6..7dacdd2c16 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
@@ -674,7 +674,7 @@ public class Lindvior extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
index 73d5d88407..f676f620a3 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
@@ -49,7 +49,7 @@ public class Vortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -110,7 +110,7 @@ public class Vortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java
index 190f1ce9ea..02f57b1bd5 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java
@@ -59,7 +59,7 @@ public class Lydia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
index 49a224c8bc..8c7d0eb77d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
@@ -122,7 +122,7 @@ public class OctavisWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -146,7 +146,7 @@ public class OctavisWarzone extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 9a58c9f1b7..6eda44726f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -145,7 +145,7 @@ public class Orfen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -201,7 +201,7 @@ public class Orfen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 93735c996b..72e174bb65 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -155,7 +155,7 @@ public class QueenAnt extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -239,7 +239,7 @@ public class QueenAnt extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
index 7a3322b68a..297948d172 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
@@ -53,7 +53,7 @@ public class QueenShyeed extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java
index 8304e07d78..80a048214d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java
@@ -149,7 +149,7 @@ public class Ramona extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -377,7 +377,7 @@ public class Ramona extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
index ad87d93fe0..20e1572d8a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
@@ -80,7 +80,7 @@ public class Sailren extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -249,7 +249,7 @@ public class Sailren extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
index 4eeb4da057..b11aa4de6a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
@@ -73,7 +73,7 @@ public class Cannon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
index f754206b22..45b4c89ee7 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
@@ -62,7 +62,7 @@ public class TautiWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -170,7 +170,7 @@ public class TautiWarzone extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
index 50da94c8b2..f973bf0e12 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
@@ -182,7 +182,7 @@ public class TeredorWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
index 7b07413999..63b2c0589a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
@@ -507,7 +507,7 @@ public class Stage1 extends AbstractInstance implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
index 70d36f9c61..d2abf63365 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
@@ -50,7 +50,7 @@ public class Daichir extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterEarthWyrnCave"))
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
index e69a688d77..2c365d7f61 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
@@ -570,7 +570,7 @@ public class Trasken extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -694,7 +694,7 @@ public class Trasken extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index 74f7b64063..4eaf667f0a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -191,7 +191,7 @@ public class Valakas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -380,7 +380,7 @@ public class Valakas extends AbstractNpcAI
 		{
 			BOSS_ZONE.oustAllPlayers();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
index a211f7bfc0..bae4d63898 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
@@ -172,7 +172,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter60"))
 		{
@@ -254,7 +254,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/AdenReconstructorManager.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
index efa4bfa6ca..65a08050b6 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
@@ -42,7 +42,7 @@ public class AdenReconstructorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -67,7 +67,7 @@ public class AdenReconstructorManager extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
index 2dec85bd94..c31f5c0175 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
@@ -141,7 +141,7 @@ public class AdventureGuildsman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
index 10cc49b753..df1b1d03ca 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
@@ -63,7 +63,7 @@ public class AdventurersGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
index c5ed73b2c2..7d81da92e1 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
@@ -51,7 +51,7 @@ public class AlchemistManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index b939ece983..849ed827d3 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -63,7 +63,7 @@ public class ArenaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -128,7 +128,7 @@ public class ArenaManager extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/BalthusKnights/Monsters/GemDragon/GemDragon.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/BalthusKnights/Monsters/GemDragon/GemDragon.java
index 69554e90a1..de35fff281 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/BalthusKnights/Monsters/GemDragon/GemDragon.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/BalthusKnights/Monsters/GemDragon/GemDragon.java
@@ -88,7 +88,7 @@ public final class GemDragon extends AbstractNpcAI
 				{
 					ThreadPool.schedule(() ->
 					{
-						instance.onAdvEvent("continueGemDragonsAttack", npc, killer);
+						instance.onEvent("continueGemDragonsAttack", npc, killer);
 					}, 4000); // 4 sec
 					
 				}
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
index 1c51b94358..352c31c8fc 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
@@ -38,7 +38,7 @@ public class BlackJudge extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("weakenBreath"))
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
index f60e97cf82..48dbb36fbf 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
@@ -42,7 +42,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equals("31092-01.html") || event.equals("31092-05.html"))
@@ -79,7 +79,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 			giveAdena(player, count, false);
 			return "31092-04.html";
 		}
-		return super.onAdvEvent(htmltext, npc, player);
+		return super.onEvent(htmltext, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
index 6a44d63e0b..81e90f2d67 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
@@ -56,7 +56,7 @@ public class CastleAmbassador extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
index b07792cd2d..11b8786523 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
@@ -57,7 +57,7 @@ public class CastleBlacksmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return (event.equalsIgnoreCase(npc.getId() + "-02.html") && hasRights(player, npc)) ? event : null;
 	}
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
index 355012ffea..5385531356 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
@@ -393,7 +393,7 @@ public class CastleChamberlain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Castle castle = npc.getCastle();
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
index 3e2cd16930..4a8fac8c0e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
@@ -140,7 +140,7 @@ public class CastleCourtMagician extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player.getClan() == null) && (player.getClanId() != npc.getCastle().getOwnerId()))
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
index b9c1f3faf5..70bae86615 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
@@ -72,7 +72,7 @@ public class CastleDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
index bb32dde319..a319e3977f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
@@ -56,7 +56,7 @@ public class CastleMercenaryManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index ac71c1afad..0e8137bb1d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -78,7 +78,7 @@ public class CastleTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
@@ -168,7 +168,7 @@ public class CastleTeleporter extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
index bffed40bcc..ea1b40c41c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
@@ -52,7 +52,7 @@ public class CastleWarehouse extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final boolean isMyLord = player.isClanLeader() && (player.getClan().getCastleId() == (npc.getCastle() != null ? npc.getCastle().getResidenceId() : -1));
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index e8d1c84950..e84e7c9e49 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -64,7 +64,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
index a86581206e..afd7250ca4 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
@@ -57,7 +57,7 @@ public class ClanHallDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 8e2969fe49..188fe77edb 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -105,7 +105,7 @@ public class ClanHallManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
index 1d8e114daa..77845525b2 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
@@ -68,7 +68,7 @@ public class ClanTrader extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 15e3e030f1..0a22c1333d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -235,7 +235,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		if (!_isEnabled)
 		{
@@ -936,7 +936,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	{
 		if (event.getCommand().startsWith("Quest ClassMaster "))
 		{
-			final String html = onAdvEvent(event.getCommand().substring(18), null, event.getPlayer());
+			final String html = onEvent(event.getCommand().substring(18), null, event.getPlayer());
 			event.getPlayer().sendPacket(TutorialCloseHtml.STATIC_PACKET);
 			showResult(event.getPlayer(), html);
 		}
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
index 21aafa7e87..7b61214c91 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
@@ -43,7 +43,7 @@ public class CrimsonHatuOtis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -69,7 +69,7 @@ public class CrimsonHatuOtis extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java
index e1f6de3c80..c66ba04bfe 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java
@@ -73,7 +73,7 @@ public class DimensionalMerchant extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/DivineBeast.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/DivineBeast.java
index 1f247a7b35..3f3a076992 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/DivineBeast.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/DivineBeast.java
@@ -44,7 +44,7 @@ public class DivineBeast extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player == null) || !player.hasServitors())
 		{
@@ -55,7 +55,7 @@ public class DivineBeast extends AbstractNpcAI
 			cancelQuestTimer(event, npc, player);
 			player.getServitors().values().forEach(summon -> summon.unSummon(player));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/EnergySeeds.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/EnergySeeds.java
index 509c12bbeb..befbad7bff 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/EnergySeeds.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/EnergySeeds.java
@@ -196,7 +196,7 @@ public class EnergySeeds extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("StartSoDAi"))
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/FameManager/FameManager.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/FameManager/FameManager.java
index d4f16a9b96..b0a7bc0a20 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/FameManager/FameManager.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/FameManager/FameManager.java
@@ -49,7 +49,7 @@ public class FameManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
index 79742f7171..c5a075fbcf 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
@@ -69,7 +69,7 @@ public class FortressSiegeManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
index 344d4c5547..db32dd6f2b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
@@ -67,7 +67,7 @@ public class HealerTrainer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
index 94b2f5f16d..2b2e0d3c40 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
@@ -89,7 +89,7 @@ public class HermuncusMinion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(eventValue, " ");
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
index 2928fbd023..abe98a50e5 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
@@ -47,7 +47,7 @@ public class LaVieEnRose extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/Mammons/Mammons.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/Mammons/Mammons.java
index 3ff005b72b..f58c7b8b86 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/Mammons/Mammons.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/Mammons/Mammons.java
@@ -79,12 +79,12 @@ public class Mammons extends AbstractNpcAI
 		addTalkId(MAMMONS);
 		addFirstTalkId(MAMMONS);
 		
-		onAdvEvent("RESPAWN_MAMMONS", null, null);
+		onEvent("RESPAWN_MAMMONS", null, null);
 		startQuestTimer("RESPAWN_MAMMONS", TELEPORT_DELAY, null, null, true);
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
index 8d38a27541..6763b0367c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
@@ -71,7 +71,7 @@ public class ManorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
index a4cf9b72fd..a3508931f9 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
@@ -142,7 +142,7 @@ public class MentorGuide extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("exchange"))
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/Minigame/Minigame.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/Minigame/Minigame.java
index 6e48943e76..936ed15436 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/Minigame/Minigame.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/Minigame/Minigame.java
@@ -68,7 +68,7 @@ public class Minigame extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final MinigameRoom room = getRoomByManager(npc);
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
index b203206d7b..50e3f93113 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
@@ -79,7 +79,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/MysteriousWizard/MysteriousWizard.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/MysteriousWizard/MysteriousWizard.java
index 2c423c6490..667463de4d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/MysteriousWizard/MysteriousWizard.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/MysteriousWizard/MysteriousWizard.java
@@ -41,7 +41,7 @@ public class MysteriousWizard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return event.equals("33980-01.html") ? event : null;
 	}
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
index 4ad7e0a2fc..d3576b9fff 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
@@ -48,14 +48,14 @@ public class NornilTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("teleport_"))
 		{
 			final int locId = Integer.parseInt(event.replace("teleport_", ""));
 			player.teleToLocation(LOCATIONS[locId - 1]);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
index 899c6a356f..66831c0e4e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
@@ -66,7 +66,7 @@ public class OlyBuffer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index db559f3ca6..bc0a7630c3 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -88,7 +88,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/PrisonGuards.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/PrisonGuards.java
index 4084beddca..c79356a1f0 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/PrisonGuards.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/PrisonGuards.java
@@ -53,7 +53,7 @@ public class PrisonGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CLEAR_STATUS"))
 		{
@@ -67,7 +67,7 @@ public class PrisonGuards extends AbstractNpcAI
 			}
 			startQuestTimer("CHECK_HOME", 30000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
index 21d281c6c9..435f293345 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
@@ -84,7 +84,7 @@ public class Proclaimer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("giveBuff"))
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
index 8b3515e12b..83098c1eaf 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
@@ -79,7 +79,7 @@ public class ProvisionalHalls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/Servitors/SinEater.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/Servitors/SinEater.java
index 1ed8d645a5..d7536614e8 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/Servitors/SinEater.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/Servitors/SinEater.java
@@ -48,7 +48,7 @@ public class SinEater extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TALK") && (player != null) && (player.getPet() != null))
 		{
@@ -79,7 +79,7 @@ public class SinEater extends AbstractNpcAI
 			}
 			startQuestTimer("TALK", 60000, null, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_CREATURE_DEATH)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
index ec177e537e..373c64200b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
@@ -128,7 +128,7 @@ public class SupportUnitCaptain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int fortOwner = npc.getFort().getOwnerClan() == null ? 0 : npc.getFort().getOwnerClan().getId();
 		if ((player.getClan() == null) || (player.getClanId() != fortOwner))
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
index f6d1e74529..a733b87dad 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
@@ -53,7 +53,7 @@ public class SymbolMaker extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
index f9cd32a0dd..82ec9274c2 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
@@ -94,7 +94,7 @@ public class TeleportToUndergroundColiseum extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.endsWith(".htm"))
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
index dbe26ae6a3..7052b10367 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
@@ -75,7 +75,7 @@ public class TersisHerald extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("giveBuff"))
 		{
@@ -87,7 +87,7 @@ public class TersisHerald extends AbstractNpcAI
 			npc.setTarget(player);
 			npc.doCast(DRAGON_BUFF.getSkill());
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java
index 3c46f755ca..c2f0970ccc 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java
@@ -58,7 +58,7 @@ public class TrainingCamp extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (!Config.TRAINING_CAMP_ENABLE || !checkConditions(player))
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
index 8e94950d76..520a057481 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
@@ -62,7 +62,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = "";
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
index 9924fb4ace..0a6b873028 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
@@ -85,7 +85,7 @@ public class ClassTransferTalk extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/WarriorFishingBlock.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
index 56b29fee5b..78e3d1c99e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
@@ -75,7 +75,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -104,7 +104,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
index b9439eb0ec..a1878b037b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
@@ -156,7 +156,7 @@ public class WeaverOlf extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.contains("_grade_"))
 		{
@@ -185,7 +185,7 @@ public class WeaverOlf extends AbstractNpcAI
 			}
 			else
 			{
-				return super.onAdvEvent(event, npc, player);
+				return super.onEvent(event, npc, player);
 			}
 			
 			if (hasQuestItems(player, itemIds[0]))
@@ -225,7 +225,7 @@ public class WeaverOlf extends AbstractNpcAI
 			{
 				return npc.getId() + "-no.htm";
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		return event;
 	}
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index 777998cde4..48bf41ab6d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -210,7 +210,7 @@ public class WyvernManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
index 0c2e7586c9..c49be5297b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
@@ -36,7 +36,7 @@ public class DelevelManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.DELEVEL_MANAGER_ENABLED)
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
index 5eaddb78ba..76b7f1e559 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
@@ -54,7 +54,7 @@ public class FactionSystem extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class FactionSystem extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
index 8b9c676ad5..771c8a9058 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
@@ -34,7 +34,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -77,7 +77,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 				npc.broadcastInfo(); // update flag status
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
index ee7151c9c2..36f2ef411d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
@@ -68,7 +68,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("AUTOBUFF") && (npc != null) && !npc.isDead())
 		{
@@ -96,7 +96,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
 			}
 			startQuestTimer("AUTOBUFF", 30000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
index f19aa0cb6f..447c512987 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
@@ -39,7 +39,7 @@ public class NoblessMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.NOBLESS_MASTER_ENABLED)
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
index 370e9a1ced..3488295c5a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
@@ -163,7 +163,7 @@ public class Deathmatch extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
index 1eb84eca93..b92bbe7f77 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
@@ -213,7 +213,7 @@ public class Rabbits extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/events/Race/Race.java
index ff9fc462f6..6ac325ca6f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/events/Race/Race.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/events/Race/Race.java
@@ -320,7 +320,7 @@ public class Race extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 2ceed8623e..85520805ac 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -180,7 +180,7 @@ public class TvT extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
index 77c055cc79..84a2d7763d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
@@ -45,7 +45,7 @@ public class BirthOfDraco extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
index 9bc0ff9c55..87ac868dc7 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
@@ -64,7 +64,7 @@ public class CharacterBirthday extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("despawn_npc"))
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index a966bdff3e..4648d78f95 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -56,7 +56,7 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
index a8f534ca97..76c5aa611f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
@@ -73,7 +73,7 @@ public class FreyaCelebration extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("give_potion"))
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
index b45e872a60..2570ef061a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
@@ -86,7 +86,7 @@ public class GiftOfVitality extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/HappyHours/HappyHours.java
index ed84918716..9e0bc0ce91 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/HappyHours/HappyHours.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/HappyHours/HappyHours.java
@@ -49,7 +49,7 @@ public class HappyHours extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
index aa5419e179..76aaa4ab09 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
@@ -59,7 +59,7 @@ public class HeavyMedal extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		int level = checkLevel(player);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/HungryHorse/HungryHorse.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
index 646db8d92d..657ddb84b9 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
@@ -58,7 +58,7 @@ public class HungryHorse extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
index 6107af7f71..502fce9a30 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
@@ -55,7 +55,7 @@ public class HuntForSanta extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/LetterCollector/LetterCollector.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
index 744b1f2ae4..d87bd82b02 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
@@ -123,7 +123,7 @@ public class LetterCollector extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
index b71176a555..a42e986ee4 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
@@ -49,7 +49,7 @@ public class LoveYourGatekeeper extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
index c868fad2b3..6460eb4ab0 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
@@ -61,7 +61,7 @@ public class LoversJubilee extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmtext = event;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
index 7f885e818d..793aa62c17 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
@@ -68,7 +68,7 @@ public class MasterOfEnchanting extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("buy_staff"))
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/RedLibra/RedLibra.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/RedLibra/RedLibra.java
index 69414f20c6..693f2efd18 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/RedLibra/RedLibra.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/RedLibra/RedLibra.java
@@ -42,7 +42,7 @@ public class RedLibra extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
index f6c714eddc..7d3462224b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
@@ -58,7 +58,7 @@ public class RudolphsBlessing extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("rudolph_eat") && (player != null) && player.isOnline())
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
index 3f076fc92b..17ff961002 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
@@ -297,7 +297,7 @@ public class SavingSanta extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!isEventPeriod())
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
index 5c00677d25..862a8df578 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
@@ -51,7 +51,7 @@ public class ThePowerOfLove extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java
index 4256e9042d..63d91c507d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java
@@ -45,7 +45,7 @@ public class TrainingWithDandy extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
index 6696dee542..a53ca2b3a0 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
@@ -130,7 +130,7 @@ public class AltarOfShilen extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (event.equals("enterInstance"))
@@ -266,7 +266,7 @@ public class AltarOfShilen extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
index b981b80b0c..24b6fad08e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
@@ -154,7 +154,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -269,7 +269,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/AntharasNest.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/AntharasNest.java
index 5dccc8d689..9fb9d0784a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/AntharasNest.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/AntharasNest.java
@@ -56,7 +56,7 @@ public final class AntharasNest extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/FaeronVillage/FaeronVillage.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/FaeronVillage/FaeronVillage.java
index 8783eafd87..8e65bcd851 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/FaeronVillage/FaeronVillage.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/FaeronVillage/FaeronVillage.java
@@ -63,7 +63,7 @@ public final class FaeronVillage extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/HatchlingCage.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/HatchlingCage.java
index 6dda2fe250..90a084d54b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/HatchlingCage.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/HatchlingCage.java
@@ -48,7 +48,7 @@ public final class HatchlingCage extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/HatchlingNest.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/HatchlingNest.java
index 351e59ac1a..e06ac8cc55 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/HatchlingNest.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/HatchlingNest.java
@@ -49,7 +49,7 @@ public final class HatchlingNest extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/PowerOfAbelius/PowerOfAbelius.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/PowerOfAbelius/PowerOfAbelius.java
index 60c1163aee..f6c80cbf2a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/PowerOfAbelius/PowerOfAbelius.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/PowerOfAbelius/PowerOfAbelius.java
@@ -67,7 +67,7 @@ public final class PowerOfAbelius extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/PowerOfCranigg/PowerOfCranigg.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/PowerOfCranigg/PowerOfCranigg.java
index 2599222ccb..4ba72749df 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/PowerOfCranigg/PowerOfCranigg.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/PowerOfCranigg/PowerOfCranigg.java
@@ -71,7 +71,7 @@ public final class PowerOfCranigg extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/PowerOfKashnaga/PowerOfKashnaga.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/PowerOfKashnaga/PowerOfKashnaga.java
index fb9d2efe48..331002322c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/PowerOfKashnaga/PowerOfKashnaga.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/PowerOfKashnaga/PowerOfKashnaga.java
@@ -71,7 +71,7 @@ public final class PowerOfKashnaga extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/PowerOfLakcis/PowerOfLakcis.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/PowerOfLakcis/PowerOfLakcis.java
index 9f7c19e8a5..ffc0317368 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/PowerOfLakcis/PowerOfLakcis.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/PowerOfLakcis/PowerOfLakcis.java
@@ -67,7 +67,7 @@ public final class PowerOfLakcis extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/PowerOfNaviarope/PowerOfNaviarope.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/PowerOfNaviarope/PowerOfNaviarope.java
index 97129f0610..3f11ac0f8d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/PowerOfNaviarope/PowerOfNaviarope.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/PowerOfNaviarope/PowerOfNaviarope.java
@@ -67,7 +67,7 @@ public final class PowerOfNaviarope extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/PowerOfRaister/PowerOfRaister.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/PowerOfRaister/PowerOfRaister.java
index 07bdeb9c97..06b0ebf5a9 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/PowerOfRaister/PowerOfRaister.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/PowerOfRaister/PowerOfRaister.java
@@ -71,7 +71,7 @@ public final class PowerOfRaister extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/PowerOfSapyros/PowerOfSapyros.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/PowerOfSapyros/PowerOfSapyros.java
index 8e02743187..6b5a2fb419 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/PowerOfSapyros/PowerOfSapyros.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/PowerOfSapyros/PowerOfSapyros.java
@@ -71,7 +71,7 @@ public final class PowerOfSapyros extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/PowerOfSoltkreig/PowerOfSoltkreig.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/PowerOfSoltkreig/PowerOfSoltkreig.java
index ebf516a97a..17fdebdbd0 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/PowerOfSoltkreig/PowerOfSoltkreig.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/BalthusKnights/PowerOfSoltkreig/PowerOfSoltkreig.java
@@ -71,7 +71,7 @@ public final class PowerOfSoltkreig extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
index be7e723084..46b9e22b59 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
@@ -467,7 +467,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
index 1100b43aee..80911f4423 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
@@ -72,7 +72,7 @@ public class ChamberOfProphecies extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
index 4f0f2f7a19..b815b5bae7 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
@@ -177,7 +177,7 @@ public class ChamberOfDelusion extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CommandPost/CommandPost.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CommandPost/CommandPost.java
index dded4021bc..3c20d004e7 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CommandPost/CommandPost.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CommandPost/CommandPost.java
@@ -105,7 +105,7 @@ public class CommandPost extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
index ff860c70bb..c8bed455cc 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
@@ -114,13 +114,13 @@ public class CrystalCavernsCoralGarden extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
index 6db8525e11..46f3d2fdf6 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
@@ -79,13 +79,13 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
index c51b5d7887..121e3a89f4 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
@@ -135,13 +135,13 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
index 72d2fe0f6f..58eec2329b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
@@ -122,7 +122,7 @@ public class DarkCloudMansion extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
index 00241b7b77..4f4fade41e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
@@ -45,7 +45,7 @@ public class DimensionMakkum extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = getPlayerInstance(player);
 		switch (event)
@@ -69,7 +69,7 @@ public class DimensionMakkum extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
index 605b8ebdf8..981a91d4a7 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
@@ -53,13 +53,13 @@ public class DimensionalArchon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), getRandomEntry(ARCHON_MSG)));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
index 176ee5b803..9243451cde 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
@@ -53,7 +53,7 @@ public class DimensionalTrap extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || npc.isAlikeDead())
 		{
@@ -102,7 +102,7 @@ public class DimensionalTrap extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
index 4da8316b88..5b922b7ecd 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
@@ -115,7 +115,7 @@ public class DimensionalWrap extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
index 8211e90098..4d937103a7 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
@@ -45,7 +45,7 @@ public class EvasHiddenSpace extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = player.getQuestState(Q10369_NoblesseSoulTesting.class.getSimpleName());
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
index 98e2ac0c8b..a40e7e3c88 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
@@ -195,12 +195,12 @@ public class EvilIncubator extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player);
 		if ((st == null) || !st.isStarted())
 		{
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java
index 634da69955..ef4b29846d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java
@@ -69,7 +69,7 @@ public class FaeronTrainingGrounds1 extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(Q10735_ASpecialPower.class.getSimpleName());
 		String htmltext = null;
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java
index 32eb0526b8..4dd64ac3fb 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java
@@ -68,7 +68,7 @@ public class FaeronTrainingGrounds2 extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(Q10736_ASpecialPower.class.getSimpleName());
 		String htmltext = null;
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
index 6d58bd6eb4..1477e297c5 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
@@ -59,7 +59,7 @@ public class FortressOfTheDead extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/Fortuna/Fortuna.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/Fortuna/Fortuna.java
index 339328eea4..ef7b65659f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/Fortuna/Fortuna.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/Fortuna/Fortuna.java
@@ -51,7 +51,7 @@ public class Fortuna extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -472,7 +472,7 @@ public class Fortuna extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
index ef73cf3920..a205145189 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java
@@ -119,7 +119,7 @@ public class HarnakUndergroundRuins extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
index 0aa5e59df9..1716fe8afe 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
@@ -642,7 +642,7 @@ public class Kamaloka extends AbstractInstance
 	 * Handles only player's enter, single parameter - integer kamaloka index
 	 */
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java
index 7a8f1aa4b3..ef3b1ae1ba 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java
@@ -48,7 +48,7 @@ public class KaraphonHabitat extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(Q10745_TheSecretIngredients.class.getSimpleName());
 		if (qs != null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
index cccdf5d51f..4db13d5b98 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
@@ -195,7 +195,7 @@ public class KartiasLabyrinth extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -268,7 +268,7 @@ public class KartiasLabyrinth extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java
index defddc2e63..4a871ec80d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java
@@ -95,7 +95,7 @@ public class LabyrinthOfBelis extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter_instance"))
 		{
@@ -209,7 +209,7 @@ public class LabyrinthOfBelis extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java
index 0284ac988f..7f88562bc4 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java
@@ -61,7 +61,7 @@ public class MithrilMine extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -108,7 +108,7 @@ public class MithrilMine extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java
index 8477e30897..7a34ab8b3c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java
@@ -127,13 +127,13 @@ public class MuseumDungeon extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter_instance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
index f83f2fcec1..024065f4e9 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
@@ -83,7 +83,7 @@ public class MysticTavern extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
index 48ee563ff5..56d62a42d1 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
@@ -81,7 +81,7 @@ public class StoryOfFreya extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance world = npc.getInstanceWorld();
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
index e21d937eb6..d1d82fe8d7 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
@@ -107,7 +107,7 @@ public class StoryOfTauti extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		switch (event)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
index 005a9a65c0..258f50e725 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
@@ -67,7 +67,7 @@ public class NightmareKamaloka extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -132,7 +132,7 @@ public class NightmareKamaloka extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
index 68ff2fba1b..d91167b4bb 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
@@ -93,7 +93,7 @@ public class NornilsGarden extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (isInInstance(world))
@@ -157,7 +157,7 @@ public class NornilsGarden extends AbstractInstance
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/Nursery/Nursery.java
index 2e394a7446..9042632611 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/Nursery/Nursery.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/Nursery/Nursery.java
@@ -192,7 +192,7 @@ public class Nursery extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance instance = npc.getInstanceWorld();
 		if (isInInstance(instance))
@@ -269,7 +269,7 @@ public class Nursery extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
index 8ddaa9cd0f..f78f43a9dc 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
@@ -101,7 +101,7 @@ public class PailakaDevilsLegacy extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter"))
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java
index b9b2064a77..07fcb7c67b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java
@@ -139,7 +139,7 @@ public class PailakaInjuredDragon extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = player.getQuestState(Q00144_PailakaInjuredDragon.class.getSimpleName());
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
index 5f1d771719..64f2155310 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
@@ -105,7 +105,7 @@ public class PailakaRuneCastle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
index 00fb1c9096..7b25c61e9d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
@@ -63,7 +63,7 @@ public class PailakaSongOfIceAndFire extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -102,7 +102,7 @@ public class PailakaSongOfIceAndFire extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
index 422cbc96a0..48039ff29e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
@@ -173,7 +173,7 @@ public class PrisonOfDarkness extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -313,7 +313,7 @@ public class PrisonOfDarkness extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java
index c72d9b8646..da8c6e785c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java
@@ -162,7 +162,7 @@ public class SSQDisciplesNecropolisPast extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = player.getInstanceWorld();
 		if (world != null)
@@ -264,7 +264,7 @@ public class SSQDisciplesNecropolisPast extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java
index be0450dd2e..b4d398e7d9 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java
@@ -63,7 +63,7 @@ public class SSQLibraryOfSages extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = player.getInstanceWorld();
 		if (world != null)
@@ -103,7 +103,7 @@ public class SSQLibraryOfSages extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java
index e378631253..4b2f28016a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java
@@ -126,7 +126,7 @@ public class SSQMonasteryOfSilence extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = player.getInstanceWorld();
 		if (world != null)
@@ -218,7 +218,7 @@ public class SSQMonasteryOfSilence extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/SSQSanctumOftheLordsOfDawn/SSQSanctumOftheLordsOfDawn.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/SSQSanctumOftheLordsOfDawn/SSQSanctumOftheLordsOfDawn.java
index 9a84142109..863594e558 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/SSQSanctumOftheLordsOfDawn/SSQSanctumOftheLordsOfDawn.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/SSQSanctumOftheLordsOfDawn/SSQSanctumOftheLordsOfDawn.java
@@ -89,7 +89,7 @@ public class SSQSanctumOftheLordsOfDawn extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -126,7 +126,7 @@ public class SSQSanctumOftheLordsOfDawn extends AbstractInstance
 				player.teleToLocation(SAVE_POINT[npc.getScriptValue()]);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java
index dfb00caae2..d5bece244e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java
@@ -196,13 +196,13 @@ public class TaintedDimension extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java
index b0f641adfe..1c74f89fdf 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java
@@ -60,7 +60,7 @@ public class TalkingIslandPast extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -74,7 +74,7 @@ public class TalkingIslandPast extends AbstractInstance
 				teleportPlayerOut(player, world);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
index e4f0fea409..0aa8f7b0be 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
@@ -46,7 +46,7 @@ public class Q00013_ParcelDelivery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
index a9332344fe..5772a2064d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
@@ -44,7 +44,7 @@ public class Q00015_SweetWhispers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
index d825925804..37d92fabd2 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
@@ -53,7 +53,7 @@ public class Q00016_TheComingDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
index 4a1a62c19a..0e0ef5512d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
@@ -52,7 +52,7 @@ public class Q00017_LightAndDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
index c1ede03985..b885fa960d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
@@ -56,7 +56,7 @@ public class Q00031_SecretBuriedInTheSwamp extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
index ab85113705..02fd7814dd 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
@@ -64,7 +64,7 @@ public class Q00032_AnObviousLie extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
index 346e21ba51..3e17f3d69c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
@@ -53,7 +53,7 @@ public class Q00033_MakeAPairOfDressShoes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
index bb2c973b13..aea6938651 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
@@ -59,7 +59,7 @@ public class Q00034_InSearchOfCloth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player, false);
 		if (st == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
index c9b8b6e19c..c2d6566765 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
@@ -57,7 +57,7 @@ public class Q00035_FindGlitteringJewelry extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
index e3bd0e5753..73ae6c433d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
@@ -53,7 +53,7 @@ public class Q00036_MakeASewingKit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
index 78660c7498..29c1bd2863 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
@@ -54,7 +54,7 @@ public class Q00037_MakeFormalWear extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
index 5c4d3d5074..c4274aa035 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
@@ -50,7 +50,7 @@ public class Q00040_ASpecialOrder extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
index 100213b849..fe31a6ab4e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
@@ -54,7 +54,7 @@ public class Q00042_HelpTheUncle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
index 9d5f9265df..a5d1225fca 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
@@ -60,7 +60,7 @@ public class Q00043_HelpTheSister extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
index 7cc6c0f337..a13197fc21 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
@@ -55,7 +55,7 @@ public class Q00044_HelpTheSon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java
index 5768b389fd..4e93e4e1bb 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java
@@ -55,7 +55,7 @@ public class Q00061_LawEnforcement extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
index 40a4965112..c29eaa83b6 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
@@ -55,7 +55,7 @@ public class Q00115_TheOtherSideOfTruth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
index 720f90157c..7701c4bef7 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
@@ -44,7 +44,7 @@ public class Q00119_LastImperialPrince extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
index 452b42393c..e923610ac9 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
@@ -82,7 +82,7 @@ public class Q00128_PailakaSongOfIceAndFire extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java
index 8afec644ae..f60ce01f79 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java
@@ -68,7 +68,7 @@ public class Q00129_PailakaDevilsLegacy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
index 3b340ac633..7d7eeb1bf5 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
@@ -72,7 +72,7 @@ public class Q00134_TempleMissionary extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
index b16e0481cc..c9771f6f78 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
@@ -70,7 +70,7 @@ public class Q00135_TempleExecutor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
index 62a45e847c..7e8051404a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
@@ -82,7 +82,7 @@ public class Q00136_MoreThanMeetsTheEye extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
index bd8fa776f8..786030dbaa 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
@@ -66,7 +66,7 @@ public class Q00137_TempleChampionPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
index ca37a25537..6d1b504de8 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
@@ -64,7 +64,7 @@ public class Q00138_TempleChampionPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
index df1521d00e..ff220cfb81 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
@@ -59,7 +59,7 @@ public class Q00139_ShadowFoxPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
index 2a37d17413..a168e639b0 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
@@ -68,7 +68,7 @@ public class Q00140_ShadowFoxPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
index c9b1f579f9..0df4d73fda 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
@@ -63,7 +63,7 @@ public class Q00141_ShadowFoxPart3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player, false);
 		if (st == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
index 0c1af718d5..78fb0e0b32 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
@@ -73,7 +73,7 @@ public class Q00142_FallenAngelRequestOfDawn extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
index 78a954764d..9d44b1bc42 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
@@ -52,7 +52,7 @@ public class Q00143_FallenAngelRequestOfDusk extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java
index 8f024cd03b..686696b998 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java
@@ -99,7 +99,7 @@ public class Q00144_PailakaInjuredDragon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java
index f197dee99a..44145d4eed 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java
@@ -50,7 +50,7 @@ public class Q00149_PrimalMotherIstina extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java
index 04ab71a2eb..2d50cdf25e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java
@@ -49,7 +49,7 @@ public class Q00150_ExtremeChallengePrimalMotherResurrected extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
index 22ae037b8c..55261fadf8 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java
@@ -69,7 +69,7 @@ public class Q00177_SplitDestiny extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00180_InfernalFlamesBurningInCrystalPrison/Q00180_InfernalFlamesBurningInCrystalPrison.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00180_InfernalFlamesBurningInCrystalPrison/Q00180_InfernalFlamesBurningInCrystalPrison.java
index 3aadc906fe..7a005c6b00 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00180_InfernalFlamesBurningInCrystalPrison/Q00180_InfernalFlamesBurningInCrystalPrison.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00180_InfernalFlamesBurningInCrystalPrison/Q00180_InfernalFlamesBurningInCrystalPrison.java
@@ -53,7 +53,7 @@ public class Q00180_InfernalFlamesBurningInCrystalPrison extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java
index a325fcb987..d44207205c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java
@@ -54,7 +54,7 @@ public class Q00181_DevilsStrikeBackAdventOfBalok extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java
index 2c9337e950..cf6321781b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java
@@ -47,7 +47,7 @@ public class Q00183_RelicExploration extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java
index 56fa89ac7f..416ef1fbd8 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java
@@ -54,7 +54,7 @@ public class Q00184_ArtOfPersuasion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java
index f98dd20667..5a3e22a29c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java
@@ -54,7 +54,7 @@ public class Q00185_NikolasCooperation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java
index e02899fc82..bc04a591e4 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java
@@ -68,7 +68,7 @@ public class Q00186_ContractExecution extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java
index 9c540f6338..a2460cb6c8 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java
@@ -49,7 +49,7 @@ public class Q00187_NikolasHeart extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java
index 1c1777caec..47b0cf65fc 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java
@@ -52,7 +52,7 @@ public class Q00188_SealRemoval extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java
index 5af9afe0fd..68da52d09c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java
@@ -49,7 +49,7 @@ public class Q00189_ContractCompletion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java
index 898d20eee3..45237f5fde 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java
@@ -46,7 +46,7 @@ public class Q00190_LostDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java
index ebc1748aa6..5fcd0f8944 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java
@@ -49,7 +49,7 @@ public class Q00191_VainConclusion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java
index 07c28bdb93..88b7048a5f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java
@@ -52,7 +52,7 @@ public class Q00192_SevenSignsSeriesOfDoubt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
index f81be2e67f..78a292d3d9 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
@@ -66,7 +66,7 @@ public class Q00193_SevenSignsDyingMessage extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == SHILENS_EVIL_THOUGHTS) && "despawn".equals(event))
 		{
@@ -76,7 +76,7 @@ public class Q00193_SevenSignsDyingMessage extends Quest
 				npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.NEXT_TIME_YOU_WILL_NOT_ESCAPE);
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
index 63ec681f3e..1420f8b7af 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
@@ -63,7 +63,7 @@ public class Q00194_SevenSignsMammonsContract extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java
index 4c400a55b1..122ede966b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java
@@ -62,7 +62,7 @@ public class Q00195_SevenSignsSecretRitualOfThePriests extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java
index 5320deacab..129c02898e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java
@@ -60,14 +60,14 @@ public class Q00196_SevenSignsSealOfTheEmperor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == MERCHANT_OF_MAMMON) && "DESPAWN".equals(event))
 		{
 			isBusy = false;
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THE_ANCIENT_PROMISE_TO_THE_EMPEROR_HAS_BEEN_FULFILLED);
 			npc.deleteMe();
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
index 5dab25e1e5..092819fee0 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
@@ -62,7 +62,7 @@ public class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == SHILENS_EVIL_THOUGHTS) && "despawn".equals(event))
 		{
@@ -72,7 +72,7 @@ public class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
 				npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.NEXT_TIME_YOU_WILL_NOT_ESCAPE);
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
index c026781542..c1400b2fe9 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
@@ -65,7 +65,7 @@ public class Q00198_SevenSignsEmbryo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == SHILENS_EVIL_THOUGHTS) && "despawn".equals(event))
 		{
@@ -75,7 +75,7 @@ public class Q00198_SevenSignsEmbryo extends Quest
 				npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.NEXT_TIME_YOU_WILL_NOT_ESCAPE);
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java
index aaf98cd2ae..3495505fb2 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java
@@ -47,7 +47,7 @@ public class Q00210_ObtainAWolfPet extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java
index d563a46c8c..282ad1a84b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java
@@ -135,7 +135,7 @@ public class Q00254_LegendaryTales extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
index a5a6fafea2..edae9395ac 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
@@ -113,7 +113,7 @@ public class Q00337_AudienceWithTheLandDragon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
index c8a74d6b71..0bbbc76a1c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
@@ -87,7 +87,7 @@ public class Q00344_1000YearsTheEndOfLamentation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java
index ffe42d334e..be857602fe 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java
@@ -86,7 +86,7 @@ public class Q00371_ShrieksOfGhosts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
index 7c94d1b524..21013a0f4f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
@@ -120,7 +120,7 @@ public class Q00386_StolenDignity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (npc.getId() == WAREHOUSE_KEEPER_ROMP))
@@ -255,7 +255,7 @@ public class Q00386_StolenDignity extends Quest
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private String takeHtml(Player player, QuestState qs, int num)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
index b7c9cc600a..8da8dddc3b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
@@ -124,7 +124,7 @@ public class Q00420_LittleWing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
index 6390601ce2..14cbad6537 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
@@ -86,7 +86,7 @@ public class Q00421_LittleWingsBigAdventure extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
index 47fc9d7da4..ee9504f119 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
@@ -54,7 +54,7 @@ public class Q00450_GraveRobberRescue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
index 47e03b544f..e38e415a0a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
@@ -61,7 +61,7 @@ public class Q00451_LuciensAltar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
index 946e2fb51d..be55660c3e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
@@ -50,7 +50,7 @@ public class Q00452_FindingtheLostSoldiers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
index 76ba1205f5..18e37daee3 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
@@ -174,7 +174,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java
index 507820dc6a..0fd000078b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java
@@ -63,7 +63,7 @@ public class Q00454_CompletelyLost extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
index 6daf2a37e3..f67b20750b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
@@ -91,7 +91,7 @@ public class Q00455_WingsOfSand extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
index 10f2f47f73..cabd56f883 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
@@ -230,7 +230,7 @@ public class Q00456_DontKnowDontCare extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00459_TheVillainOfTheUndergroundMineTeredor/Q00459_TheVillainOfTheUndergroundMineTeredor.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00459_TheVillainOfTheUndergroundMineTeredor/Q00459_TheVillainOfTheUndergroundMineTeredor.java
index bcec6a35af..0cf6ea0dcb 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00459_TheVillainOfTheUndergroundMineTeredor/Q00459_TheVillainOfTheUndergroundMineTeredor.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00459_TheVillainOfTheUndergroundMineTeredor/Q00459_TheVillainOfTheUndergroundMineTeredor.java
@@ -51,7 +51,7 @@ public class Q00459_TheVillainOfTheUndergroundMineTeredor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00460_PreciousResearchMaterial/Q00460_PreciousResearchMaterial.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00460_PreciousResearchMaterial/Q00460_PreciousResearchMaterial.java
index fb020c3040..981ff3c14e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00460_PreciousResearchMaterial/Q00460_PreciousResearchMaterial.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00460_PreciousResearchMaterial/Q00460_PreciousResearchMaterial.java
@@ -52,7 +52,7 @@ public class Q00460_PreciousResearchMaterial extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java
index bdda5c0ff1..2092e40879 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java
@@ -71,7 +71,7 @@ public class Q00462_StuffedAncientHeroes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00465_WeAreFriends/Q00465_WeAreFriends.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00465_WeAreFriends/Q00465_WeAreFriends.java
index 52d86f67f3..af30a59f5d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00465_WeAreFriends/Q00465_WeAreFriends.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00465_WeAreFriends/Q00465_WeAreFriends.java
@@ -51,7 +51,7 @@ public class Q00465_WeAreFriends extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java
index c350641b85..3eb4b71954 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java
@@ -83,7 +83,7 @@ public class Q00466_PlacingMySmallPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00468_BeLostInTheMysteriousScent/Q00468_BeLostInTheMysteriousScent.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00468_BeLostInTheMysteriousScent/Q00468_BeLostInTheMysteriousScent.java
index d880c919e2..5b347e1276 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00468_BeLostInTheMysteriousScent/Q00468_BeLostInTheMysteriousScent.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00468_BeLostInTheMysteriousScent/Q00468_BeLostInTheMysteriousScent.java
@@ -53,7 +53,7 @@ public class Q00468_BeLostInTheMysteriousScent extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00469_SuspiciousGardener/Q00469_SuspiciousGardener.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00469_SuspiciousGardener/Q00469_SuspiciousGardener.java
index 77e00cc205..c739186b4d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00469_SuspiciousGardener/Q00469_SuspiciousGardener.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00469_SuspiciousGardener/Q00469_SuspiciousGardener.java
@@ -52,7 +52,7 @@ public class Q00469_SuspiciousGardener extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00470_DivinityProtector/Q00470_DivinityProtector.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00470_DivinityProtector/Q00470_DivinityProtector.java
index 73c7cefac0..4948dcf1ee 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00470_DivinityProtector/Q00470_DivinityProtector.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00470_DivinityProtector/Q00470_DivinityProtector.java
@@ -72,7 +72,7 @@ public class Q00470_DivinityProtector extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00471_BreakingThroughTheEmeraldSquare/Q00471_BreakingThroughTheEmeraldSquare.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00471_BreakingThroughTheEmeraldSquare/Q00471_BreakingThroughTheEmeraldSquare.java
index 78f677a640..c563bbad31 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00471_BreakingThroughTheEmeraldSquare/Q00471_BreakingThroughTheEmeraldSquare.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00471_BreakingThroughTheEmeraldSquare/Q00471_BreakingThroughTheEmeraldSquare.java
@@ -50,7 +50,7 @@ public class Q00471_BreakingThroughTheEmeraldSquare extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00472_ChallengeSteamCorridor/Q00472_ChallengeSteamCorridor.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00472_ChallengeSteamCorridor/Q00472_ChallengeSteamCorridor.java
index 69f96d292c..0d36fed463 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00472_ChallengeSteamCorridor/Q00472_ChallengeSteamCorridor.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00472_ChallengeSteamCorridor/Q00472_ChallengeSteamCorridor.java
@@ -50,7 +50,7 @@ public class Q00472_ChallengeSteamCorridor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00473_InTheCoralGarden/Q00473_InTheCoralGarden.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00473_InTheCoralGarden/Q00473_InTheCoralGarden.java
index 3331b4528f..7489bd9a3f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00473_InTheCoralGarden/Q00473_InTheCoralGarden.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00473_InTheCoralGarden/Q00473_InTheCoralGarden.java
@@ -50,7 +50,7 @@ public class Q00473_InTheCoralGarden extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00474_WaitingForTheSummer/Q00474_WaitingForTheSummer.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00474_WaitingForTheSummer/Q00474_WaitingForTheSummer.java
index 51691cc5ff..7d5a64da50 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00474_WaitingForTheSummer/Q00474_WaitingForTheSummer.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00474_WaitingForTheSummer/Q00474_WaitingForTheSummer.java
@@ -59,7 +59,7 @@ public class Q00474_WaitingForTheSummer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java
index 3890d7cd62..d98e0f6ace 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java
@@ -79,7 +79,7 @@ public class Q00476_PlainMission extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00482_RecertificationOfValue/Q00482_RecertificationOfValue.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00482_RecertificationOfValue/Q00482_RecertificationOfValue.java
index 62d524dfd3..35d3fa4406 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00482_RecertificationOfValue/Q00482_RecertificationOfValue.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00482_RecertificationOfValue/Q00482_RecertificationOfValue.java
@@ -131,7 +131,7 @@ public class Q00482_RecertificationOfValue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java
index e15e32b144..c10c564ffb 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java
@@ -68,7 +68,7 @@ public class Q00483_IntendedTactic extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00485_HotSpringWater/Q00485_HotSpringWater.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00485_HotSpringWater/Q00485_HotSpringWater.java
index a35badf96b..6b75b6753e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00485_HotSpringWater/Q00485_HotSpringWater.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00485_HotSpringWater/Q00485_HotSpringWater.java
@@ -62,7 +62,7 @@ public class Q00485_HotSpringWater extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00492_TombRaiders/Q00492_TombRaiders.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00492_TombRaiders/Q00492_TombRaiders.java
index e45ffa88ae..78553efafa 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00492_TombRaiders/Q00492_TombRaiders.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00492_TombRaiders/Q00492_TombRaiders.java
@@ -59,7 +59,7 @@ public class Q00492_TombRaiders extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java
index 8380c30732..d8b8bd9e9e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java
@@ -53,7 +53,7 @@ public class Q00493_KickingOutUnwelcomeGuests extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java
index 0f9eb53194..4084aa0142 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java
@@ -49,7 +49,7 @@ public class Q00494_IncarnationOfGreedZellakaGroup extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java
index ccf3cd1614..e3fe44aa0f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java
@@ -49,7 +49,7 @@ public class Q00495_IncarnationOfJealousyPellineGroup extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java
index 366e0d572d..94df5d6174 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java
@@ -49,7 +49,7 @@ public class Q00496_IncarnationOfGluttonyKaliosGroup extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java
index 008f69dd2f..d1580e694f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java
@@ -49,7 +49,7 @@ public class Q00497_IncarnationOfGreedZellakaSolo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java
index fe6d1060e8..9585452d7d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java
@@ -49,7 +49,7 @@ public class Q00498_IncarnationOfJealousyPellineSolo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java
index 3023aa50c3..3c2e128522 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java
@@ -49,7 +49,7 @@ public class Q00499_IncarnationOfGluttonyKaliosSolo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
index 0bfb256a66..176b40ad56 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
@@ -69,7 +69,7 @@ public class Q00500_BrothersBoundInChains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
index 8facc4a8cd..6476fcc9c3 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
@@ -71,7 +71,7 @@ public class Q00511_AwlUnderFoot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
index eab4647ba2..31444f8866 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
@@ -58,7 +58,7 @@ public class Q00512_BladeUnderFoot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00529_RegularBarrierMaintenance/Q00529_RegularBarrierMaintenance.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00529_RegularBarrierMaintenance/Q00529_RegularBarrierMaintenance.java
index 63da9995bf..96a5c26174 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00529_RegularBarrierMaintenance/Q00529_RegularBarrierMaintenance.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00529_RegularBarrierMaintenance/Q00529_RegularBarrierMaintenance.java
@@ -75,7 +75,7 @@ public final class Q00529_RegularBarrierMaintenance extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
index 0348f88e9b..f97ce90a8e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
@@ -50,7 +50,7 @@ public class Q00551_OlympiadStarter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
index 1a59edd6b7..b06358dc78 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
@@ -50,7 +50,7 @@ public class Q00553_OlympiadUndefeated extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00560_HowToOvercomeFear/Q00560_HowToOvercomeFear.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00560_HowToOvercomeFear/Q00560_HowToOvercomeFear.java
index 8652b3c9fa..ad28d45210 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00560_HowToOvercomeFear/Q00560_HowToOvercomeFear.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00560_HowToOvercomeFear/Q00560_HowToOvercomeFear.java
@@ -75,7 +75,7 @@ public final class Q00560_HowToOvercomeFear extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00561_BasicMissionHarnakUndergroundRuins/Q00561_BasicMissionHarnakUndergroundRuins.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00561_BasicMissionHarnakUndergroundRuins/Q00561_BasicMissionHarnakUndergroundRuins.java
index 53f163366e..cfa2f5bc39 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00561_BasicMissionHarnakUndergroundRuins/Q00561_BasicMissionHarnakUndergroundRuins.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00561_BasicMissionHarnakUndergroundRuins/Q00561_BasicMissionHarnakUndergroundRuins.java
@@ -57,7 +57,7 @@ public class Q00561_BasicMissionHarnakUndergroundRuins extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/Q00562_BasicMissionAltarOfEvil.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/Q00562_BasicMissionAltarOfEvil.java
index caec736235..d8bd97e195 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/Q00562_BasicMissionAltarOfEvil.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/Q00562_BasicMissionAltarOfEvil.java
@@ -59,7 +59,7 @@ public class Q00562_BasicMissionAltarOfEvil extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00563_BasicMissionBloodySwampland/Q00563_BasicMissionBloodySwampland.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00563_BasicMissionBloodySwampland/Q00563_BasicMissionBloodySwampland.java
index 004f18a1af..d8dcecb501 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00563_BasicMissionBloodySwampland/Q00563_BasicMissionBloodySwampland.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00563_BasicMissionBloodySwampland/Q00563_BasicMissionBloodySwampland.java
@@ -52,7 +52,7 @@ public class Q00563_BasicMissionBloodySwampland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00564_BasicMissionKartiasLabyrinthSolo/Q00564_BasicMissionKartiasLabyrinthSolo.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00564_BasicMissionKartiasLabyrinthSolo/Q00564_BasicMissionKartiasLabyrinthSolo.java
index 2a676f6085..0872eb3e58 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00564_BasicMissionKartiasLabyrinthSolo/Q00564_BasicMissionKartiasLabyrinthSolo.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00564_BasicMissionKartiasLabyrinthSolo/Q00564_BasicMissionKartiasLabyrinthSolo.java
@@ -52,7 +52,7 @@ public class Q00564_BasicMissionKartiasLabyrinthSolo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00565_BasicMissionFairySettlementWest/Q00565_BasicMissionFairySettlementWest.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00565_BasicMissionFairySettlementWest/Q00565_BasicMissionFairySettlementWest.java
index da8450a569..a71fac1255 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00565_BasicMissionFairySettlementWest/Q00565_BasicMissionFairySettlementWest.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00565_BasicMissionFairySettlementWest/Q00565_BasicMissionFairySettlementWest.java
@@ -60,7 +60,7 @@ public class Q00565_BasicMissionFairySettlementWest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00566_BasicMissionFairySettlementEast/Q00566_BasicMissionFairySettlementEast.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00566_BasicMissionFairySettlementEast/Q00566_BasicMissionFairySettlementEast.java
index b1dab8528f..13a04f411f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00566_BasicMissionFairySettlementEast/Q00566_BasicMissionFairySettlementEast.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00566_BasicMissionFairySettlementEast/Q00566_BasicMissionFairySettlementEast.java
@@ -60,7 +60,7 @@ public class Q00566_BasicMissionFairySettlementEast extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00567_BasicMissionIsleOfSouls/Q00567_BasicMissionIsleOfSouls.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00567_BasicMissionIsleOfSouls/Q00567_BasicMissionIsleOfSouls.java
index 94e73d544e..c0387e3227 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00567_BasicMissionIsleOfSouls/Q00567_BasicMissionIsleOfSouls.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00567_BasicMissionIsleOfSouls/Q00567_BasicMissionIsleOfSouls.java
@@ -55,7 +55,7 @@ public class Q00567_BasicMissionIsleOfSouls extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00568_SpecialMissionNornilsCave/Q00568_SpecialMissionNornilsCave.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00568_SpecialMissionNornilsCave/Q00568_SpecialMissionNornilsCave.java
index c2dda471f8..f55baea30c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00568_SpecialMissionNornilsCave/Q00568_SpecialMissionNornilsCave.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00568_SpecialMissionNornilsCave/Q00568_SpecialMissionNornilsCave.java
@@ -55,7 +55,7 @@ public class Q00568_SpecialMissionNornilsCave extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00569_BasicMissionSealOfShilen/Q00569_BasicMissionSealOfShilen.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00569_BasicMissionSealOfShilen/Q00569_BasicMissionSealOfShilen.java
index c2cc6249be..9ad439ff60 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00569_BasicMissionSealOfShilen/Q00569_BasicMissionSealOfShilen.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00569_BasicMissionSealOfShilen/Q00569_BasicMissionSealOfShilen.java
@@ -51,7 +51,7 @@ public class Q00569_BasicMissionSealOfShilen extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00570_SpecialMissionKartiasLabyrinthParty/Q00570_SpecialMissionKartiasLabyrinthParty.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00570_SpecialMissionKartiasLabyrinthParty/Q00570_SpecialMissionKartiasLabyrinthParty.java
index 0286f4afed..021dfd2334 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00570_SpecialMissionKartiasLabyrinthParty/Q00570_SpecialMissionKartiasLabyrinthParty.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00570_SpecialMissionKartiasLabyrinthParty/Q00570_SpecialMissionKartiasLabyrinthParty.java
@@ -49,7 +49,7 @@ public class Q00570_SpecialMissionKartiasLabyrinthParty extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00571_SpecialMissionProofOfUnityFieldRaid/Q00571_SpecialMissionProofOfUnityFieldRaid.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00571_SpecialMissionProofOfUnityFieldRaid/Q00571_SpecialMissionProofOfUnityFieldRaid.java
index 8bb700546b..1fa51e0924 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00571_SpecialMissionProofOfUnityFieldRaid/Q00571_SpecialMissionProofOfUnityFieldRaid.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00571_SpecialMissionProofOfUnityFieldRaid/Q00571_SpecialMissionProofOfUnityFieldRaid.java
@@ -74,7 +74,7 @@ public class Q00571_SpecialMissionProofOfUnityFieldRaid extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00572_SpecialMissionProofOfCourageFieldRaid/Q00572_SpecialMissionProofOfCourageFieldRaid.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00572_SpecialMissionProofOfCourageFieldRaid/Q00572_SpecialMissionProofOfCourageFieldRaid.java
index 600a2aba94..c1df40aa33 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00572_SpecialMissionProofOfCourageFieldRaid/Q00572_SpecialMissionProofOfCourageFieldRaid.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00572_SpecialMissionProofOfCourageFieldRaid/Q00572_SpecialMissionProofOfCourageFieldRaid.java
@@ -79,7 +79,7 @@ public class Q00572_SpecialMissionProofOfCourageFieldRaid extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00573_SpecialMissionProofOfStrengthFieldRaid/Q00573_SpecialMissionProofOfStrengthFieldRaid.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00573_SpecialMissionProofOfStrengthFieldRaid/Q00573_SpecialMissionProofOfStrengthFieldRaid.java
index a6f3ebf8bd..d25c7a7581 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00573_SpecialMissionProofOfStrengthFieldRaid/Q00573_SpecialMissionProofOfStrengthFieldRaid.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00573_SpecialMissionProofOfStrengthFieldRaid/Q00573_SpecialMissionProofOfStrengthFieldRaid.java
@@ -79,7 +79,7 @@ public class Q00573_SpecialMissionProofOfStrengthFieldRaid extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00574_SpecialMissionNornilsGarden/Q00574_SpecialMissionNornilsGarden.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00574_SpecialMissionNornilsGarden/Q00574_SpecialMissionNornilsGarden.java
index 7255a1d251..acf06ef049 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00574_SpecialMissionNornilsGarden/Q00574_SpecialMissionNornilsGarden.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00574_SpecialMissionNornilsGarden/Q00574_SpecialMissionNornilsGarden.java
@@ -53,7 +53,7 @@ public class Q00574_SpecialMissionNornilsGarden extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00576_SpecialMissionDefeatSpezion/Q00576_SpecialMissionDefeatSpezion.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00576_SpecialMissionDefeatSpezion/Q00576_SpecialMissionDefeatSpezion.java
index bea102f667..8843dd06d4 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00576_SpecialMissionDefeatSpezion/Q00576_SpecialMissionDefeatSpezion.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00576_SpecialMissionDefeatSpezion/Q00576_SpecialMissionDefeatSpezion.java
@@ -52,7 +52,7 @@ public class Q00576_SpecialMissionDefeatSpezion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00577_BasicMissionSilentValley/Q00577_BasicMissionSilentValley.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00577_BasicMissionSilentValley/Q00577_BasicMissionSilentValley.java
index ab3b4302ec..be7ba57420 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00577_BasicMissionSilentValley/Q00577_BasicMissionSilentValley.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00577_BasicMissionSilentValley/Q00577_BasicMissionSilentValley.java
@@ -52,7 +52,7 @@ public class Q00577_BasicMissionSilentValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00578_BasicMissionCemetery/Q00578_BasicMissionCemetery.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00578_BasicMissionCemetery/Q00578_BasicMissionCemetery.java
index ef91d6c41f..5a6287b527 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00578_BasicMissionCemetery/Q00578_BasicMissionCemetery.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00578_BasicMissionCemetery/Q00578_BasicMissionCemetery.java
@@ -50,7 +50,7 @@ public class Q00578_BasicMissionCemetery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00579_BasicMissionBlazingSwamp/Q00579_BasicMissionBlazingSwamp.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00579_BasicMissionBlazingSwamp/Q00579_BasicMissionBlazingSwamp.java
index 9068c6e6b7..5052995582 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00579_BasicMissionBlazingSwamp/Q00579_BasicMissionBlazingSwamp.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00579_BasicMissionBlazingSwamp/Q00579_BasicMissionBlazingSwamp.java
@@ -55,7 +55,7 @@ public final class Q00579_BasicMissionBlazingSwamp extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00580_BeyondTheMemories/Q00580_BeyondTheMemories.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00580_BeyondTheMemories/Q00580_BeyondTheMemories.java
index 6a4cbc7cc8..1ffd6c1de5 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00580_BeyondTheMemories/Q00580_BeyondTheMemories.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00580_BeyondTheMemories/Q00580_BeyondTheMemories.java
@@ -87,7 +87,7 @@ public class Q00580_BeyondTheMemories extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00581_ThePurificationRitual/Q00581_ThePurificationRitual.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00581_ThePurificationRitual/Q00581_ThePurificationRitual.java
index ca81196dfe..5f925fce24 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00581_ThePurificationRitual/Q00581_ThePurificationRitual.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00581_ThePurificationRitual/Q00581_ThePurificationRitual.java
@@ -76,7 +76,7 @@ public class Q00581_ThePurificationRitual extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00582_WashBloodWithBlood/Q00582_WashBloodWithBlood.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00582_WashBloodWithBlood/Q00582_WashBloodWithBlood.java
index b1e14fd0e8..c019ae7c5d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00582_WashBloodWithBlood/Q00582_WashBloodWithBlood.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00582_WashBloodWithBlood/Q00582_WashBloodWithBlood.java
@@ -79,7 +79,7 @@ public class Q00582_WashBloodWithBlood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00583_MeaningOfSurvival/Q00583_MeaningOfSurvival.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00583_MeaningOfSurvival/Q00583_MeaningOfSurvival.java
index 9d628426d8..34e049ccb7 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00583_MeaningOfSurvival/Q00583_MeaningOfSurvival.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00583_MeaningOfSurvival/Q00583_MeaningOfSurvival.java
@@ -77,7 +77,7 @@ public class Q00583_MeaningOfSurvival extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00584_NeverSayGoodBye/Q00584_NeverSayGoodBye.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00584_NeverSayGoodBye/Q00584_NeverSayGoodBye.java
index 1af272b77e..a4addd8708 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00584_NeverSayGoodBye/Q00584_NeverSayGoodBye.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00584_NeverSayGoodBye/Q00584_NeverSayGoodBye.java
@@ -80,7 +80,7 @@ public class Q00584_NeverSayGoodBye extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00585_CantGoAgainstTheTime/Q00585_CantGoAgainstTheTime.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00585_CantGoAgainstTheTime/Q00585_CantGoAgainstTheTime.java
index 01371768ba..ee46da0fa7 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00585_CantGoAgainstTheTime/Q00585_CantGoAgainstTheTime.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00585_CantGoAgainstTheTime/Q00585_CantGoAgainstTheTime.java
@@ -72,7 +72,7 @@ public class Q00585_CantGoAgainstTheTime extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00586_MutatedCreatures/Q00586_MutatedCreatures.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00586_MutatedCreatures/Q00586_MutatedCreatures.java
index 9d985e8c90..5c793893ad 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00586_MutatedCreatures/Q00586_MutatedCreatures.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00586_MutatedCreatures/Q00586_MutatedCreatures.java
@@ -51,7 +51,7 @@ public class Q00586_MutatedCreatures extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00587_MoreAggressiveOperation/Q00587_MoreAggressiveOperation.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00587_MoreAggressiveOperation/Q00587_MoreAggressiveOperation.java
index fba5c2202c..cca3219ed2 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00587_MoreAggressiveOperation/Q00587_MoreAggressiveOperation.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00587_MoreAggressiveOperation/Q00587_MoreAggressiveOperation.java
@@ -78,7 +78,7 @@ public class Q00587_MoreAggressiveOperation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00588_HeadOnCrash/Q00588_HeadOnCrash.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00588_HeadOnCrash/Q00588_HeadOnCrash.java
index d22846f0ba..7b47113c9b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00588_HeadOnCrash/Q00588_HeadOnCrash.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00588_HeadOnCrash/Q00588_HeadOnCrash.java
@@ -55,7 +55,7 @@ public class Q00588_HeadOnCrash extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00589_ASecretChange/Q00589_ASecretChange.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00589_ASecretChange/Q00589_ASecretChange.java
index df44caee12..9663b63f20 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00589_ASecretChange/Q00589_ASecretChange.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00589_ASecretChange/Q00589_ASecretChange.java
@@ -57,7 +57,7 @@ public class Q00589_ASecretChange extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00590_ToEachTheirOwn/Q00590_ToEachTheirOwn.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00590_ToEachTheirOwn/Q00590_ToEachTheirOwn.java
index a8b256b892..d1e02e881d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00590_ToEachTheirOwn/Q00590_ToEachTheirOwn.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00590_ToEachTheirOwn/Q00590_ToEachTheirOwn.java
@@ -56,7 +56,7 @@ public class Q00590_ToEachTheirOwn extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00593_BasicMissionPaganTemple/Q00593_BasicMissionPaganTemple.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00593_BasicMissionPaganTemple/Q00593_BasicMissionPaganTemple.java
index 3278107bd0..46aa6eb510 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00593_BasicMissionPaganTemple/Q00593_BasicMissionPaganTemple.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00593_BasicMissionPaganTemple/Q00593_BasicMissionPaganTemple.java
@@ -54,7 +54,7 @@ public class Q00593_BasicMissionPaganTemple extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00594_BasicMissionDimensionalRift/Q00594_BasicMissionDimensionalRift.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00594_BasicMissionDimensionalRift/Q00594_BasicMissionDimensionalRift.java
index 75e137696b..388f65b1d4 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00594_BasicMissionDimensionalRift/Q00594_BasicMissionDimensionalRift.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00594_BasicMissionDimensionalRift/Q00594_BasicMissionDimensionalRift.java
@@ -50,7 +50,7 @@ public class Q00594_BasicMissionDimensionalRift extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00595_SpecialMissionRaidersCrossroads/Q00595_SpecialMissionRaidersCrossroads.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00595_SpecialMissionRaidersCrossroads/Q00595_SpecialMissionRaidersCrossroads.java
index d73153e1da..e0487854c6 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00595_SpecialMissionRaidersCrossroads/Q00595_SpecialMissionRaidersCrossroads.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00595_SpecialMissionRaidersCrossroads/Q00595_SpecialMissionRaidersCrossroads.java
@@ -54,7 +54,7 @@ public class Q00595_SpecialMissionRaidersCrossroads extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00596_SpecialMissionDefeatBaylor/Q00596_SpecialMissionDefeatBaylor.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00596_SpecialMissionDefeatBaylor/Q00596_SpecialMissionDefeatBaylor.java
index 2067f39228..a2a948cb7d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00596_SpecialMissionDefeatBaylor/Q00596_SpecialMissionDefeatBaylor.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00596_SpecialMissionDefeatBaylor/Q00596_SpecialMissionDefeatBaylor.java
@@ -53,7 +53,7 @@ public class Q00596_SpecialMissionDefeatBaylor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00599_DemonsAndDimensionalEnergy/Q00599_DemonsAndDimensionalEnergy.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00599_DemonsAndDimensionalEnergy/Q00599_DemonsAndDimensionalEnergy.java
index 75437b19b1..fe490f4774 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00599_DemonsAndDimensionalEnergy/Q00599_DemonsAndDimensionalEnergy.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00599_DemonsAndDimensionalEnergy/Q00599_DemonsAndDimensionalEnergy.java
@@ -70,7 +70,7 @@ public class Q00599_DemonsAndDimensionalEnergy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00600_KeyToTheRefiningProcess/Q00600_KeyToTheRefiningProcess.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00600_KeyToTheRefiningProcess/Q00600_KeyToTheRefiningProcess.java
index e3d1cf0b49..6d61fa327f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00600_KeyToTheRefiningProcess/Q00600_KeyToTheRefiningProcess.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00600_KeyToTheRefiningProcess/Q00600_KeyToTheRefiningProcess.java
@@ -63,7 +63,7 @@ public class Q00600_KeyToTheRefiningProcess extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
index 295b613316..d362ed8b48 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
@@ -84,7 +84,7 @@ public class Q00617_GatherTheFlames extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
index 22d8a3f362..481380c065 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
@@ -65,7 +65,7 @@ public class Q00618_IntoTheFlame extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
index 24dc552a09..554a65b448 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
@@ -108,7 +108,7 @@ public class Q00620_FourGoblets extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = player.getQuestState(getName());
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
index effc3c81e3..e473202bfa 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
@@ -62,7 +62,7 @@ public class Q00621_EggDelivery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
index 8a857ca301..0aa311db9e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
@@ -62,7 +62,7 @@ public class Q00622_SpecialtyLiquorDelivery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
index a464df7f99..a0ed4ec2a8 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
@@ -66,7 +66,7 @@ public class Q00623_TheFinestFood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
index 335ef36527..882e4a1ad1 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
@@ -78,7 +78,7 @@ public class Q00627_HeartInSearchOfPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
index 6f6013cac1..ff2f3a5bfe 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
@@ -99,7 +99,7 @@ public class Q00648_AnIceMerchantsDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		final QuestState q115 = player.getQuestState(Q00115_TheOtherSideOfTruth.class.getSimpleName());
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
index 54fcece258..7fe309f22e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
@@ -86,7 +86,7 @@ public class Q00662_AGameOfCards extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
index 3b05df07a2..51e520cc09 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
@@ -153,7 +153,7 @@ public class Q00663_SeductiveWhispers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00665_BasicTrainingForHunterGuildMember/Q00665_BasicTrainingForHunterGuildMember.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00665_BasicTrainingForHunterGuildMember/Q00665_BasicTrainingForHunterGuildMember.java
index d5ea1aeadc..1dd72a5854 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00665_BasicTrainingForHunterGuildMember/Q00665_BasicTrainingForHunterGuildMember.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00665_BasicTrainingForHunterGuildMember/Q00665_BasicTrainingForHunterGuildMember.java
@@ -64,7 +64,7 @@ public class Q00665_BasicTrainingForHunterGuildMember extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00666_HunterGuildMembersKnowledge/Q00666_HunterGuildMembersKnowledge.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00666_HunterGuildMembersKnowledge/Q00666_HunterGuildMembersKnowledge.java
index b39573ac0b..b1205ef9b6 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00666_HunterGuildMembersKnowledge/Q00666_HunterGuildMembersKnowledge.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00666_HunterGuildMembersKnowledge/Q00666_HunterGuildMembersKnowledge.java
@@ -69,7 +69,7 @@ public class Q00666_HunterGuildMembersKnowledge extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00667_HowToCoverShilensEyes/Q00667_HowToCoverShilensEyes.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00667_HowToCoverShilensEyes/Q00667_HowToCoverShilensEyes.java
index 462952ed55..d039ce3e6b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00667_HowToCoverShilensEyes/Q00667_HowToCoverShilensEyes.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00667_HowToCoverShilensEyes/Q00667_HowToCoverShilensEyes.java
@@ -61,7 +61,7 @@ public final class Q00667_HowToCoverShilensEyes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00668_ABattleWithTheGiants/Q00668_ABattleWithTheGiants.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00668_ABattleWithTheGiants/Q00668_ABattleWithTheGiants.java
index 0115611bea..9a2f5d7c44 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00668_ABattleWithTheGiants/Q00668_ABattleWithTheGiants.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00668_ABattleWithTheGiants/Q00668_ABattleWithTheGiants.java
@@ -58,7 +58,7 @@ public class Q00668_ABattleWithTheGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00669_DesperateFightWithTheDragons/Q00669_DesperateFightWithTheDragons.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00669_DesperateFightWithTheDragons/Q00669_DesperateFightWithTheDragons.java
index a65a880901..5bfd05496d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00669_DesperateFightWithTheDragons/Q00669_DesperateFightWithTheDragons.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00669_DesperateFightWithTheDragons/Q00669_DesperateFightWithTheDragons.java
@@ -64,7 +64,7 @@ public class Q00669_DesperateFightWithTheDragons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00670_DefeatingTheLordOfSeed/Q00670_DefeatingTheLordOfSeed.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00670_DefeatingTheLordOfSeed/Q00670_DefeatingTheLordOfSeed.java
index 7d13e190f7..e8f1153c86 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00670_DefeatingTheLordOfSeed/Q00670_DefeatingTheLordOfSeed.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00670_DefeatingTheLordOfSeed/Q00670_DefeatingTheLordOfSeed.java
@@ -58,7 +58,7 @@ public class Q00670_DefeatingTheLordOfSeed extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00671_PathToFindingThePast/Q00671_PathToFindingThePast.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00671_PathToFindingThePast/Q00671_PathToFindingThePast.java
index bdf1b18f42..b033d03fa8 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00671_PathToFindingThePast/Q00671_PathToFindingThePast.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00671_PathToFindingThePast/Q00671_PathToFindingThePast.java
@@ -69,7 +69,7 @@ public class Q00671_PathToFindingThePast extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00672_ArchenemyEmbryo/Q00672_ArchenemyEmbryo.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00672_ArchenemyEmbryo/Q00672_ArchenemyEmbryo.java
index 596488f105..5b32e1a999 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00672_ArchenemyEmbryo/Q00672_ArchenemyEmbryo.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00672_ArchenemyEmbryo/Q00672_ArchenemyEmbryo.java
@@ -55,7 +55,7 @@ public class Q00672_ArchenemyEmbryo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00673_BelethAmbition/Q00673_BelethAmbition.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00673_BelethAmbition/Q00673_BelethAmbition.java
index 997841e0b2..a188d43e4d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00673_BelethAmbition/Q00673_BelethAmbition.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00673_BelethAmbition/Q00673_BelethAmbition.java
@@ -56,7 +56,7 @@ public class Q00673_BelethAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00674_ChangesInTheShadowOfTheMotherTree/Q00674_ChangesInTheShadowOfTheMotherTree.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00674_ChangesInTheShadowOfTheMotherTree/Q00674_ChangesInTheShadowOfTheMotherTree.java
index 2b5d58ddae..0273703923 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00674_ChangesInTheShadowOfTheMotherTree/Q00674_ChangesInTheShadowOfTheMotherTree.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00674_ChangesInTheShadowOfTheMotherTree/Q00674_ChangesInTheShadowOfTheMotherTree.java
@@ -72,7 +72,7 @@ public class Q00674_ChangesInTheShadowOfTheMotherTree extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00675_WhatTheThreadOfThePastShows/Q00675_WhatTheThreadOfThePastShows.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00675_WhatTheThreadOfThePastShows/Q00675_WhatTheThreadOfThePastShows.java
index c6b5ce237a..7762bddd90 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00675_WhatTheThreadOfThePastShows/Q00675_WhatTheThreadOfThePastShows.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00675_WhatTheThreadOfThePastShows/Q00675_WhatTheThreadOfThePastShows.java
@@ -64,7 +64,7 @@ public class Q00675_WhatTheThreadOfThePastShows extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00682_TheStrongInTheClosedSpace/Q00682_TheStrongInTheClosedSpace.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00682_TheStrongInTheClosedSpace/Q00682_TheStrongInTheClosedSpace.java
index cc6df2254a..6e318ceaec 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00682_TheStrongInTheClosedSpace/Q00682_TheStrongInTheClosedSpace.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00682_TheStrongInTheClosedSpace/Q00682_TheStrongInTheClosedSpace.java
@@ -54,7 +54,7 @@ public class Q00682_TheStrongInTheClosedSpace extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
index 0278e46ec2..17895d5c45 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
@@ -69,7 +69,7 @@ public class Q00726_LightWithinTheDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
index da19640964..bd744f7aaa 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
@@ -57,7 +57,7 @@ public class Q00727_HopeWithinTheDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00737_ASwordHiddenInASmile/Q00737_ASwordHiddenInASmile.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00737_ASwordHiddenInASmile/Q00737_ASwordHiddenInASmile.java
index 1033d9d208..4095fdfb2b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00737_ASwordHiddenInASmile/Q00737_ASwordHiddenInASmile.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00737_ASwordHiddenInASmile/Q00737_ASwordHiddenInASmile.java
@@ -61,7 +61,7 @@ public class Q00737_ASwordHiddenInASmile extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00738_DimensionalExplorationOfTheUnworldlyVisitors/Q00738_DimensionalExplorationOfTheUnworldlyVisitors.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00738_DimensionalExplorationOfTheUnworldlyVisitors/Q00738_DimensionalExplorationOfTheUnworldlyVisitors.java
index 0956613cc1..8f63f869cb 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00738_DimensionalExplorationOfTheUnworldlyVisitors/Q00738_DimensionalExplorationOfTheUnworldlyVisitors.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00738_DimensionalExplorationOfTheUnworldlyVisitors/Q00738_DimensionalExplorationOfTheUnworldlyVisitors.java
@@ -72,7 +72,7 @@ public class Q00738_DimensionalExplorationOfTheUnworldlyVisitors extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00743_AtTheAltarOfOblivion/Q00743_AtTheAltarOfOblivion.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00743_AtTheAltarOfOblivion/Q00743_AtTheAltarOfOblivion.java
index 960a737453..8d82ae530f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00743_AtTheAltarOfOblivion/Q00743_AtTheAltarOfOblivion.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00743_AtTheAltarOfOblivion/Q00743_AtTheAltarOfOblivion.java
@@ -82,7 +82,7 @@ public class Q00743_AtTheAltarOfOblivion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00744_TheAlligatorHunterReturns/Q00744_TheAlligatorHunterReturns.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00744_TheAlligatorHunterReturns/Q00744_TheAlligatorHunterReturns.java
index 4230ffc9be..ec5091f5ff 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00744_TheAlligatorHunterReturns/Q00744_TheAlligatorHunterReturns.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00744_TheAlligatorHunterReturns/Q00744_TheAlligatorHunterReturns.java
@@ -65,7 +65,7 @@ public final class Q00744_TheAlligatorHunterReturns extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00745_TheOutlawsAreIncoming/Q00745_TheOutlawsAreIncoming.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00745_TheOutlawsAreIncoming/Q00745_TheOutlawsAreIncoming.java
index a78b4b775a..2e896b781d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00745_TheOutlawsAreIncoming/Q00745_TheOutlawsAreIncoming.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00745_TheOutlawsAreIncoming/Q00745_TheOutlawsAreIncoming.java
@@ -74,7 +74,7 @@ public class Q00745_TheOutlawsAreIncoming extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00747_DefendingTheForsakenPlains/Q00747_DefendingTheForsakenPlains.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00747_DefendingTheForsakenPlains/Q00747_DefendingTheForsakenPlains.java
index 2bf41c5de2..2ce7479e4a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00747_DefendingTheForsakenPlains/Q00747_DefendingTheForsakenPlains.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00747_DefendingTheForsakenPlains/Q00747_DefendingTheForsakenPlains.java
@@ -69,7 +69,7 @@ public final class Q00747_DefendingTheForsakenPlains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00748_EndlessRevenge/Q00748_EndlessRevenge.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00748_EndlessRevenge/Q00748_EndlessRevenge.java
index b7a4d1bf37..c5186f1275 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00748_EndlessRevenge/Q00748_EndlessRevenge.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00748_EndlessRevenge/Q00748_EndlessRevenge.java
@@ -70,7 +70,7 @@ public final class Q00748_EndlessRevenge extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00749_TiesWithTheGuardians/Q00749_TiesWithTheGuardians.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00749_TiesWithTheGuardians/Q00749_TiesWithTheGuardians.java
index eb3716794f..538ea2d365 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00749_TiesWithTheGuardians/Q00749_TiesWithTheGuardians.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00749_TiesWithTheGuardians/Q00749_TiesWithTheGuardians.java
@@ -57,7 +57,7 @@ public final class Q00749_TiesWithTheGuardians extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java
index 9161bfd4b9..31eace47ba 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java
@@ -72,7 +72,7 @@ public class Q00751_LiberatingTheSpirits extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java
index 3c5f3d9861..e22b624bc5 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java
@@ -70,7 +70,7 @@ public class Q00752_UncoverTheSecret extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java
index 6f5853054b..935c3a7c37 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java
@@ -78,7 +78,7 @@ public class Q00753_ReactingToACrisis extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00754_AssistingTheRebelForces/Q00754_AssistingTheRebelForces.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00754_AssistingTheRebelForces/Q00754_AssistingTheRebelForces.java
index efd21fd055..fbbb9eb5c6 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00754_AssistingTheRebelForces/Q00754_AssistingTheRebelForces.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00754_AssistingTheRebelForces/Q00754_AssistingTheRebelForces.java
@@ -54,7 +54,7 @@ public class Q00754_AssistingTheRebelForces extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00755_InNeedOfPetras/Q00755_InNeedOfPetras.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00755_InNeedOfPetras/Q00755_InNeedOfPetras.java
index 20aa2199c8..09d9216654 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00755_InNeedOfPetras/Q00755_InNeedOfPetras.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00755_InNeedOfPetras/Q00755_InNeedOfPetras.java
@@ -67,7 +67,7 @@ public class Q00755_InNeedOfPetras extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java
index 40e84f4dd0..9038173a19 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java
@@ -48,7 +48,7 @@ public class Q00756_TopQualityPetra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java
index 1927ac253f..0b6815a166 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java
@@ -71,7 +71,7 @@ public class Q00757_TriolsMovement extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java
index 0578c5952a..c777c72641 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java
@@ -70,7 +70,7 @@ public class Q00758_TheFallenKingsMen extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00759_TheDwarvenNightmareContinues/Q00759_TheDwarvenNightmareContinues.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00759_TheDwarvenNightmareContinues/Q00759_TheDwarvenNightmareContinues.java
index e0db615674..4715b055c5 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00759_TheDwarvenNightmareContinues/Q00759_TheDwarvenNightmareContinues.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00759_TheDwarvenNightmareContinues/Q00759_TheDwarvenNightmareContinues.java
@@ -68,7 +68,7 @@ public class Q00759_TheDwarvenNightmareContinues extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java
index e163658293..33169c48a7 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java
@@ -47,7 +47,7 @@ public class Q00760_BlockTheExit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java
index bbe8918eef..42b3fd1c01 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java
@@ -87,7 +87,7 @@ public class Q00761_AssistingTheGoldenRamArmy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java
index 709817b6a5..ac13b91b3e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java
@@ -116,7 +116,7 @@ public class Q00762_AnOminousRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java
index b22bbfddc0..80637b644a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java
@@ -76,7 +76,7 @@ public class Q00763_ADauntingTask extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00764_WeakeningTheVarkaSilenosForces/Q00764_WeakeningTheVarkaSilenosForces.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00764_WeakeningTheVarkaSilenosForces/Q00764_WeakeningTheVarkaSilenosForces.java
index 5e10448397..fe404d0596 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00764_WeakeningTheVarkaSilenosForces/Q00764_WeakeningTheVarkaSilenosForces.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00764_WeakeningTheVarkaSilenosForces/Q00764_WeakeningTheVarkaSilenosForces.java
@@ -73,7 +73,7 @@ public class Q00764_WeakeningTheVarkaSilenosForces extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00765_WeakeningTheKetraOrcForces/Q00765_WeakeningTheKetraOrcForces.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00765_WeakeningTheKetraOrcForces/Q00765_WeakeningTheKetraOrcForces.java
index c700da56d0..84017857a4 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00765_WeakeningTheKetraOrcForces/Q00765_WeakeningTheKetraOrcForces.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00765_WeakeningTheKetraOrcForces/Q00765_WeakeningTheKetraOrcForces.java
@@ -73,7 +73,7 @@ public class Q00765_WeakeningTheKetraOrcForces extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00773_ToCalmTheFlood/Q00773_ToCalmTheFlood.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00773_ToCalmTheFlood/Q00773_ToCalmTheFlood.java
index 1ff56aaed8..e8be8cda84 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00773_ToCalmTheFlood/Q00773_ToCalmTheFlood.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00773_ToCalmTheFlood/Q00773_ToCalmTheFlood.java
@@ -91,7 +91,7 @@ public class Q00773_ToCalmTheFlood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00774_DreamingOfPeace/Q00774_DreamingOfPeace.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00774_DreamingOfPeace/Q00774_DreamingOfPeace.java
index 51271afc55..26216ab6ef 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00774_DreamingOfPeace/Q00774_DreamingOfPeace.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00774_DreamingOfPeace/Q00774_DreamingOfPeace.java
@@ -88,7 +88,7 @@ public class Q00774_DreamingOfPeace extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java
index 50114439f2..c74b54e1c8 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java
@@ -82,7 +82,7 @@ public class Q00775_RetrievingTheChaosFragment extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java
index ac2f54fa8d..18b9f67179 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java
@@ -49,7 +49,7 @@ public class Q00776_SlayDarkLordEkimus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java
index dad6a31213..ff385c026f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java
@@ -50,7 +50,7 @@ public class Q00777_SlayDarkLordTiat extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java
index c2266256c4..9cf140a913 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java
@@ -76,7 +76,7 @@ public class Q00778_OperationRoaringFlame extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00779_UtilizeTheDarknessSeedOfDestruction/Q00779_UtilizeTheDarknessSeedOfDestruction.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00779_UtilizeTheDarknessSeedOfDestruction/Q00779_UtilizeTheDarknessSeedOfDestruction.java
index 15fa0b1e53..c6fac96851 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00779_UtilizeTheDarknessSeedOfDestruction/Q00779_UtilizeTheDarknessSeedOfDestruction.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00779_UtilizeTheDarknessSeedOfDestruction/Q00779_UtilizeTheDarknessSeedOfDestruction.java
@@ -72,7 +72,7 @@ public class Q00779_UtilizeTheDarknessSeedOfDestruction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00780_UtilizeTheDarknessSeedOfInfinity/Q00780_UtilizeTheDarknessSeedOfInfinity.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00780_UtilizeTheDarknessSeedOfInfinity/Q00780_UtilizeTheDarknessSeedOfInfinity.java
index a71bdf61dc..3820918c63 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00780_UtilizeTheDarknessSeedOfInfinity/Q00780_UtilizeTheDarknessSeedOfInfinity.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00780_UtilizeTheDarknessSeedOfInfinity/Q00780_UtilizeTheDarknessSeedOfInfinity.java
@@ -61,7 +61,7 @@ public class Q00780_UtilizeTheDarknessSeedOfInfinity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00781_UtilizeTheDarknessSeedOfAnnihilation/Q00781_UtilizeTheDarknessSeedOfAnnihilation.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00781_UtilizeTheDarknessSeedOfAnnihilation/Q00781_UtilizeTheDarknessSeedOfAnnihilation.java
index 190b971f36..d662d9fc6d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00781_UtilizeTheDarknessSeedOfAnnihilation/Q00781_UtilizeTheDarknessSeedOfAnnihilation.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00781_UtilizeTheDarknessSeedOfAnnihilation/Q00781_UtilizeTheDarknessSeedOfAnnihilation.java
@@ -78,7 +78,7 @@ public class Q00781_UtilizeTheDarknessSeedOfAnnihilation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00782_UtilizeTheDarknessSeedOfHellfire/Q00782_UtilizeTheDarknessSeedOfHellfire.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00782_UtilizeTheDarknessSeedOfHellfire/Q00782_UtilizeTheDarknessSeedOfHellfire.java
index 7feaaf443e..3b181f5417 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00782_UtilizeTheDarknessSeedOfHellfire/Q00782_UtilizeTheDarknessSeedOfHellfire.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00782_UtilizeTheDarknessSeedOfHellfire/Q00782_UtilizeTheDarknessSeedOfHellfire.java
@@ -79,7 +79,7 @@ public class Q00782_UtilizeTheDarknessSeedOfHellfire extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java
index f72f39a08d..0f9c11b687 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java
@@ -71,7 +71,7 @@ public class Q00783_VestigeOfTheMagicPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
@@ -175,17 +175,17 @@ public class Q00783_VestigeOfTheMagicPower extends Quest
 					else if (qs.isCond(5))
 					{
 						htmltext = "31595-05b.htm";
-						onAdvEvent(htmltext, npc, player);
+						onEvent(htmltext, npc, player);
 					}
 					else if (qs.isCond(6))
 					{
 						htmltext = "31595-06b.htm";
-						onAdvEvent(htmltext, npc, player);
+						onEvent(htmltext, npc, player);
 					}
 					else if (qs.isCond(7))
 					{
 						htmltext = "31595-07b.htm";
-						onAdvEvent(htmltext, npc, player);
+						onEvent(htmltext, npc, player);
 					}
 					else if (qs.isCond(2) || qs.isCond(3) || qs.isCond(4))
 					{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java
index 5f840ead5d..449c163fad 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java
@@ -77,7 +77,7 @@ public class Q00787_TheRoleOfAWatcher extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00789_WaitingForPaagrio/Q00789_WaitingForPaagrio.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00789_WaitingForPaagrio/Q00789_WaitingForPaagrio.java
index bff422c167..9b15bd525d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00789_WaitingForPaagrio/Q00789_WaitingForPaagrio.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00789_WaitingForPaagrio/Q00789_WaitingForPaagrio.java
@@ -75,7 +75,7 @@ public final class Q00789_WaitingForPaagrio extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00790_ObtainingFerinsTrust/Q00790_ObtainingFerinsTrust.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00790_ObtainingFerinsTrust/Q00790_ObtainingFerinsTrust.java
index 7056a05ab3..a12633bddd 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00790_ObtainingFerinsTrust/Q00790_ObtainingFerinsTrust.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00790_ObtainingFerinsTrust/Q00790_ObtainingFerinsTrust.java
@@ -73,7 +73,7 @@ public class Q00790_ObtainingFerinsTrust extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00792_TheSuperionGiants/Q00792_TheSuperionGiants.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00792_TheSuperionGiants/Q00792_TheSuperionGiants.java
index a494fa2d3a..1f8af8f813 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00792_TheSuperionGiants/Q00792_TheSuperionGiants.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00792_TheSuperionGiants/Q00792_TheSuperionGiants.java
@@ -70,7 +70,7 @@ public class Q00792_TheSuperionGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00816_PlansToRepairTheStronghold/Q00816_PlansToRepairTheStronghold.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00816_PlansToRepairTheStronghold/Q00816_PlansToRepairTheStronghold.java
index 0507702506..2427136f91 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00816_PlansToRepairTheStronghold/Q00816_PlansToRepairTheStronghold.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00816_PlansToRepairTheStronghold/Q00816_PlansToRepairTheStronghold.java
@@ -65,7 +65,7 @@ public class Q00816_PlansToRepairTheStronghold extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00817_BlackAteliaResearch/Q00817_BlackAteliaResearch.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00817_BlackAteliaResearch/Q00817_BlackAteliaResearch.java
index 7296ee314b..e4de6eff53 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00817_BlackAteliaResearch/Q00817_BlackAteliaResearch.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00817_BlackAteliaResearch/Q00817_BlackAteliaResearch.java
@@ -58,7 +58,7 @@ public class Q00817_BlackAteliaResearch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00823_DisappearedRaceNewFairy/Q00823_DisappearedRaceNewFairy.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00823_DisappearedRaceNewFairy/Q00823_DisappearedRaceNewFairy.java
index cd55044b35..62d5dafe62 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00823_DisappearedRaceNewFairy/Q00823_DisappearedRaceNewFairy.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00823_DisappearedRaceNewFairy/Q00823_DisappearedRaceNewFairy.java
@@ -66,7 +66,7 @@ public class Q00823_DisappearedRaceNewFairy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00824_AttackTheCommandPost/Q00824_AttackTheCommandPost.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00824_AttackTheCommandPost/Q00824_AttackTheCommandPost.java
index db25590de0..c89f2abb8a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00824_AttackTheCommandPost/Q00824_AttackTheCommandPost.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00824_AttackTheCommandPost/Q00824_AttackTheCommandPost.java
@@ -51,7 +51,7 @@ public class Q00824_AttackTheCommandPost extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java
index 33c9979b4a..4f6a1dd284 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java
@@ -68,7 +68,7 @@ public class Q00826_InSearchOfTheSecretWeapon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java
index 8b7399c41e..739655c72f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java
@@ -89,7 +89,7 @@ public class Q00827_EinhasadsOrder extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00828_EvasBlessing/Q00828_EvasBlessing.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00828_EvasBlessing/Q00828_EvasBlessing.java
index 202e0fc3ca..72b34bd5f9 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00828_EvasBlessing/Q00828_EvasBlessing.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00828_EvasBlessing/Q00828_EvasBlessing.java
@@ -95,7 +95,7 @@ public class Q00828_EvasBlessing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00829_MaphrsSalvation/Q00829_MaphrsSalvation.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00829_MaphrsSalvation/Q00829_MaphrsSalvation.java
index 977c610974..457faaa28c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00829_MaphrsSalvation/Q00829_MaphrsSalvation.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00829_MaphrsSalvation/Q00829_MaphrsSalvation.java
@@ -54,7 +54,7 @@ public class Q00829_MaphrsSalvation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00830_TheWayOfTheGiantsPawn/Q00830_TheWayOfTheGiantsPawn.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00830_TheWayOfTheGiantsPawn/Q00830_TheWayOfTheGiantsPawn.java
index 1bac202074..64715ee4c7 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00830_TheWayOfTheGiantsPawn/Q00830_TheWayOfTheGiantsPawn.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00830_TheWayOfTheGiantsPawn/Q00830_TheWayOfTheGiantsPawn.java
@@ -89,7 +89,7 @@ public class Q00830_TheWayOfTheGiantsPawn extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java
index 9584d686bc..cb7bae51ab 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java
@@ -55,7 +55,7 @@ public class Q00831_SayhasScheme extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
index 755ff509f8..42c14d342e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
@@ -65,7 +65,7 @@ public class Q00833_DevilsTreasureTauti extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
index 6448125f2f..d2db3dae19 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
@@ -61,7 +61,7 @@ public class Q00835_PitiableMelisa extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00841_ContaminationContainment/Q00841_ContaminationContainment.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00841_ContaminationContainment/Q00841_ContaminationContainment.java
index d2e0a5f339..f11476f789 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00841_ContaminationContainment/Q00841_ContaminationContainment.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00841_ContaminationContainment/Q00841_ContaminationContainment.java
@@ -86,7 +86,7 @@ public final class Q00841_ContaminationContainment extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00842_CaptiveDemons/Q00842_CaptiveDemons.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00842_CaptiveDemons/Q00842_CaptiveDemons.java
index 6a3f793adb..7c93c26cf7 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00842_CaptiveDemons/Q00842_CaptiveDemons.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00842_CaptiveDemons/Q00842_CaptiveDemons.java
@@ -67,7 +67,7 @@ public class Q00842_CaptiveDemons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00843_GiantEvolutionControl/Q00843_GiantEvolutionControl.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00843_GiantEvolutionControl/Q00843_GiantEvolutionControl.java
index 17fbceb090..f66b6c4eec 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00843_GiantEvolutionControl/Q00843_GiantEvolutionControl.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00843_GiantEvolutionControl/Q00843_GiantEvolutionControl.java
@@ -80,7 +80,7 @@ public final class Q00843_GiantEvolutionControl extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00844_GiantsTreasure/Q00844_GiantsTreasure.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00844_GiantsTreasure/Q00844_GiantsTreasure.java
index ea0d277f7d..06827de98e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00844_GiantsTreasure/Q00844_GiantsTreasure.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00844_GiantsTreasure/Q00844_GiantsTreasure.java
@@ -63,7 +63,7 @@ public class Q00844_GiantsTreasure extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00845_SabotageTheEmbryoSupplies/Q00845_SabotageTheEmbryoSupplies.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00845_SabotageTheEmbryoSupplies/Q00845_SabotageTheEmbryoSupplies.java
index e4a2ecd1e9..c81c7e73bf 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00845_SabotageTheEmbryoSupplies/Q00845_SabotageTheEmbryoSupplies.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00845_SabotageTheEmbryoSupplies/Q00845_SabotageTheEmbryoSupplies.java
@@ -72,7 +72,7 @@ public class Q00845_SabotageTheEmbryoSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00846_BuildingUpStrength/Q00846_BuildingUpStrength.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00846_BuildingUpStrength/Q00846_BuildingUpStrength.java
index c003dafa91..69c93caa37 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00846_BuildingUpStrength/Q00846_BuildingUpStrength.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00846_BuildingUpStrength/Q00846_BuildingUpStrength.java
@@ -75,7 +75,7 @@ public final class Q00846_BuildingUpStrength extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
index 1140fc7490..2a6c62bb48 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
@@ -58,7 +58,7 @@ public class Q00901_HowLavasaurusesAreMade extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java
index b16bc679ac..d9d162c9f1 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java
@@ -77,7 +77,7 @@ public class Q00902_ReclaimOurEra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
index 8587c2f741..d15889aad7 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
@@ -55,7 +55,7 @@ public class Q00903_TheCallOfAntharas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
index 79522f8309..73589e1dbb 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
@@ -103,7 +103,7 @@ public class Q00905_RefinedDragonBlood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
index 3f6c9f9a30..4494d2a115 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
@@ -65,7 +65,7 @@ public class Q00906_TheCallOfValakas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00923_ShinedustExtraction/Q00923_ShinedustExtraction.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00923_ShinedustExtraction/Q00923_ShinedustExtraction.java
index 23a188fedb..a68c027b2a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00923_ShinedustExtraction/Q00923_ShinedustExtraction.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00923_ShinedustExtraction/Q00923_ShinedustExtraction.java
@@ -69,7 +69,7 @@ public class Q00923_ShinedustExtraction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00924_GiantOfTheRestorationRoom/Q00924_GiantOfTheRestorationRoom.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00924_GiantOfTheRestorationRoom/Q00924_GiantOfTheRestorationRoom.java
index de9e6695cc..5fe6d77b8b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00924_GiantOfTheRestorationRoom/Q00924_GiantOfTheRestorationRoom.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00924_GiantOfTheRestorationRoom/Q00924_GiantOfTheRestorationRoom.java
@@ -66,7 +66,7 @@ public class Q00924_GiantOfTheRestorationRoom extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java
index 0c68f67f34..9c53c37390 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java
@@ -58,7 +58,7 @@ public class Q00926_30DaySearchOperation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java
index 18391c86e3..a162ef4426 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java
@@ -65,7 +65,7 @@ public class Q00928_100DaySubjugationOperation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00930_DisparagingThePhantoms/Q00930_DisparagingThePhantoms.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00930_DisparagingThePhantoms/Q00930_DisparagingThePhantoms.java
index 28bb494903..755b411c57 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00930_DisparagingThePhantoms/Q00930_DisparagingThePhantoms.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00930_DisparagingThePhantoms/Q00930_DisparagingThePhantoms.java
@@ -80,7 +80,7 @@ public class Q00930_DisparagingThePhantoms extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00931_MemoriesOfTheWind/Q00931_MemoriesOfTheWind.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00931_MemoriesOfTheWind/Q00931_MemoriesOfTheWind.java
index 5f92dba5cd..31ffff4f32 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00931_MemoriesOfTheWind/Q00931_MemoriesOfTheWind.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00931_MemoriesOfTheWind/Q00931_MemoriesOfTheWind.java
@@ -78,7 +78,7 @@ public class Q00931_MemoriesOfTheWind extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00932_SayhasEnergy/Q00932_SayhasEnergy.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00932_SayhasEnergy/Q00932_SayhasEnergy.java
index 374f7566ba..2682626efb 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00932_SayhasEnergy/Q00932_SayhasEnergy.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00932_SayhasEnergy/Q00932_SayhasEnergy.java
@@ -68,7 +68,7 @@ public class Q00932_SayhasEnergy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java
index 784084e18f..3f3674f408 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java
@@ -79,7 +79,7 @@ public class Q00937_ToReviveTheFishingGuild extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java
index fcaea628f2..14766f9216 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java
@@ -73,7 +73,7 @@ public class Q00938_TheFishermansOtherHobby extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
index aea1e23329..adb2982ac1 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
@@ -48,7 +48,7 @@ public class Q10282_ToTheSeedOfAnnihilation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
index e5310632bd..dc9e9a1de4 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
@@ -51,7 +51,7 @@ public class Q10283_RequestOfIceMerchant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java
index c8822c8a8a..fb0cefa677 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java
@@ -54,7 +54,7 @@ public class Q10284_AcquisitionOfDivineSword extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
index a5a7eaace6..d0294d0369 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
@@ -55,7 +55,7 @@ public class Q10285_MeetingSirra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
index b9a00e8388..94f82457bd 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
@@ -56,7 +56,7 @@ public class Q10286_ReunionWithSirra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
index c072297d38..d98cd117bd 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
@@ -50,7 +50,7 @@ public class Q10287_StoryOfThoseLeft extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
index 8ae5f96306..fe0e24dfe8 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
@@ -54,7 +54,7 @@ public class Q10290_LandDragonConqueror extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
index 093062bde0..554a7ac150 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
@@ -52,7 +52,7 @@ public class Q10291_FireDragonDestroyer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
index 4f42181d0b..38e346b1cd 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
@@ -65,7 +65,7 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java
index 9578509dc1..f80fbdc02b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java
@@ -57,7 +57,7 @@ public class Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java
index 72d0ca7ed5..0ddc585beb 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java
@@ -95,7 +95,7 @@ public class Q10294_SevenSignsToTheMonasteryOfSilence extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java
index 747a9b8e55..fff91fc378 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java
@@ -105,7 +105,7 @@ public class Q10295_SevenSignsSolinasTomb extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java
index e4cf9dbdf6..f350112a68 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java
@@ -60,7 +60,7 @@ public class Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java
index fbcd6311a7..990366217f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java
@@ -50,7 +50,7 @@ public class Q10297_GrandOpeningComeToOurPub extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java
index c7a0f3a27b..44f2de8a14 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java
@@ -71,7 +71,7 @@ public class Q10301_ShadowOfTerrorBlackishRedFog extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10302_UnsettlingShadowAndRumors/Q10302_UnsettlingShadowAndRumors.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10302_UnsettlingShadowAndRumors/Q10302_UnsettlingShadowAndRumors.java
index 35634b2208..0ef255822a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10302_UnsettlingShadowAndRumors/Q10302_UnsettlingShadowAndRumors.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10302_UnsettlingShadowAndRumors/Q10302_UnsettlingShadowAndRumors.java
@@ -51,7 +51,7 @@ public class Q10302_UnsettlingShadowAndRumors extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java
index 075ada8600..77e10de1fd 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java
@@ -75,7 +75,7 @@ public class Q10303_CrossroadsBetweenLightAndDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java
index 679a617f05..f1df52055e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java
@@ -53,7 +53,7 @@ public class Q10305_UnstoppableFutileEfforts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10306_TheCorruptedLeader/Q10306_TheCorruptedLeader.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10306_TheCorruptedLeader/Q10306_TheCorruptedLeader.java
index 6c34bbf0ec..e400458693 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10306_TheCorruptedLeader/Q10306_TheCorruptedLeader.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10306_TheCorruptedLeader/Q10306_TheCorruptedLeader.java
@@ -59,7 +59,7 @@ public class Q10306_TheCorruptedLeader extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java
index 836ba2610b..b557c0b277 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java
@@ -56,7 +56,7 @@ public class Q10307_TheCorruptedLeaderHisTruth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10310_TwistedCreationTree/Q10310_TwistedCreationTree.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10310_TwistedCreationTree/Q10310_TwistedCreationTree.java
index 9a5f3e93df..6eb9953cdc 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10310_TwistedCreationTree/Q10310_TwistedCreationTree.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10310_TwistedCreationTree/Q10310_TwistedCreationTree.java
@@ -56,7 +56,7 @@ public class Q10310_TwistedCreationTree extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java
index 9e2c35dd09..8971512507 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java
@@ -46,7 +46,7 @@ public class Q10311_PeacefulDaysAreOver extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java
index c7dc807cdf..40c76b9e2f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java
@@ -55,7 +55,7 @@ public class Q10312_AbandonedGodsCreature extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java
index 8f25603bcc..a17c3ebaf6 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java
@@ -49,7 +49,7 @@ public class Q10315_ToThePrisonOfDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java
index 9c05b1f86e..eed57ef8dc 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java
@@ -56,7 +56,7 @@ public class Q10316_UndecayingMemoryOfThePast extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java
index a92657082e..cb331da1d7 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java
@@ -46,7 +46,7 @@ public class Q10317_OrbisWitch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java
index b92fa5339e..d79519ea24 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java
@@ -68,7 +68,7 @@ public class Q10318_DecayingDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java
index 6400c4120b..1638f8129a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java
@@ -58,7 +58,7 @@ public class Q10320_LetsGoToTheCentralSquare extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java
index 8a5ff73015..d256763eca 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java
@@ -47,7 +47,7 @@ public class Q10321_QualificationsOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java
index 4f48c0b900..b374578bd5 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java
@@ -58,7 +58,7 @@ public class Q10330_ToTheRuinsOfYeSagira extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java
index 23babca5f8..6675e7090b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java
@@ -71,7 +71,7 @@ public class Q10331_StartOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10332_ToughRoad/Q10332_ToughRoad.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10332_ToughRoad/Q10332_ToughRoad.java
index 64f3357d45..1251f64744 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10332_ToughRoad/Q10332_ToughRoad.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10332_ToughRoad/Q10332_ToughRoad.java
@@ -57,7 +57,7 @@ public class Q10332_ToughRoad extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java
index 4e03c773a8..6a7dbf118d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java
@@ -65,7 +65,7 @@ public class Q10333_DisappearedSakum extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10334_ReportingTheStatusOfTheWindmillHill/Q10334_ReportingTheStatusOfTheWindmillHill.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10334_ReportingTheStatusOfTheWindmillHill/Q10334_ReportingTheStatusOfTheWindmillHill.java
index 48650b1ce0..da883a8f14 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10334_ReportingTheStatusOfTheWindmillHill/Q10334_ReportingTheStatusOfTheWindmillHill.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10334_ReportingTheStatusOfTheWindmillHill/Q10334_ReportingTheStatusOfTheWindmillHill.java
@@ -49,7 +49,7 @@ public class Q10334_ReportingTheStatusOfTheWindmillHill extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java
index 3e39536a87..46e88abfab 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java
@@ -58,7 +58,7 @@ public class Q10335_RequestToFindSakum extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10336_DividedSakumKanilov/Q10336_DividedSakumKanilov.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10336_DividedSakumKanilov/Q10336_DividedSakumKanilov.java
index aa5e5614ce..488bc68fca 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10336_DividedSakumKanilov/Q10336_DividedSakumKanilov.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10336_DividedSakumKanilov/Q10336_DividedSakumKanilov.java
@@ -56,7 +56,7 @@ public class Q10336_DividedSakumKanilov extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java
index f2e21d8f93..19c5ac1817 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java
@@ -58,7 +58,7 @@ public class Q10337_SakumsImpact extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
index edc0bdf638..b92033f3e6 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java
@@ -66,7 +66,7 @@ public class Q10338_SeizeYourDestiny extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java
index 9bb47bafb8..718b70bbcd 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java
@@ -48,7 +48,7 @@ public class Q10341_DayOfDestinyHumansFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10341_DayOfDestinyHumansFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java
index 715453f3bb..071deb3562 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java
@@ -48,7 +48,7 @@ public class Q10342_DayOfDestinyElvenFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10342_DayOfDestinyElvenFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java
index b958ae1683..5701012e2c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java
@@ -48,7 +48,7 @@ public class Q10343_DayOfDestinyDarkElfsFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10343_DayOfDestinyDarkElfsFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java
index 3a9540d6f0..ff5519a3f1 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java
@@ -48,7 +48,7 @@ public class Q10344_DayOfDestinyOrcsFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10344_DayOfDestinyOrcsFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java
index f0b38f0d8f..9ad485a695 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java
@@ -48,7 +48,7 @@ public class Q10345_DayOfDestinyDwarfsFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10345_DayOfDestinyDwarfsFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java
index 0f3195f574..5690e3622f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java
@@ -48,7 +48,7 @@ public class Q10346_DayOfDestinyKamaelsFate extends ThirdClassTransferQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -76,7 +76,7 @@ public class Q10346_DayOfDestinyKamaelsFate extends ThirdClassTransferQuest
 			}
 			default:
 			{
-				htmltext = super.onAdvEvent(event, npc, player);
+				htmltext = super.onEvent(event, npc, player);
 			}
 		}
 		return htmltext;
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java
index 2874c31889..6a7bf0c265 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java
@@ -51,7 +51,7 @@ public class Q10351_OwnerOfHall extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java
index 1175e2cdd1..18cd204fc0 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java
@@ -94,7 +94,7 @@ public class Q10353_CertificationOfValue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java
index ea20f5fe52..c1723c3065 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java
@@ -51,7 +51,7 @@ public class Q10354_ResurrectedOwnerOfHall extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10355_BlacksmithsSoul1/Q10355_BlacksmithsSoul1.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10355_BlacksmithsSoul1/Q10355_BlacksmithsSoul1.java
index 16e5c07fbf..28629cd353 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10355_BlacksmithsSoul1/Q10355_BlacksmithsSoul1.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10355_BlacksmithsSoul1/Q10355_BlacksmithsSoul1.java
@@ -73,7 +73,7 @@ public class Q10355_BlacksmithsSoul1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10356_BlacksmithsSoul2/Q10356_BlacksmithsSoul2.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10356_BlacksmithsSoul2/Q10356_BlacksmithsSoul2.java
index 34ddbeb550..92d621ebe8 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10356_BlacksmithsSoul2/Q10356_BlacksmithsSoul2.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10356_BlacksmithsSoul2/Q10356_BlacksmithsSoul2.java
@@ -65,7 +65,7 @@ public class Q10356_BlacksmithsSoul2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java
index d180f6cc32..3f55b11c38 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java
@@ -59,7 +59,7 @@ public class Q10358_DividedSakumPoslof extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10359_TracesOfEvil/Q10359_TracesOfEvil.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10359_TracesOfEvil/Q10359_TracesOfEvil.java
index 06b030511a..be3a0cd2a8 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10359_TracesOfEvil/Q10359_TracesOfEvil.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10359_TracesOfEvil/Q10359_TracesOfEvil.java
@@ -69,7 +69,7 @@ public class Q10359_TracesOfEvil extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java
index 9f01a049cf..56eaa948f2 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java
@@ -89,7 +89,7 @@ public class Q10360_CertificationOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java
index de64b241ea..8080af8df8 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java
@@ -59,7 +59,7 @@ public class Q10362_CertificationOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java
index 52a0d77960..e7071d4011 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java
@@ -61,7 +61,7 @@ public class Q10363_RequestOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java
index a3f167bb3b..2cad7041b8 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java
@@ -59,7 +59,7 @@ public class Q10364_ObligationsOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/Q10365_ForTheSearchdogKing.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/Q10365_ForTheSearchdogKing.java
index e121324c80..fa5575aaba 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/Q10365_ForTheSearchdogKing.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/Q10365_ForTheSearchdogKing.java
@@ -57,7 +57,7 @@ public class Q10365_ForTheSearchdogKing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java
index affa7852ba..f4baa88fde 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java
@@ -62,7 +62,7 @@ public class Q10366_ReportOnTheSituationAtTheRuins extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10369_NoblesseSoulTesting/Q10369_NoblesseSoulTesting.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10369_NoblesseSoulTesting/Q10369_NoblesseSoulTesting.java
index 236fe0146e..511af97acc 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10369_NoblesseSoulTesting/Q10369_NoblesseSoulTesting.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10369_NoblesseSoulTesting/Q10369_NoblesseSoulTesting.java
@@ -122,11 +122,11 @@ public class Q10369_NoblesseSoulTesting extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player == null)
 		{
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
@@ -321,7 +321,7 @@ public class Q10369_NoblesseSoulTesting extends Quest
 									final Quest instance = QuestManager.getInstance().getQuest(EvasHiddenSpace.class.getSimpleName());
 									if (instance != null)
 									{
-										instance.onAdvEvent("enterInstance", npc, player);
+										instance.onEvent("enterInstance", npc, player);
 									}
 									htmltext = null;
 									break;
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10373_ExploringTheDimensionSealingTheDimension/Q10373_ExploringTheDimensionSealingTheDimension.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10373_ExploringTheDimensionSealingTheDimension/Q10373_ExploringTheDimensionSealingTheDimension.java
index 7056e8b72a..425b0c979d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10373_ExploringTheDimensionSealingTheDimension/Q10373_ExploringTheDimensionSealingTheDimension.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10373_ExploringTheDimensionSealingTheDimension/Q10373_ExploringTheDimensionSealingTheDimension.java
@@ -44,7 +44,7 @@ public class Q10373_ExploringTheDimensionSealingTheDimension extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java
index 255a3ce354..6a38565c9f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java
@@ -59,7 +59,7 @@ public class Q10377_TheInvadedExecutionGrounds extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10378_WeedingWork/Q10378_WeedingWork.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10378_WeedingWork/Q10378_WeedingWork.java
index e55058d9a5..cc498e2821 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10378_WeedingWork/Q10378_WeedingWork.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10378_WeedingWork/Q10378_WeedingWork.java
@@ -57,7 +57,7 @@ public class Q10378_WeedingWork extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10379_AnUninvitedGuest/Q10379_AnUninvitedGuest.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10379_AnUninvitedGuest/Q10379_AnUninvitedGuest.java
index 8502410bee..e227de28c7 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10379_AnUninvitedGuest/Q10379_AnUninvitedGuest.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10379_AnUninvitedGuest/Q10379_AnUninvitedGuest.java
@@ -69,7 +69,7 @@ public class Q10379_AnUninvitedGuest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10380_TheExecutionersExecution/Q10380_TheExecutionersExecution.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10380_TheExecutionersExecution/Q10380_TheExecutionersExecution.java
index 7b59d40bcb..5b4910c43e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10380_TheExecutionersExecution/Q10380_TheExecutionersExecution.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10380_TheExecutionersExecution/Q10380_TheExecutionersExecution.java
@@ -67,7 +67,7 @@ public class Q10380_TheExecutionersExecution extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java
index 3fdb1d2625..1a0550ce7a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java
@@ -49,7 +49,7 @@ public class Q10381_ToTheSeedOfHellfire extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10382_DayOfLiberation/Q10382_DayOfLiberation.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10382_DayOfLiberation/Q10382_DayOfLiberation.java
index 29de22db80..bf7a89cbc4 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10382_DayOfLiberation/Q10382_DayOfLiberation.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10382_DayOfLiberation/Q10382_DayOfLiberation.java
@@ -48,7 +48,7 @@ public class Q10382_DayOfLiberation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java
index 5a50c186ec..97fd290cdb 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java
@@ -61,7 +61,7 @@ public class Q10383_FergasonsOffer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java
index 11188fdada..9aba58dd1e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java
@@ -52,7 +52,7 @@ public class Q10384_AnAudienceWithTauti extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10385_RedThreadOfFate/Q10385_RedThreadOfFate.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10385_RedThreadOfFate/Q10385_RedThreadOfFate.java
index e16cde08bf..1a97e6d7de 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10385_RedThreadOfFate/Q10385_RedThreadOfFate.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10385_RedThreadOfFate/Q10385_RedThreadOfFate.java
@@ -120,7 +120,7 @@ public class Q10385_RedThreadOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
@@ -756,7 +756,7 @@ public class Q10385_RedThreadOfFate extends Quest
 						final Quest instance = QuestManager.getInstance().getQuest(TalkingIslandPast.class.getSimpleName());
 						if (instance != null)
 						{
-							instance.onAdvEvent("enterInstance", npc, player);
+							instance.onEvent("enterInstance", npc, player);
 						}
 					}
 					break;
@@ -844,7 +844,7 @@ public class Q10385_RedThreadOfFate extends Quest
 							final Quest instance = QuestManager.getInstance().getQuest(TalkingIslandPast.class.getSimpleName());
 							if (instance != null)
 							{
-								instance.onAdvEvent("enterInstance", npc, player);
+								instance.onEvent("enterInstance", npc, player);
 							}
 							break;
 						}
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10386_MysteriousJourney/Q10386_MysteriousJourney.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10386_MysteriousJourney/Q10386_MysteriousJourney.java
index 199681b2fa..51a014c8bf 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10386_MysteriousJourney/Q10386_MysteriousJourney.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10386_MysteriousJourney/Q10386_MysteriousJourney.java
@@ -50,7 +50,7 @@ public class Q10386_MysteriousJourney extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10387_SoullessOne/Q10387_SoullessOne.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10387_SoullessOne/Q10387_SoullessOne.java
index 3b4e70d070..90284f0de9 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10387_SoullessOne/Q10387_SoullessOne.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10387_SoullessOne/Q10387_SoullessOne.java
@@ -54,7 +54,7 @@ public class Q10387_SoullessOne extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java
index 174ea1a300..e5a8517a69 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java
@@ -46,7 +46,7 @@ public class Q10388_ConspiracyBehindDoor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java
index 6d60016a06..619cf89fa5 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java
@@ -66,7 +66,7 @@ public class Q10389_TheVoiceOfAuthority extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10390_KekropusLetter/Q10390_KekropusLetter.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10390_KekropusLetter/Q10390_KekropusLetter.java
index 267f3c669f..d55e74b0a5 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10390_KekropusLetter/Q10390_KekropusLetter.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10390_KekropusLetter/Q10390_KekropusLetter.java
@@ -67,7 +67,7 @@ public class Q10390_KekropusLetter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10391_ASuspiciousHelper/Q10391_ASuspiciousHelper.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10391_ASuspiciousHelper/Q10391_ASuspiciousHelper.java
index 52f96af258..e9ad07b210 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10391_ASuspiciousHelper/Q10391_ASuspiciousHelper.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10391_ASuspiciousHelper/Q10391_ASuspiciousHelper.java
@@ -51,7 +51,7 @@ public class Q10391_ASuspiciousHelper extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10392_FailureAndItsConsequences/Q10392_FailureAndItsConsequences.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10392_FailureAndItsConsequences/Q10392_FailureAndItsConsequences.java
index bf10758dda..7fb2e89ae5 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10392_FailureAndItsConsequences/Q10392_FailureAndItsConsequences.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10392_FailureAndItsConsequences/Q10392_FailureAndItsConsequences.java
@@ -59,7 +59,7 @@ public class Q10392_FailureAndItsConsequences extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10393_KekropusLetterAClueCompleted/Q10393_KekropusLetterAClueCompleted.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10393_KekropusLetterAClueCompleted/Q10393_KekropusLetterAClueCompleted.java
index 8c98c0dbf8..b1f8d64e2e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10393_KekropusLetterAClueCompleted/Q10393_KekropusLetterAClueCompleted.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10393_KekropusLetterAClueCompleted/Q10393_KekropusLetterAClueCompleted.java
@@ -58,7 +58,7 @@ public class Q10393_KekropusLetterAClueCompleted extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java
index 4156426b80..ac75f9b6c9 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java
@@ -54,7 +54,7 @@ public class Q10394_MutualBenefit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java
index 2475b9b253..2602e8faa6 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java
@@ -65,7 +65,7 @@ public class Q10395_NotATraitor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player, false);
 		if (st == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10401_KekropusLetterDecodingTheBadge/Q10401_KekropusLetterDecodingTheBadge.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10401_KekropusLetterDecodingTheBadge/Q10401_KekropusLetterDecodingTheBadge.java
index f9a1f2697f..c80d7c0959 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10401_KekropusLetterDecodingTheBadge/Q10401_KekropusLetterDecodingTheBadge.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10401_KekropusLetterDecodingTheBadge/Q10401_KekropusLetterDecodingTheBadge.java
@@ -58,7 +58,7 @@ public class Q10401_KekropusLetterDecodingTheBadge extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java
index e94bd7c4f5..a510527418 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java
@@ -63,7 +63,7 @@ public class Q10402_NowhereToTurn extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10403_TheGuardianGiant/Q10403_TheGuardianGiant.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10403_TheGuardianGiant/Q10403_TheGuardianGiant.java
index 94c094f26e..05712622f1 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10403_TheGuardianGiant/Q10403_TheGuardianGiant.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10403_TheGuardianGiant/Q10403_TheGuardianGiant.java
@@ -63,7 +63,7 @@ public class Q10403_TheGuardianGiant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10404_KekropusLetterAHiddenMeaning/Q10404_KekropusLetterAHiddenMeaning.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10404_KekropusLetterAHiddenMeaning/Q10404_KekropusLetterAHiddenMeaning.java
index 0fc3f84dab..5539f5f591 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10404_KekropusLetterAHiddenMeaning/Q10404_KekropusLetterAHiddenMeaning.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10404_KekropusLetterAHiddenMeaning/Q10404_KekropusLetterAHiddenMeaning.java
@@ -58,7 +58,7 @@ public class Q10404_KekropusLetterAHiddenMeaning extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10405_KartiasSeed/Q10405_KartiasSeed.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10405_KartiasSeed/Q10405_KartiasSeed.java
index 42291ddcaf..ef7e7396db 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10405_KartiasSeed/Q10405_KartiasSeed.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10405_KartiasSeed/Q10405_KartiasSeed.java
@@ -66,7 +66,7 @@ public class Q10405_KartiasSeed extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java
index 327c51112a..f4ede19821 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java
@@ -55,7 +55,7 @@ public class Q10406_BeforeDarknessBearsFruit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10408_KekropusLetterTheSwampOfScreams/Q10408_KekropusLetterTheSwampOfScreams.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10408_KekropusLetterTheSwampOfScreams/Q10408_KekropusLetterTheSwampOfScreams.java
index 85a688fa3e..26e516a179 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10408_KekropusLetterTheSwampOfScreams/Q10408_KekropusLetterTheSwampOfScreams.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10408_KekropusLetterTheSwampOfScreams/Q10408_KekropusLetterTheSwampOfScreams.java
@@ -58,7 +58,7 @@ public class Q10408_KekropusLetterTheSwampOfScreams extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java
index f5af9f664d..dce8f9986b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java
@@ -48,7 +48,7 @@ public class Q10409_ASuspiciousVagabondInTheSwamp extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java
index 77b3ca56b2..49f9797292 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java
@@ -73,7 +73,7 @@ public class Q10410_EmbryoInTheSwampOfScreams extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10411_KekropusLetterTheForestOfTheDead/Q10411_KekropusLetterTheForestOfTheDead.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10411_KekropusLetterTheForestOfTheDead/Q10411_KekropusLetterTheForestOfTheDead.java
index 1ff743da57..c5aeebf51e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10411_KekropusLetterTheForestOfTheDead/Q10411_KekropusLetterTheForestOfTheDead.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10411_KekropusLetterTheForestOfTheDead/Q10411_KekropusLetterTheForestOfTheDead.java
@@ -58,7 +58,7 @@ public class Q10411_KekropusLetterTheForestOfTheDead extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java
index 2bcc230a31..79c93ddebe 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java
@@ -48,7 +48,7 @@ public class Q10412_ASuspiciousVagabondInTheForest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java
index 368315d6d6..1260efb4f7 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java
@@ -102,7 +102,7 @@ public class Q10413_EmbryoInTheForestOfTheDead extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10414_KekropusLetterWithCourage/Q10414_KekropusLetterWithCourage.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10414_KekropusLetterWithCourage/Q10414_KekropusLetterWithCourage.java
index 4b6fcca87c..13b925da20 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10414_KekropusLetterWithCourage/Q10414_KekropusLetterWithCourage.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10414_KekropusLetterWithCourage/Q10414_KekropusLetterWithCourage.java
@@ -58,7 +58,7 @@ public class Q10414_KekropusLetterWithCourage extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10415_KekropusLetterWithWisdom/Q10415_KekropusLetterWithWisdom.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10415_KekropusLetterWithWisdom/Q10415_KekropusLetterWithWisdom.java
index 299f20a84e..95dd7f85c1 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10415_KekropusLetterWithWisdom/Q10415_KekropusLetterWithWisdom.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10415_KekropusLetterWithWisdom/Q10415_KekropusLetterWithWisdom.java
@@ -59,7 +59,7 @@ public class Q10415_KekropusLetterWithWisdom extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java
index 59961329d7..3436179c13 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java
@@ -67,7 +67,7 @@ public class Q10416_InSearchOfTheEyeOfArgos extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java
index cd8a331434..601dddd028 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java
@@ -72,7 +72,7 @@ public class Q10417_DaimonTheWhiteEyed extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10418_TheImmortalPirateKing/Q10418_TheImmortalPirateKing.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10418_TheImmortalPirateKing/Q10418_TheImmortalPirateKing.java
index 239ef8a3a7..d6d93746c2 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10418_TheImmortalPirateKing/Q10418_TheImmortalPirateKing.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10418_TheImmortalPirateKing/Q10418_TheImmortalPirateKing.java
@@ -48,7 +48,7 @@ public class Q10418_TheImmortalPirateKing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10419_KekropusLetterKampfsWhereabouts/Q10419_KekropusLetterKampfsWhereabouts.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10419_KekropusLetterKampfsWhereabouts/Q10419_KekropusLetterKampfsWhereabouts.java
index 010fdc756a..86053d8d12 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10419_KekropusLetterKampfsWhereabouts/Q10419_KekropusLetterKampfsWhereabouts.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10419_KekropusLetterKampfsWhereabouts/Q10419_KekropusLetterKampfsWhereabouts.java
@@ -58,7 +58,7 @@ public class Q10419_KekropusLetterKampfsWhereabouts extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10420_TheVarkaSilenosSupporters/Q10420_TheVarkaSilenosSupporters.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10420_TheVarkaSilenosSupporters/Q10420_TheVarkaSilenosSupporters.java
index d7bd1e9006..2e9aeebde8 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10420_TheVarkaSilenosSupporters/Q10420_TheVarkaSilenosSupporters.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10420_TheVarkaSilenosSupporters/Q10420_TheVarkaSilenosSupporters.java
@@ -75,7 +75,7 @@ public class Q10420_TheVarkaSilenosSupporters extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10421_AssassinationOfTheVarkaSilenosCommander/Q10421_AssassinationOfTheVarkaSilenosCommander.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10421_AssassinationOfTheVarkaSilenosCommander/Q10421_AssassinationOfTheVarkaSilenosCommander.java
index b466969c97..2d6adc18da 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10421_AssassinationOfTheVarkaSilenosCommander/Q10421_AssassinationOfTheVarkaSilenosCommander.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10421_AssassinationOfTheVarkaSilenosCommander/Q10421_AssassinationOfTheVarkaSilenosCommander.java
@@ -51,7 +51,7 @@ public class Q10421_AssassinationOfTheVarkaSilenosCommander extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java
index 080ce0ebad..d68989ef8a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java
@@ -55,7 +55,7 @@ public class Q10422_AssassinationOfTheVarkaSilenosChief extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java
index b8823b8e7a..dc76dc4f94 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java
@@ -88,7 +88,7 @@ public class Q10423_EmbryoStrongholdRaid extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10424_KekropusLetterBelosWhereabouts/Q10424_KekropusLetterBelosWhereabouts.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10424_KekropusLetterBelosWhereabouts/Q10424_KekropusLetterBelosWhereabouts.java
index 071af1eb3d..1f7aa6f81a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10424_KekropusLetterBelosWhereabouts/Q10424_KekropusLetterBelosWhereabouts.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10424_KekropusLetterBelosWhereabouts/Q10424_KekropusLetterBelosWhereabouts.java
@@ -58,7 +58,7 @@ public class Q10424_KekropusLetterBelosWhereabouts extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10425_TheKetraOrcSupporters/Q10425_TheKetraOrcSupporters.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10425_TheKetraOrcSupporters/Q10425_TheKetraOrcSupporters.java
index 2fd6da992d..ae30164989 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10425_TheKetraOrcSupporters/Q10425_TheKetraOrcSupporters.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10425_TheKetraOrcSupporters/Q10425_TheKetraOrcSupporters.java
@@ -78,7 +78,7 @@ public class Q10425_TheKetraOrcSupporters extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10426_AssassinationOfTheKetraOrcCommander/Q10426_AssassinationOfTheKetraOrcCommander.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10426_AssassinationOfTheKetraOrcCommander/Q10426_AssassinationOfTheKetraOrcCommander.java
index 094dcd36c3..1ed6ed4388 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10426_AssassinationOfTheKetraOrcCommander/Q10426_AssassinationOfTheKetraOrcCommander.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10426_AssassinationOfTheKetraOrcCommander/Q10426_AssassinationOfTheKetraOrcCommander.java
@@ -53,7 +53,7 @@ public class Q10426_AssassinationOfTheKetraOrcCommander extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java
index ccd9df0ad1..56f5951419 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java
@@ -55,7 +55,7 @@ public class Q10427_AssassinationOfTheKetraOrcChief extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10445_AnImpendingThreat/Q10445_AnImpendingThreat.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10445_AnImpendingThreat/Q10445_AnImpendingThreat.java
index c78d904936..dac215a5b1 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10445_AnImpendingThreat/Q10445_AnImpendingThreat.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10445_AnImpendingThreat/Q10445_AnImpendingThreat.java
@@ -53,7 +53,7 @@ public class Q10445_AnImpendingThreat extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java
index 1f244a23a1..407e7af01d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java
@@ -58,7 +58,7 @@ public class Q10446_HitAndRun extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java
index c49b98c92d..c173bf24b6 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java
@@ -74,7 +74,7 @@ public class Q10447_TimingIsEverything extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10450_ADarkAmbition/Q10450_ADarkAmbition.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10450_ADarkAmbition/Q10450_ADarkAmbition.java
index c3f232b499..8f085a2197 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10450_ADarkAmbition/Q10450_ADarkAmbition.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10450_ADarkAmbition/Q10450_ADarkAmbition.java
@@ -49,7 +49,7 @@ public class Q10450_ADarkAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10453_StoppingTheWindDragon/Q10453_StoppingTheWindDragon.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10453_StoppingTheWindDragon/Q10453_StoppingTheWindDragon.java
index 3b567c5d04..6a74beb026 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10453_StoppingTheWindDragon/Q10453_StoppingTheWindDragon.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10453_StoppingTheWindDragon/Q10453_StoppingTheWindDragon.java
@@ -46,7 +46,7 @@ public class Q10453_StoppingTheWindDragon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java
index 133390e3ed..b58a5b6e94 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java
@@ -49,7 +49,7 @@ public class Q10454_FinalEmbryoApostle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java
index b6cec7570e..7268e0de45 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java
@@ -50,7 +50,7 @@ public class Q10455_ElikiasLetter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10456_OperationRescue/Q10456_OperationRescue.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10456_OperationRescue/Q10456_OperationRescue.java
index f38ae9e388..7da35bc35f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10456_OperationRescue/Q10456_OperationRescue.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10456_OperationRescue/Q10456_OperationRescue.java
@@ -66,7 +66,7 @@ public class Q10456_OperationRescue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10457_KefensisIllusion/Q10457_KefensisIllusion.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10457_KefensisIllusion/Q10457_KefensisIllusion.java
index 907cca5e98..32d56eba4b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10457_KefensisIllusion/Q10457_KefensisIllusion.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10457_KefensisIllusion/Q10457_KefensisIllusion.java
@@ -65,7 +65,7 @@ public class Q10457_KefensisIllusion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java
index fc5b941631..11718fe3dc 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java
@@ -54,7 +54,7 @@ public class Q10459_ASickAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10460_ReturnOfTheAlligatorHunter/Q10460_ReturnOfTheAlligatorHunter.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10460_ReturnOfTheAlligatorHunter/Q10460_ReturnOfTheAlligatorHunter.java
index e8890d2fdb..5220e36a95 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10460_ReturnOfTheAlligatorHunter/Q10460_ReturnOfTheAlligatorHunter.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10460_ReturnOfTheAlligatorHunter/Q10460_ReturnOfTheAlligatorHunter.java
@@ -60,7 +60,7 @@ public class Q10460_ReturnOfTheAlligatorHunter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10472_WindsOfFateEncroachingShadows/Q10472_WindsOfFateEncroachingShadows.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10472_WindsOfFateEncroachingShadows/Q10472_WindsOfFateEncroachingShadows.java
index c4e70d36b7..a4733734be 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10472_WindsOfFateEncroachingShadows/Q10472_WindsOfFateEncroachingShadows.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10472_WindsOfFateEncroachingShadows/Q10472_WindsOfFateEncroachingShadows.java
@@ -109,7 +109,7 @@ public class Q10472_WindsOfFateEncroachingShadows extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
index bacbb7058b..ad79a5980b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
@@ -73,7 +73,7 @@ public class Q10501_ZakenEmbroideredSoulCloak extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (player.getLevel() >= MIN_LEVEL) && event.equals("32612-04.html"))
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
index d1678a7601..38f4514197 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
@@ -73,7 +73,7 @@ public class Q10502_FreyaEmbroideredSoulCloak extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (player.getLevel() >= MIN_LEVEL) && event.equals("32612-04.html"))
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
index 224940ecd9..08aa62d532 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
@@ -74,7 +74,7 @@ public class Q10503_FrintezzaEmbroideredSoulCloak extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (player.getLevel() >= MIN_LEVEL) && event.equals("32612-04.html"))
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java
index b150a02b38..d81d398014 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java
@@ -66,7 +66,7 @@ public class Q10504_JewelOfAntharas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java
index 0c9360d9b7..e598298776 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java
@@ -66,7 +66,7 @@ public class Q10505_JewelOfValakas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10516_UnveiledFafurionTemple/Q10516_UnveiledFafurionTemple.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10516_UnveiledFafurionTemple/Q10516_UnveiledFafurionTemple.java
index 8c57b6c5d4..ba137a8d4b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10516_UnveiledFafurionTemple/Q10516_UnveiledFafurionTemple.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10516_UnveiledFafurionTemple/Q10516_UnveiledFafurionTemple.java
@@ -53,7 +53,7 @@ public final class Q10516_UnveiledFafurionTemple extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10517_FafurionsMinions/Q10517_FafurionsMinions.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10517_FafurionsMinions/Q10517_FafurionsMinions.java
index d0340b79e0..9d538b1c73 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10517_FafurionsMinions/Q10517_FafurionsMinions.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10517_FafurionsMinions/Q10517_FafurionsMinions.java
@@ -83,7 +83,7 @@ public final class Q10517_FafurionsMinions extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10518_SucceedingThePriestess/Q10518_SucceedingThePriestess.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10518_SucceedingThePriestess/Q10518_SucceedingThePriestess.java
index de9b731200..b67086433c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10518_SucceedingThePriestess/Q10518_SucceedingThePriestess.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10518_SucceedingThePriestess/Q10518_SucceedingThePriestess.java
@@ -103,7 +103,7 @@ public final class Q10518_SucceedingThePriestess extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10519_ControllingYourTemper/Q10519_ControllingYourTemper.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10519_ControllingYourTemper/Q10519_ControllingYourTemper.java
index e8c23e42d8..711ca3d248 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10519_ControllingYourTemper/Q10519_ControllingYourTemper.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10519_ControllingYourTemper/Q10519_ControllingYourTemper.java
@@ -67,7 +67,7 @@ public final class Q10519_ControllingYourTemper extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10520_TempleGuardians/Q10520_TempleGuardians.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10520_TempleGuardians/Q10520_TempleGuardians.java
index 66bbbef920..9960251886 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10520_TempleGuardians/Q10520_TempleGuardians.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10520_TempleGuardians/Q10520_TempleGuardians.java
@@ -57,7 +57,7 @@ public final class Q10520_TempleGuardians extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java
index a6a457bcfa..876a5665b7 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java
@@ -59,7 +59,7 @@ public class Q10521_QueenNavarisLetterVarkaSilenosBarracks extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10522_TheDarkSecretOfVarkaSilenos/Q10522_TheDarkSecretOfVarkaSilenos.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10522_TheDarkSecretOfVarkaSilenos/Q10522_TheDarkSecretOfVarkaSilenos.java
index 703a1ac8bc..9564458b27 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10522_TheDarkSecretOfVarkaSilenos/Q10522_TheDarkSecretOfVarkaSilenos.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10522_TheDarkSecretOfVarkaSilenos/Q10522_TheDarkSecretOfVarkaSilenos.java
@@ -73,7 +73,7 @@ public class Q10522_TheDarkSecretOfVarkaSilenos extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10523_TheAssassinationOfTheVarkaSilenosCommander/Q10523_TheAssassinationOfTheVarkaSilenosCommander.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10523_TheAssassinationOfTheVarkaSilenosCommander/Q10523_TheAssassinationOfTheVarkaSilenosCommander.java
index bc88c09827..66a58918c5 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10523_TheAssassinationOfTheVarkaSilenosCommander/Q10523_TheAssassinationOfTheVarkaSilenosCommander.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10523_TheAssassinationOfTheVarkaSilenosCommander/Q10523_TheAssassinationOfTheVarkaSilenosCommander.java
@@ -55,7 +55,7 @@ public class Q10523_TheAssassinationOfTheVarkaSilenosCommander extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief.java
index 73761de539..f501b9bbee 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief.java
@@ -58,7 +58,7 @@ public class Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief extends Ques
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10525_QueenNavarisLetterKetraOrcOutpost/Q10525_QueenNavarisLetterKetraOrcOutpost.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10525_QueenNavarisLetterKetraOrcOutpost/Q10525_QueenNavarisLetterKetraOrcOutpost.java
index c6f3ba7642..facbaa4be9 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10525_QueenNavarisLetterKetraOrcOutpost/Q10525_QueenNavarisLetterKetraOrcOutpost.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10525_QueenNavarisLetterKetraOrcOutpost/Q10525_QueenNavarisLetterKetraOrcOutpost.java
@@ -58,7 +58,7 @@ public class Q10525_QueenNavarisLetterKetraOrcOutpost extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10526_TheDarkSecretOfTheKetraOrcs/Q10526_TheDarkSecretOfTheKetraOrcs.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10526_TheDarkSecretOfTheKetraOrcs/Q10526_TheDarkSecretOfTheKetraOrcs.java
index 95b5d6c43d..038e8661b8 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10526_TheDarkSecretOfTheKetraOrcs/Q10526_TheDarkSecretOfTheKetraOrcs.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10526_TheDarkSecretOfTheKetraOrcs/Q10526_TheDarkSecretOfTheKetraOrcs.java
@@ -78,7 +78,7 @@ public class Q10526_TheDarkSecretOfTheKetraOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10527_TheAssassinationOfTheKetraOrcCommander/Q10527_TheAssassinationOfTheKetraOrcCommander.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10527_TheAssassinationOfTheKetraOrcCommander/Q10527_TheAssassinationOfTheKetraOrcCommander.java
index 7cca4304fb..16beb3437e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10527_TheAssassinationOfTheKetraOrcCommander/Q10527_TheAssassinationOfTheKetraOrcCommander.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10527_TheAssassinationOfTheKetraOrcCommander/Q10527_TheAssassinationOfTheKetraOrcCommander.java
@@ -56,7 +56,7 @@ public class Q10527_TheAssassinationOfTheKetraOrcCommander extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10528_TheAssassinationOfTheKetraOrcChief/Q10528_TheAssassinationOfTheKetraOrcChief.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10528_TheAssassinationOfTheKetraOrcChief/Q10528_TheAssassinationOfTheKetraOrcChief.java
index 02307626f3..713ac08316 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10528_TheAssassinationOfTheKetraOrcChief/Q10528_TheAssassinationOfTheKetraOrcChief.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10528_TheAssassinationOfTheKetraOrcChief/Q10528_TheAssassinationOfTheKetraOrcChief.java
@@ -59,7 +59,7 @@ public class Q10528_TheAssassinationOfTheKetraOrcChief extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10529_IvoryTowersResearchSeaOfSporesJournal/Q10529_IvoryTowersResearchSeaOfSporesJournal.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10529_IvoryTowersResearchSeaOfSporesJournal/Q10529_IvoryTowersResearchSeaOfSporesJournal.java
index 48755350a4..ffe670f3ff 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10529_IvoryTowersResearchSeaOfSporesJournal/Q10529_IvoryTowersResearchSeaOfSporesJournal.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10529_IvoryTowersResearchSeaOfSporesJournal/Q10529_IvoryTowersResearchSeaOfSporesJournal.java
@@ -75,7 +75,7 @@ public final class Q10529_IvoryTowersResearchSeaOfSporesJournal extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10530_KekropusLetterTheDragonsTransition/Q10530_KekropusLetterTheDragonsTransition.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10530_KekropusLetterTheDragonsTransition/Q10530_KekropusLetterTheDragonsTransition.java
index 9db51e963f..1ab3652531 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10530_KekropusLetterTheDragonsTransition/Q10530_KekropusLetterTheDragonsTransition.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10530_KekropusLetterTheDragonsTransition/Q10530_KekropusLetterTheDragonsTransition.java
@@ -61,7 +61,7 @@ public class Q10530_KekropusLetterTheDragonsTransition extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10531_OddHappeningsAtDragonValley/Q10531_OddHappeningsAtDragonValley.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10531_OddHappeningsAtDragonValley/Q10531_OddHappeningsAtDragonValley.java
index 0b6cb61f4c..b366a824aa 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10531_OddHappeningsAtDragonValley/Q10531_OddHappeningsAtDragonValley.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10531_OddHappeningsAtDragonValley/Q10531_OddHappeningsAtDragonValley.java
@@ -72,7 +72,7 @@ public class Q10531_OddHappeningsAtDragonValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java
index f8f9d1af2c..c67fbd555d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java
@@ -68,7 +68,7 @@ public class Q10532_UncoveringTheConspiracy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10533_OrfensAmbition/Q10533_OrfensAmbition.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10533_OrfensAmbition/Q10533_OrfensAmbition.java
index 44029ff4b4..9afa05744d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10533_OrfensAmbition/Q10533_OrfensAmbition.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10533_OrfensAmbition/Q10533_OrfensAmbition.java
@@ -54,7 +54,7 @@ public final class Q10533_OrfensAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10534_HatchlingResearch/Q10534_HatchlingResearch.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10534_HatchlingResearch/Q10534_HatchlingResearch.java
index ca8ea7ebfa..32a839c147 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10534_HatchlingResearch/Q10534_HatchlingResearch.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10534_HatchlingResearch/Q10534_HatchlingResearch.java
@@ -52,7 +52,7 @@ public class Q10534_HatchlingResearch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10537_KamaelDisarray/Q10537_KamaelDisarray.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10537_KamaelDisarray/Q10537_KamaelDisarray.java
index 3f641802c2..63def42cfb 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10537_KamaelDisarray/Q10537_KamaelDisarray.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10537_KamaelDisarray/Q10537_KamaelDisarray.java
@@ -82,7 +82,7 @@ public class Q10537_KamaelDisarray extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10538_GiantsEvolution/Q10538_GiantsEvolution.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10538_GiantsEvolution/Q10538_GiantsEvolution.java
index 50e00578ab..c13aee2808 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10538_GiantsEvolution/Q10538_GiantsEvolution.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10538_GiantsEvolution/Q10538_GiantsEvolution.java
@@ -60,7 +60,7 @@ public class Q10538_GiantsEvolution extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10539_EnergySupplyCutoffPlan/Q10539_EnergySupplyCutoffPlan.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10539_EnergySupplyCutoffPlan/Q10539_EnergySupplyCutoffPlan.java
index f97a6b1c21..4be23c454e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10539_EnergySupplyCutoffPlan/Q10539_EnergySupplyCutoffPlan.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10539_EnergySupplyCutoffPlan/Q10539_EnergySupplyCutoffPlan.java
@@ -61,7 +61,7 @@ public class Q10539_EnergySupplyCutoffPlan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10540_ThwartingMimirsPlan/Q10540_ThwartingMimirsPlan.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10540_ThwartingMimirsPlan/Q10540_ThwartingMimirsPlan.java
index aa8e864fb4..6462015e4a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10540_ThwartingMimirsPlan/Q10540_ThwartingMimirsPlan.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10540_ThwartingMimirsPlan/Q10540_ThwartingMimirsPlan.java
@@ -49,7 +49,7 @@ public class Q10540_ThwartingMimirsPlan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java
index d8806aaa46..2399b6f6f5 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java
@@ -76,7 +76,7 @@ public class Q10541_TrainLikeTheRealThing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java
index ac33019628..829bfe060e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java
@@ -64,7 +64,7 @@ public class Q10542_SearchingForNewPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java
index 5258465884..75e34abc11 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java
@@ -61,7 +61,7 @@ public class Q10543_SheddingWeight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10544_SeekerSupplies/Q10544_SeekerSupplies.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10544_SeekerSupplies/Q10544_SeekerSupplies.java
index 3c2f520f5b..02fcd6edca 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10544_SeekerSupplies/Q10544_SeekerSupplies.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10544_SeekerSupplies/Q10544_SeekerSupplies.java
@@ -71,7 +71,7 @@ public class Q10544_SeekerSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10552_ChallengeBalthusKnight/Q10552_ChallengeBalthusKnight.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10552_ChallengeBalthusKnight/Q10552_ChallengeBalthusKnight.java
index 8464944096..bf629ee65a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10552_ChallengeBalthusKnight/Q10552_ChallengeBalthusKnight.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10552_ChallengeBalthusKnight/Q10552_ChallengeBalthusKnight.java
@@ -68,7 +68,7 @@ public final class Q10552_ChallengeBalthusKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
@@ -87,7 +87,7 @@ public final class Q10552_ChallengeBalthusKnight extends Quest
 			final Quest instance = QuestManager.getInstance().getQuest(HatchlingNest.class.getSimpleName());
 			if (instance != null)
 			{
-				instance.onAdvEvent("enterInstance", npc, player);
+				instance.onEvent("enterInstance", npc, player);
 			}
 			htmltext = "tarti_balthus_q10552_03.htm";
 		}
@@ -125,7 +125,7 @@ public final class Q10552_ChallengeBalthusKnight extends Quest
 							final Quest instance = QuestManager.getInstance().getQuest(HatchlingNest.class.getSimpleName());
 							if (instance != null)
 							{
-								instance.onAdvEvent("enterInstance", npc, player);
+								instance.onEvent("enterInstance", npc, player);
 							}
 							htmltext = "tarti_balthus_q10552_04.htm";
 							break;
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10553_WhatMattersMoreThanAbility/Q10553_WhatMattersMoreThanAbility.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10553_WhatMattersMoreThanAbility/Q10553_WhatMattersMoreThanAbility.java
index f6b7a9381e..3583d34894 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10553_WhatMattersMoreThanAbility/Q10553_WhatMattersMoreThanAbility.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10553_WhatMattersMoreThanAbility/Q10553_WhatMattersMoreThanAbility.java
@@ -67,7 +67,7 @@ public final class Q10553_WhatMattersMoreThanAbility extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
@@ -181,7 +181,7 @@ public final class Q10553_WhatMattersMoreThanAbility extends Quest
 					final Quest instance = QuestManager.getInstance().getQuest(HatchlingCage.class.getSimpleName());
 					if (instance != null)
 					{
-						instance.onAdvEvent("enterInstance", npc, player);
+						instance.onEvent("enterInstance", npc, player);
 					}
 					break;
 				}
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10554_GiftForYou/Q10554_GiftForYou.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10554_GiftForYou/Q10554_GiftForYou.java
index 52eafc94b1..89768ca432 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10554_GiftForYou/Q10554_GiftForYou.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10554_GiftForYou/Q10554_GiftForYou.java
@@ -63,7 +63,7 @@ public final class Q10554_GiftForYou extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10555_ChargeAtAntharas/Q10555_ChargeAtAntharas.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10555_ChargeAtAntharas/Q10555_ChargeAtAntharas.java
index 5b4a982cea..21bea2b08a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10555_ChargeAtAntharas/Q10555_ChargeAtAntharas.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10555_ChargeAtAntharas/Q10555_ChargeAtAntharas.java
@@ -73,7 +73,7 @@ public final class Q10555_ChargeAtAntharas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
@@ -165,7 +165,7 @@ public final class Q10555_ChargeAtAntharas extends Quest
 							final Quest instance = QuestManager.getInstance().getQuest(AntharasNest.class.getSimpleName());
 							if (instance != null)
 							{
-								instance.onAdvEvent("startGemDragonsAttack", npc, player);
+								instance.onEvent("startGemDragonsAttack", npc, player);
 							}
 							qs.setCond(2, true);
 							player.getVariables().set(PlayerVariables.BALTHUS_PHASE, 3);
@@ -340,7 +340,7 @@ public final class Q10555_ChargeAtAntharas extends Quest
 					final Quest instance = QuestManager.getInstance().getQuest(AntharasNest.class.getSimpleName());
 					if (instance != null)
 					{
-						instance.onAdvEvent("enterInstance", npc, player);
+						instance.onEvent("enterInstance", npc, player);
 					}
 					break;
 				}
@@ -373,7 +373,7 @@ public final class Q10555_ChargeAtAntharas extends Quest
 					final Quest instance = QuestManager.getInstance().getQuest(AntharasNest.class.getSimpleName());
 					if (instance != null)
 					{
-						instance.onAdvEvent("startAntharasProgress", npc, killer);
+						instance.onEvent("startAntharasProgress", npc, killer);
 					}
 				}
 			}
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10556_ForgottenPowerStartOfFate/Q10556_ForgottenPowerStartOfFate.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10556_ForgottenPowerStartOfFate/Q10556_ForgottenPowerStartOfFate.java
index f1eb9e3f1f..126b03bda2 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10556_ForgottenPowerStartOfFate/Q10556_ForgottenPowerStartOfFate.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10556_ForgottenPowerStartOfFate/Q10556_ForgottenPowerStartOfFate.java
@@ -137,7 +137,7 @@ public final class Q10556_ForgottenPowerStartOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
@@ -298,7 +298,7 @@ public final class Q10556_ForgottenPowerStartOfFate extends Quest
 					final Quest abelius = QuestManager.getInstance().getQuest(PowerOfAbelius.class.getSimpleName());
 					if (abelius != null)
 					{
-						abelius.onAdvEvent("enterInstance", npc, player);
+						abelius.onEvent("enterInstance", npc, player);
 					}
 					break;
 				}
@@ -308,7 +308,7 @@ public final class Q10556_ForgottenPowerStartOfFate extends Quest
 					final Quest sapyros = QuestManager.getInstance().getQuest(PowerOfSapyros.class.getSimpleName());
 					if (sapyros != null)
 					{
-						sapyros.onAdvEvent("enterInstance", npc, player);
+						sapyros.onEvent("enterInstance", npc, player);
 					}
 					break;
 				}
@@ -318,7 +318,7 @@ public final class Q10556_ForgottenPowerStartOfFate extends Quest
 					final Quest kashnaga = QuestManager.getInstance().getQuest(PowerOfKashnaga.class.getSimpleName());
 					if (kashnaga != null)
 					{
-						kashnaga.onAdvEvent("enterInstance", npc, player);
+						kashnaga.onEvent("enterInstance", npc, player);
 					}
 					break;
 				}
@@ -328,7 +328,7 @@ public final class Q10556_ForgottenPowerStartOfFate extends Quest
 					final Quest cranigg = QuestManager.getInstance().getQuest(PowerOfCranigg.class.getSimpleName());
 					if (cranigg != null)
 					{
-						cranigg.onAdvEvent("enterInstance", npc, player);
+						cranigg.onEvent("enterInstance", npc, player);
 					}
 					break;
 				}
@@ -338,7 +338,7 @@ public final class Q10556_ForgottenPowerStartOfFate extends Quest
 					final Quest naviarope = QuestManager.getInstance().getQuest(PowerOfNaviarope.class.getSimpleName());
 					if (naviarope != null)
 					{
-						naviarope.onAdvEvent("enterInstance", npc, player);
+						naviarope.onEvent("enterInstance", npc, player);
 					}
 					break;
 				}
@@ -348,7 +348,7 @@ public final class Q10556_ForgottenPowerStartOfFate extends Quest
 					final Quest raister = QuestManager.getInstance().getQuest(PowerOfRaister.class.getSimpleName());
 					if (raister != null)
 					{
-						raister.onAdvEvent("enterInstance", npc, player);
+						raister.onEvent("enterInstance", npc, player);
 					}
 					break;
 				}
@@ -358,7 +358,7 @@ public final class Q10556_ForgottenPowerStartOfFate extends Quest
 					final Quest soltkreig = QuestManager.getInstance().getQuest(PowerOfSoltkreig.class.getSimpleName());
 					if (soltkreig != null)
 					{
-						soltkreig.onAdvEvent("enterInstance", npc, player);
+						soltkreig.onEvent("enterInstance", npc, player);
 					}
 					break;
 				}
@@ -368,7 +368,7 @@ public final class Q10556_ForgottenPowerStartOfFate extends Quest
 					final Quest lakcis = QuestManager.getInstance().getQuest(PowerOfLakcis.class.getSimpleName());
 					if (lakcis != null)
 					{
-						lakcis.onAdvEvent("enterInstance", npc, player);
+						lakcis.onEvent("enterInstance", npc, player);
 					}
 					break;
 				}
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10557_NewPowerWindsOfFate/Q10557_NewPowerWindsOfFate.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10557_NewPowerWindsOfFate/Q10557_NewPowerWindsOfFate.java
index a2cf99e670..f171fa8294 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10557_NewPowerWindsOfFate/Q10557_NewPowerWindsOfFate.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10557_NewPowerWindsOfFate/Q10557_NewPowerWindsOfFate.java
@@ -85,7 +85,7 @@ public final class Q10557_NewPowerWindsOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
@@ -180,7 +180,7 @@ public final class Q10557_NewPowerWindsOfFate extends Quest
 					final Quest faeron = QuestManager.getInstance().getQuest(FaeronVillage.class.getSimpleName());
 					if (faeron != null)
 					{
-						faeron.onAdvEvent("enterInstance", npc, player);
+						faeron.onEvent("enterInstance", npc, player);
 						switch (player.getClassId())
 						{
 							case EVISCERATOR_BALTHUS:
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10559_BeforeTheGuide/Q10559_BeforeTheGuide.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10559_BeforeTheGuide/Q10559_BeforeTheGuide.java
index 901a1fcb40..fd81b435f3 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10559_BeforeTheGuide/Q10559_BeforeTheGuide.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10559_BeforeTheGuide/Q10559_BeforeTheGuide.java
@@ -52,7 +52,7 @@ public final class Q10559_BeforeTheGuide extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10560_WayOfWanderingKnight/Q10560_WayOfWanderingKnight.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10560_WayOfWanderingKnight/Q10560_WayOfWanderingKnight.java
index 0226618ab4..f6c7a67460 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10560_WayOfWanderingKnight/Q10560_WayOfWanderingKnight.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10560_WayOfWanderingKnight/Q10560_WayOfWanderingKnight.java
@@ -80,7 +80,7 @@ public class Q10560_WayOfWanderingKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		final ClassId classId = player.getClassId();
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/Q10561_AcrossTheDeathLine.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/Q10561_AcrossTheDeathLine.java
index d8d454c123..dcdd435c39 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/Q10561_AcrossTheDeathLine.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/Q10561_AcrossTheDeathLine.java
@@ -58,7 +58,7 @@ public class Q10561_AcrossTheDeathLine extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10562_TakeUpArms/Q10562_TakeUpArms.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10562_TakeUpArms/Q10562_TakeUpArms.java
index da0b962652..a922861e43 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10562_TakeUpArms/Q10562_TakeUpArms.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10562_TakeUpArms/Q10562_TakeUpArms.java
@@ -55,7 +55,7 @@ public class Q10562_TakeUpArms extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10563_ControlOfPower/Q10563_ControlOfPower.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10563_ControlOfPower/Q10563_ControlOfPower.java
index 59f2a942da..4c3ded8c3e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10563_ControlOfPower/Q10563_ControlOfPower.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10563_ControlOfPower/Q10563_ControlOfPower.java
@@ -61,7 +61,7 @@ public final class Q10563_ControlOfPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10564_ProveProgress/Q10564_ProveProgress.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10564_ProveProgress/Q10564_ProveProgress.java
index 47435da877..160354e383 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10564_ProveProgress/Q10564_ProveProgress.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10564_ProveProgress/Q10564_ProveProgress.java
@@ -60,7 +60,7 @@ public final class Q10564_ProveProgress extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10565_NothingIsImpossible/Q10565_NothingIsImpossible.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10565_NothingIsImpossible/Q10565_NothingIsImpossible.java
index 4c5000589d..725d04cd4a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10565_NothingIsImpossible/Q10565_NothingIsImpossible.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10565_NothingIsImpossible/Q10565_NothingIsImpossible.java
@@ -60,7 +60,7 @@ public final class Q10565_NothingIsImpossible extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
index 06dce8cce6..98043cea28 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
@@ -54,7 +54,7 @@ public class Q10566_BestChoice extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10567_SpecialMissionNornilsGarden/Q10567_SpecialMissionNornilsGarden.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10567_SpecialMissionNornilsGarden/Q10567_SpecialMissionNornilsGarden.java
index 6550a4d03e..a1f7ff00f3 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10567_SpecialMissionNornilsGarden/Q10567_SpecialMissionNornilsGarden.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10567_SpecialMissionNornilsGarden/Q10567_SpecialMissionNornilsGarden.java
@@ -54,7 +54,7 @@ public class Q10567_SpecialMissionNornilsGarden extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10568_KamaelsTechnologicalAdvancement/Q10568_KamaelsTechnologicalAdvancement.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10568_KamaelsTechnologicalAdvancement/Q10568_KamaelsTechnologicalAdvancement.java
index ce6037f64c..02b831dc03 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10568_KamaelsTechnologicalAdvancement/Q10568_KamaelsTechnologicalAdvancement.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10568_KamaelsTechnologicalAdvancement/Q10568_KamaelsTechnologicalAdvancement.java
@@ -64,7 +64,7 @@ public class Q10568_KamaelsTechnologicalAdvancement extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10569_DeclarationOfWar/Q10569_DeclarationOfWar.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10569_DeclarationOfWar/Q10569_DeclarationOfWar.java
index 947ea94aeb..4bb0999643 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10569_DeclarationOfWar/Q10569_DeclarationOfWar.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10569_DeclarationOfWar/Q10569_DeclarationOfWar.java
@@ -82,7 +82,7 @@ public class Q10569_DeclarationOfWar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10571_StrategicReconciliation/Q10571_StrategicReconciliation.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10571_StrategicReconciliation/Q10571_StrategicReconciliation.java
index 19234b84e3..f913993474 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10571_StrategicReconciliation/Q10571_StrategicReconciliation.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10571_StrategicReconciliation/Q10571_StrategicReconciliation.java
@@ -68,7 +68,7 @@ public class Q10571_StrategicReconciliation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java
index d47e535813..6ee4c52622 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java
@@ -74,7 +74,7 @@ public class Q10575_LetsGoFishing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java
index fbe765e74c..0e131f0668 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java
@@ -62,7 +62,7 @@ public class Q10576_GlitteringWeapons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java
index 1e62f333cb..546829376d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java
@@ -63,7 +63,7 @@ public class Q10577_TemperARustingBlade extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java
index 77b8eb101c..19bc9449dd 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java
@@ -63,7 +63,7 @@ public class Q10578_TheSoulOfASword extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java
index fc3a65c076..d7dbc2a6cb 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java
@@ -67,7 +67,7 @@ public class Q10579_ContainingTheAttributePower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10594_FergasonsScheme/Q10594_FergasonsScheme.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10594_FergasonsScheme/Q10594_FergasonsScheme.java
index 5c64dfa8cf..a897c26670 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10594_FergasonsScheme/Q10594_FergasonsScheme.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10594_FergasonsScheme/Q10594_FergasonsScheme.java
@@ -81,7 +81,7 @@ public final class Q10594_FergasonsScheme extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10597_EscapeToTheShadowOfTheMotherTree/Q10597_EscapeToTheShadowOfTheMotherTree.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10597_EscapeToTheShadowOfTheMotherTree/Q10597_EscapeToTheShadowOfTheMotherTree.java
index cf0beab6c6..287e636fb4 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10597_EscapeToTheShadowOfTheMotherTree/Q10597_EscapeToTheShadowOfTheMotherTree.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10597_EscapeToTheShadowOfTheMotherTree/Q10597_EscapeToTheShadowOfTheMotherTree.java
@@ -78,7 +78,7 @@ public class Q10597_EscapeToTheShadowOfTheMotherTree extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10598_WithAllYourMight/Q10598_WithAllYourMight.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10598_WithAllYourMight/Q10598_WithAllYourMight.java
index 0830015b97..11d8243e30 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10598_WithAllYourMight/Q10598_WithAllYourMight.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10598_WithAllYourMight/Q10598_WithAllYourMight.java
@@ -79,7 +79,7 @@ public class Q10598_WithAllYourMight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10599_ThreadOfFateHangingOnTheMotherTree/Q10599_ThreadOfFateHangingOnTheMotherTree.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10599_ThreadOfFateHangingOnTheMotherTree/Q10599_ThreadOfFateHangingOnTheMotherTree.java
index b87a0c021d..02d436c330 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10599_ThreadOfFateHangingOnTheMotherTree/Q10599_ThreadOfFateHangingOnTheMotherTree.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10599_ThreadOfFateHangingOnTheMotherTree/Q10599_ThreadOfFateHangingOnTheMotherTree.java
@@ -78,7 +78,7 @@ public class Q10599_ThreadOfFateHangingOnTheMotherTree extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/Q10658_MakkumInTheDimension.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/Q10658_MakkumInTheDimension.java
index 4345dfeba7..1f1ee2e21d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/Q10658_MakkumInTheDimension.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/Q10658_MakkumInTheDimension.java
@@ -50,7 +50,7 @@ public class Q10658_MakkumInTheDimension extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java
index 593c0d4936..e2bb80f5e5 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java
@@ -46,7 +46,7 @@ public class Q10701_TheRoadToDestruction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java
index 1ede0c4ba5..ba1153cd88 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java
@@ -46,7 +46,7 @@ public class Q10702_TheRoadToInfinity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java
index 2ee25d6af7..253b12cda4 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java
@@ -48,7 +48,7 @@ public class Q10703_BottleOfIstinasSoul extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java
index 23bae467b4..9e799c2fcb 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java
@@ -48,7 +48,7 @@ public class Q10704_BottleOfOctavisSoul extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java
index 94c10b561b..4c8ae1432b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java
@@ -48,7 +48,7 @@ public class Q10705_BottleOfTautisSoul extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java
index 2ad335bca3..9314434523 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java
@@ -71,7 +71,7 @@ public class Q10707_FlamesOfSorrow extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10709_TheStolenSeed/Q10709_TheStolenSeed.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10709_TheStolenSeed/Q10709_TheStolenSeed.java
index 7d9bf40f18..3cd7fe939a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10709_TheStolenSeed/Q10709_TheStolenSeed.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10709_TheStolenSeed/Q10709_TheStolenSeed.java
@@ -61,7 +61,7 @@ public class Q10709_TheStolenSeed extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (event.equals("action"))
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10710_LifeEnergyRepository/Q10710_LifeEnergyRepository.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10710_LifeEnergyRepository/Q10710_LifeEnergyRepository.java
index 8d8e2f2b35..62d33a8141 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10710_LifeEnergyRepository/Q10710_LifeEnergyRepository.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10710_LifeEnergyRepository/Q10710_LifeEnergyRepository.java
@@ -63,7 +63,7 @@ public class Q10710_LifeEnergyRepository extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (event.equals("action"))
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java
index 90003a043d..b6033b061d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java
@@ -46,7 +46,7 @@ public class Q10732_AForeignLand extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java
index 68becfc508..5bfca316b6 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java
@@ -52,7 +52,7 @@ public class Q10733_TheTestForSurvival extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java
index f71a8b29ac..dcb36039c8 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java
@@ -66,7 +66,7 @@ public class Q10734_DoOrDie extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java
index 6d51149018..fa1ffbfa27 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java
@@ -64,7 +64,7 @@ public class Q10735_ASpecialPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("33942-02.htm"))
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java
index 0712537c40..acc37c20ee 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java
@@ -63,7 +63,7 @@ public class Q10736_ASpecialPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("33943-02.htm"))
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java
index 86c056d93c..9d73490f3e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java
@@ -58,7 +58,7 @@ public class Q10737_GrakonsWarehouse extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java
index 18f6b4c6f8..f521e5f773 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java
@@ -51,7 +51,7 @@ public class Q10738_AnInnerBeauty extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java
index 4be8b937de..de9928d437 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java
@@ -65,7 +65,7 @@ public class Q10739_SupplyAndDemand extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java
index 051ea28cf9..d0313db269 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java
@@ -66,7 +66,7 @@ public class Q10740_NeverForget extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java
index 012d6a6263..fbf1a8b449 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java
@@ -57,7 +57,7 @@ public class Q10741_ADraughtForTheCold extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java
index e8c5f68163..ce6111db32 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java
@@ -62,7 +62,7 @@ public class Q10742_AFurryFriend extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java
index 51d978fd10..09456b6da9 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java
@@ -64,7 +64,7 @@ public class Q10743_StrangeFungus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java
index d81ff1fbc5..557934c425 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java
@@ -53,7 +53,7 @@ public class Q10744_StrongerThanSteel extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java
index 779a5affd6..dc292e67e4 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java
@@ -60,7 +60,7 @@ public class Q10745_TheSecretIngredients extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java
index 3774d264f0..811ce0b27c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java
@@ -57,7 +57,7 @@ public class Q10746_SeeTheWorld extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10748_MysteriousSuggestion1/Q10748_MysteriousSuggestion1.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10748_MysteriousSuggestion1/Q10748_MysteriousSuggestion1.java
index bf24739d4a..1db27a83de 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10748_MysteriousSuggestion1/Q10748_MysteriousSuggestion1.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10748_MysteriousSuggestion1/Q10748_MysteriousSuggestion1.java
@@ -54,7 +54,7 @@ public final class Q10748_MysteriousSuggestion1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10749_MysteriousSuggestion2/Q10749_MysteriousSuggestion2.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10749_MysteriousSuggestion2/Q10749_MysteriousSuggestion2.java
index 2e1b4f7932..fe683bb978 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10749_MysteriousSuggestion2/Q10749_MysteriousSuggestion2.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10749_MysteriousSuggestion2/Q10749_MysteriousSuggestion2.java
@@ -54,7 +54,7 @@ public final class Q10749_MysteriousSuggestion2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java
index 3cda144c48..f14723434f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java
@@ -98,7 +98,7 @@ public class Q10751_WindsOfFateEncounters extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java
index 6f75ff5ee7..b5d2e9720e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java
@@ -88,7 +88,7 @@ public class Q10752_WindsOfFateAPromise extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java
index 9802c626ae..8e72c775cf 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java
@@ -134,7 +134,7 @@ public class Q10753_WindsOfFateChoices extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10755_LettersFromTheQueenWindyHill/Q10755_LettersFromTheQueenWindyHill.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10755_LettersFromTheQueenWindyHill/Q10755_LettersFromTheQueenWindyHill.java
index 9aeaecedea..80d7827ec7 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10755_LettersFromTheQueenWindyHill/Q10755_LettersFromTheQueenWindyHill.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10755_LettersFromTheQueenWindyHill/Q10755_LettersFromTheQueenWindyHill.java
@@ -55,7 +55,7 @@ public class Q10755_LettersFromTheQueenWindyHill extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java
index 54f0924c8c..9addb06f6a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java
@@ -62,7 +62,7 @@ public class Q10756_AnInterdimensionalDraft extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java
index 145db2ec08..dc432da6f6 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java
@@ -59,7 +59,7 @@ public class Q10757_QuietingTheStorm extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10758_TheOathOfTheWind/Q10758_TheOathOfTheWind.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10758_TheOathOfTheWind/Q10758_TheOathOfTheWind.java
index 3782633f40..e8dbe9f291 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10758_TheOathOfTheWind/Q10758_TheOathOfTheWind.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10758_TheOathOfTheWind/Q10758_TheOathOfTheWind.java
@@ -54,7 +54,7 @@ public class Q10758_TheOathOfTheWind extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10760_LettersFromTheQueenOrcBarracks/Q10760_LettersFromTheQueenOrcBarracks.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10760_LettersFromTheQueenOrcBarracks/Q10760_LettersFromTheQueenOrcBarracks.java
index bb676024ab..9f1c80b400 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10760_LettersFromTheQueenOrcBarracks/Q10760_LettersFromTheQueenOrcBarracks.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10760_LettersFromTheQueenOrcBarracks/Q10760_LettersFromTheQueenOrcBarracks.java
@@ -55,7 +55,7 @@ public class Q10760_LettersFromTheQueenOrcBarracks extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java
index 74e8a89490..03a6b4b178 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java
@@ -65,7 +65,7 @@ public class Q10761_AnOrcInLove extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10762_MarionetteSpirit/Q10762_MarionetteSpirit.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10762_MarionetteSpirit/Q10762_MarionetteSpirit.java
index 0279f9aef0..ac750884a2 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10762_MarionetteSpirit/Q10762_MarionetteSpirit.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10762_MarionetteSpirit/Q10762_MarionetteSpirit.java
@@ -55,7 +55,7 @@ public class Q10762_MarionetteSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java
index 6bc6ed9b18..eb9e67177a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java
@@ -54,7 +54,7 @@ public class Q10763_TerrifyingChertuba extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java
index 54e982a6cd..dead250e0c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java
@@ -62,7 +62,7 @@ public class Q10764_FreeSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10766_ANewCraft/Q10766_ANewCraft.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10766_ANewCraft/Q10766_ANewCraft.java
index 41157ee92b..5fbafa35b2 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10766_ANewCraft/Q10766_ANewCraft.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10766_ANewCraft/Q10766_ANewCraft.java
@@ -63,7 +63,7 @@ public class Q10766_ANewCraft extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java
index 6fb43e4cd6..a82c8271e6 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java
@@ -60,7 +60,7 @@ public class Q10767_AWholeNewLevelOfAlchemy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10769_LettersFromTheQueenCrumaTowerPart1/Q10769_LettersFromTheQueenCrumaTowerPart1.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10769_LettersFromTheQueenCrumaTowerPart1/Q10769_LettersFromTheQueenCrumaTowerPart1.java
index 14fa88b6b0..0fedc60418 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10769_LettersFromTheQueenCrumaTowerPart1/Q10769_LettersFromTheQueenCrumaTowerPart1.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10769_LettersFromTheQueenCrumaTowerPart1/Q10769_LettersFromTheQueenCrumaTowerPart1.java
@@ -57,7 +57,7 @@ public class Q10769_LettersFromTheQueenCrumaTowerPart1 extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java
index 11ac5492a7..9b878bd1a3 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java
@@ -60,7 +60,7 @@ public class Q10770_InSearchOfTheGrail extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java
index 4fe64a9f90..73772df5d2 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java
@@ -59,7 +59,7 @@ public class Q10771_VolatilePower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java
index a50cba337e..ebffb6b105 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java
@@ -58,7 +58,7 @@ public class Q10772_ReportsFromCrumaTowerPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java
index 85a6afcd02..40a7457f6e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java
@@ -55,7 +55,7 @@ public class Q10774_LettersFromTheQueenCrumaTowerPart2 extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java
index 2d73920b69..7538df1cd5 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java
@@ -63,7 +63,7 @@ public class Q10775_InSearchOfAnAncientGiant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java
index 6e0b12b13b..546391adfd 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java
@@ -69,7 +69,7 @@ public class Q10776_TheWrathOfTheGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java
index ad558a3c03..d96d425c06 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java
@@ -58,7 +58,7 @@ public class Q10777_ReportsFromCrumaTowerPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java
index 5dbea0b0ab..0e573f61a1 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java
@@ -55,7 +55,7 @@ public class Q10782_LettersFromTheQueenForsakenPlains extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java
index 04985fcd86..fb1188c3bf 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java
@@ -78,7 +78,7 @@ public class Q10783_TracesOfAnAmbush extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java
index 3e45259f8b..35165252b5 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java
@@ -66,7 +66,7 @@ public class Q10784_TheBrokenDevice extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java
index d8a021d469..9ce2946641 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java
@@ -55,7 +55,7 @@ public class Q10785_LettersFromTheQueenFieldsOfMassacre extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java
index e4aeb0a6c5..2a4efba6af 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java
@@ -72,7 +72,7 @@ public class Q10786_ResidentProblemSolver extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java
index a7cb5255a2..9e9e5ca51c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java
@@ -57,7 +57,7 @@ public class Q10787_ASpyMission extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java
index ee85567199..8b65f6fe1b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java
@@ -55,7 +55,7 @@ public class Q10789_LettersFromTheQueenSwampOfScreams extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java
index afdcde07a8..33df51f29a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java
@@ -73,7 +73,7 @@ public class Q10790_AMercenaryHelper extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java
index 2feff9b2af..d2c915008b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java
@@ -64,7 +64,7 @@ public class Q10791_TheManOfMystery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java
index 7549d9fa2f..416446e0e7 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java
@@ -55,7 +55,7 @@ public class Q10792_LettersFromTheQueenForestOfTheDead extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java
index b4aed022a7..353be489ac 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java
@@ -70,7 +70,7 @@ public class Q10793_SaveTheSouls extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java
index 0b66df0e5c..97425eba70 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java
@@ -94,7 +94,7 @@ public class Q10794_InvestigateTheForest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java
index 8df3dc83d3..bc6700e073 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java
@@ -40,7 +40,7 @@ public class Q10795_LettersFromTheQueenWallOfAgros extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java
index 26b6a34591..29464f9357 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java
@@ -66,7 +66,7 @@ public class Q10796_TheEyeThatDefiedTheGods extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
index 95fb61323c..34b86f9dc1 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
@@ -71,7 +71,7 @@ public class Q10797_CrossingFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java
index cd5f8935e1..c168bb844b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java
@@ -56,7 +56,7 @@ public class Q10798_LettersFromTheQueenDragonValley extends LetterQuest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java
index 092c19afb8..21165874a3 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java
@@ -69,7 +69,7 @@ public class Q10799_StrangeThingsAfootInTheValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java
index 6355ffa405..b72f3e4a66 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java
@@ -69,7 +69,7 @@ public class Q10800_ReconnaissanceAtDragonValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
index b1dca4d5b3..15fc371c1a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
@@ -55,7 +55,7 @@ public class Q10801_TheDimensionalWarpPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
index 1339720830..1b0c8d74d0 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
@@ -56,7 +56,7 @@ public class Q10802_TheDimensionalWarpPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
index 117f5cc53e..4cae513e93 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
@@ -57,7 +57,7 @@ public class Q10803_TheDimensionalWarpPart3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
index 124823783a..f16e276a8f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
@@ -57,7 +57,7 @@ public class Q10804_TheDimensionalWarpPart4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
index a6796e0c63..b80b2b6ae5 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
@@ -57,7 +57,7 @@ public class Q10805_TheDimensionalWarpPart5 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
index d6ecba6b8e..5a8d67d930 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
@@ -56,7 +56,7 @@ public class Q10806_TheDimensionalWarpPart6 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
index 12462309a1..393bbe074c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
@@ -56,7 +56,7 @@ public class Q10807_TheDimensionalWarpPart7 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
index 7d5ba5aa23..48d283830c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
@@ -56,7 +56,7 @@ public class Q10811_ExaltedOneWhoFacesTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java
index d213b06ea2..d5f92b57d9 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java
@@ -114,7 +114,7 @@ public class Q10812_FacingSadness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10813_ForGlory/Q10813_ForGlory.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10813_ForGlory/Q10813_ForGlory.java
index 76fd620dde..89b572a2cc 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10813_ForGlory/Q10813_ForGlory.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10813_ForGlory/Q10813_ForGlory.java
@@ -58,7 +58,7 @@ public class Q10813_ForGlory extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java
index e487e06324..f583c8098b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java
@@ -75,7 +75,7 @@ public class Q10814_BefittingOfTheStatus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java
index e389fbdfcc..7f9ac0bd7d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java
@@ -66,7 +66,7 @@ public class Q10815_StepUp extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
index fdbdca62a6..e00434acbe 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
@@ -57,7 +57,7 @@ public class Q10817_ExaltedOneWhoOvercomesTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java
index 22cbb61194..0f898acae0 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java
@@ -64,7 +64,7 @@ public class Q10818_ConfrontingAGiantMonster extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10819_ForHonor/Q10819_ForHonor.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10819_ForHonor/Q10819_ForHonor.java
index d3d25867b9..250f860227 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10819_ForHonor/Q10819_ForHonor.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10819_ForHonor/Q10819_ForHonor.java
@@ -62,7 +62,7 @@ public class Q10819_ForHonor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10820_RelationshipsBefittingOfTheStatus/Q10820_RelationshipsBefittingOfTheStatus.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10820_RelationshipsBefittingOfTheStatus/Q10820_RelationshipsBefittingOfTheStatus.java
index d23b38f64a..126444e4a6 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10820_RelationshipsBefittingOfTheStatus/Q10820_RelationshipsBefittingOfTheStatus.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10820_RelationshipsBefittingOfTheStatus/Q10820_RelationshipsBefittingOfTheStatus.java
@@ -58,7 +58,7 @@ public class Q10820_RelationshipsBefittingOfTheStatus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10821_HelpingOthers/Q10821_HelpingOthers.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10821_HelpingOthers/Q10821_HelpingOthers.java
index 0ad084443b..bdbb8b5edb 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10821_HelpingOthers/Q10821_HelpingOthers.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10821_HelpingOthers/Q10821_HelpingOthers.java
@@ -55,7 +55,7 @@ public class Q10821_HelpingOthers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
index 6bf1ee6a4e..a795ecb975 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
@@ -59,7 +59,7 @@ public class Q10823_ExaltedOneWhoShattersTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java
index 68dd1f489a..b9d8b3ecb3 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java
@@ -55,7 +55,7 @@ public class Q10824_ConfrontingTheGreatestDanger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java
index d9982218ab..f62d1ec44d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java
@@ -61,7 +61,7 @@ public class Q10825_ForVictory extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10826_LuckBefittingOfTheStatus/Q10826_LuckBefittingOfTheStatus.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10826_LuckBefittingOfTheStatus/Q10826_LuckBefittingOfTheStatus.java
index 3ce9e62843..a74f6b22e4 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10826_LuckBefittingOfTheStatus/Q10826_LuckBefittingOfTheStatus.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10826_LuckBefittingOfTheStatus/Q10826_LuckBefittingOfTheStatus.java
@@ -76,7 +76,7 @@ public class Q10826_LuckBefittingOfTheStatus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10827_StepUpToLead/Q10827_StepUpToLead.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10827_StepUpToLead/Q10827_StepUpToLead.java
index 35fcab2537..73a3168454 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10827_StepUpToLead/Q10827_StepUpToLead.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10827_StepUpToLead/Q10827_StepUpToLead.java
@@ -58,7 +58,7 @@ public class Q10827_StepUpToLead extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10829_InSearchOfTheCause/Q10829_InSearchOfTheCause.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10829_InSearchOfTheCause/Q10829_InSearchOfTheCause.java
index 8f4b8ea015..8d961007e0 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10829_InSearchOfTheCause/Q10829_InSearchOfTheCause.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10829_InSearchOfTheCause/Q10829_InSearchOfTheCause.java
@@ -49,7 +49,7 @@ public class Q10829_InSearchOfTheCause extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/Q10830_TheLostGardenOfSpirits.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/Q10830_TheLostGardenOfSpirits.java
index f5a77a8c46..f1e8fcac8e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/Q10830_TheLostGardenOfSpirits.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/Q10830_TheLostGardenOfSpirits.java
@@ -63,7 +63,7 @@ public class Q10830_TheLostGardenOfSpirits extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10831_UnbelievableSight/Q10831_UnbelievableSight.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10831_UnbelievableSight/Q10831_UnbelievableSight.java
index 292e487dbb..09e8f8bffb 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10831_UnbelievableSight/Q10831_UnbelievableSight.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10831_UnbelievableSight/Q10831_UnbelievableSight.java
@@ -64,7 +64,7 @@ public class Q10831_UnbelievableSight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10832_EnergyOfSadnessAndAnger/Q10832_EnergyOfSadnessAndAnger.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10832_EnergyOfSadnessAndAnger/Q10832_EnergyOfSadnessAndAnger.java
index c3ba629f61..69125c3c8e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10832_EnergyOfSadnessAndAnger/Q10832_EnergyOfSadnessAndAnger.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10832_EnergyOfSadnessAndAnger/Q10832_EnergyOfSadnessAndAnger.java
@@ -79,7 +79,7 @@ public class Q10832_EnergyOfSadnessAndAnger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10833_PutTheQueenOfSpiritsToSleep/Q10833_PutTheQueenOfSpiritsToSleep.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10833_PutTheQueenOfSpiritsToSleep/Q10833_PutTheQueenOfSpiritsToSleep.java
index f139198949..0072e5d723 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10833_PutTheQueenOfSpiritsToSleep/Q10833_PutTheQueenOfSpiritsToSleep.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10833_PutTheQueenOfSpiritsToSleep/Q10833_PutTheQueenOfSpiritsToSleep.java
@@ -56,7 +56,7 @@ public class Q10833_PutTheQueenOfSpiritsToSleep extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10836_DisappearedClanMember/Q10836_DisappearedClanMember.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10836_DisappearedClanMember/Q10836_DisappearedClanMember.java
index 3b3f852c70..3230d13891 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10836_DisappearedClanMember/Q10836_DisappearedClanMember.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10836_DisappearedClanMember/Q10836_DisappearedClanMember.java
@@ -59,7 +59,7 @@ public class Q10836_DisappearedClanMember extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10837_LookingForTheBlackbirdClanMember/Q10837_LookingForTheBlackbirdClanMember.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10837_LookingForTheBlackbirdClanMember/Q10837_LookingForTheBlackbirdClanMember.java
index 217cabf9fb..a83cf4e3fa 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10837_LookingForTheBlackbirdClanMember/Q10837_LookingForTheBlackbirdClanMember.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10837_LookingForTheBlackbirdClanMember/Q10837_LookingForTheBlackbirdClanMember.java
@@ -54,7 +54,7 @@ public class Q10837_LookingForTheBlackbirdClanMember extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java
index 2ef2a3e32e..6b0de70720 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java
@@ -64,7 +64,7 @@ public class Q10838_TheReasonForNotBeingAbleToGetOut extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java
index 248d9275e5..c4ba15bb8f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java
@@ -61,7 +61,7 @@ public class Q10839_BlackbirdsNameValue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java
index 218f86f996..1a12c524a9 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java
@@ -63,7 +63,7 @@ public class Q10840_TimeToRecover extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java
index 8cf3b7506e..cae50c4972 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java
@@ -53,7 +53,7 @@ public class Q10841_DeepInsideAteliaFortress extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10843_AnomalyInTheEnchantedValley/Q10843_AnomalyInTheEnchantedValley.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10843_AnomalyInTheEnchantedValley/Q10843_AnomalyInTheEnchantedValley.java
index e1712c2ba9..ae707e925f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10843_AnomalyInTheEnchantedValley/Q10843_AnomalyInTheEnchantedValley.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10843_AnomalyInTheEnchantedValley/Q10843_AnomalyInTheEnchantedValley.java
@@ -48,7 +48,7 @@ public class Q10843_AnomalyInTheEnchantedValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10844_BloodyBattleSeizingSupplies/Q10844_BloodyBattleSeizingSupplies.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10844_BloodyBattleSeizingSupplies/Q10844_BloodyBattleSeizingSupplies.java
index 3a18492bfa..95e9f265f1 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10844_BloodyBattleSeizingSupplies/Q10844_BloodyBattleSeizingSupplies.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10844_BloodyBattleSeizingSupplies/Q10844_BloodyBattleSeizingSupplies.java
@@ -56,7 +56,7 @@ public class Q10844_BloodyBattleSeizingSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10845_BloodyBattleRescueTheSmiths/Q10845_BloodyBattleRescueTheSmiths.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10845_BloodyBattleRescueTheSmiths/Q10845_BloodyBattleRescueTheSmiths.java
index 262fbdc4b5..632574f511 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10845_BloodyBattleRescueTheSmiths/Q10845_BloodyBattleRescueTheSmiths.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10845_BloodyBattleRescueTheSmiths/Q10845_BloodyBattleRescueTheSmiths.java
@@ -62,7 +62,7 @@ public final class Q10845_BloodyBattleRescueTheSmiths extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = event;
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10846_BloodyBattleMeetingTheCommander/Q10846_BloodyBattleMeetingTheCommander.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10846_BloodyBattleMeetingTheCommander/Q10846_BloodyBattleMeetingTheCommander.java
index 6a229188da..e3d0e59e43 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10846_BloodyBattleMeetingTheCommander/Q10846_BloodyBattleMeetingTheCommander.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10846_BloodyBattleMeetingTheCommander/Q10846_BloodyBattleMeetingTheCommander.java
@@ -53,7 +53,7 @@ public class Q10846_BloodyBattleMeetingTheCommander extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10848_TrialsBeforeTheBattle/Q10848_TrialsBeforeTheBattle.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10848_TrialsBeforeTheBattle/Q10848_TrialsBeforeTheBattle.java
index 868ecb9bdc..cad927beb2 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10848_TrialsBeforeTheBattle/Q10848_TrialsBeforeTheBattle.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10848_TrialsBeforeTheBattle/Q10848_TrialsBeforeTheBattle.java
@@ -58,7 +58,7 @@ public final class Q10848_TrialsBeforeTheBattle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10849_TrialsForAdaptation/Q10849_TrialsForAdaptation.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10849_TrialsForAdaptation/Q10849_TrialsForAdaptation.java
index 8f77ff4caf..437e5c9a8e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10849_TrialsForAdaptation/Q10849_TrialsForAdaptation.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10849_TrialsForAdaptation/Q10849_TrialsForAdaptation.java
@@ -76,7 +76,7 @@ public class Q10849_TrialsForAdaptation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10851_ElvenBotany/Q10851_ElvenBotany.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10851_ElvenBotany/Q10851_ElvenBotany.java
index d22f5130b5..e74becd0de 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10851_ElvenBotany/Q10851_ElvenBotany.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10851_ElvenBotany/Q10851_ElvenBotany.java
@@ -58,7 +58,7 @@ public class Q10851_ElvenBotany extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10852_TheMotherTreeRevivalProject/Q10852_TheMotherTreeRevivalProject.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10852_TheMotherTreeRevivalProject/Q10852_TheMotherTreeRevivalProject.java
index 650f2a8248..ea67637b49 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10852_TheMotherTreeRevivalProject/Q10852_TheMotherTreeRevivalProject.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10852_TheMotherTreeRevivalProject/Q10852_TheMotherTreeRevivalProject.java
@@ -82,7 +82,7 @@ public class Q10852_TheMotherTreeRevivalProject extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10853_ToWeakenTheGiants/Q10853_ToWeakenTheGiants.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10853_ToWeakenTheGiants/Q10853_ToWeakenTheGiants.java
index d631d47348..70eddc1c55 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10853_ToWeakenTheGiants/Q10853_ToWeakenTheGiants.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10853_ToWeakenTheGiants/Q10853_ToWeakenTheGiants.java
@@ -60,7 +60,7 @@ public final class Q10853_ToWeakenTheGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10854_ToSeizeTheFortress/Q10854_ToSeizeTheFortress.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10854_ToSeizeTheFortress/Q10854_ToSeizeTheFortress.java
index 0f131cd3d9..dbdc97fc8b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10854_ToSeizeTheFortress/Q10854_ToSeizeTheFortress.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10854_ToSeizeTheFortress/Q10854_ToSeizeTheFortress.java
@@ -77,7 +77,7 @@ public final class Q10854_ToSeizeTheFortress extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = event;
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10856_SuperionAppears/Q10856_SuperionAppears.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10856_SuperionAppears/Q10856_SuperionAppears.java
index 6beea62bcf..37c5a21afe 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10856_SuperionAppears/Q10856_SuperionAppears.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10856_SuperionAppears/Q10856_SuperionAppears.java
@@ -45,7 +45,7 @@ public class Q10856_SuperionAppears extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10857_SecretTeleport/Q10857_SecretTeleport.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10857_SecretTeleport/Q10857_SecretTeleport.java
index 80fce78d5e..8db2ad22a1 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10857_SecretTeleport/Q10857_SecretTeleport.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10857_SecretTeleport/Q10857_SecretTeleport.java
@@ -69,7 +69,7 @@ public class Q10857_SecretTeleport extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10858_QueenRamonaControllerOfTheVessel/Q10858_QueenRamonaControllerOfTheVessel.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10858_QueenRamonaControllerOfTheVessel/Q10858_QueenRamonaControllerOfTheVessel.java
index 8343b8e737..6adf4b1901 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10858_QueenRamonaControllerOfTheVessel/Q10858_QueenRamonaControllerOfTheVessel.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10858_QueenRamonaControllerOfTheVessel/Q10858_QueenRamonaControllerOfTheVessel.java
@@ -50,7 +50,7 @@ public class Q10858_QueenRamonaControllerOfTheVessel extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10859_OwnTheEarthAndTheHeavens/Q10859_OwnTheEarthAndTheHeavens.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10859_OwnTheEarthAndTheHeavens/Q10859_OwnTheEarthAndTheHeavens.java
index d4ac9e202b..f5e36c2340 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10859_OwnTheEarthAndTheHeavens/Q10859_OwnTheEarthAndTheHeavens.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10859_OwnTheEarthAndTheHeavens/Q10859_OwnTheEarthAndTheHeavens.java
@@ -50,7 +50,7 @@ public class Q10859_OwnTheEarthAndTheHeavens extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
index 9fbdc244ba..88771cce29 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
@@ -57,7 +57,7 @@ public class Q10873_ExaltedReachingAnotherLevel extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10874_AgainstTheNewEnemy/Q10874_AgainstTheNewEnemy.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10874_AgainstTheNewEnemy/Q10874_AgainstTheNewEnemy.java
index 3e4007dfe2..62cde0f803 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10874_AgainstTheNewEnemy/Q10874_AgainstTheNewEnemy.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10874_AgainstTheNewEnemy/Q10874_AgainstTheNewEnemy.java
@@ -103,7 +103,7 @@ public class Q10874_AgainstTheNewEnemy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10875_ForReputation/Q10875_ForReputation.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10875_ForReputation/Q10875_ForReputation.java
index f022445f8b..c4c5405e4a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10875_ForReputation/Q10875_ForReputation.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10875_ForReputation/Q10875_ForReputation.java
@@ -53,7 +53,7 @@ public class Q10875_ForReputation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10876_LeadersGrace/Q10876_LeadersGrace.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10876_LeadersGrace/Q10876_LeadersGrace.java
index 05cb70e278..db3a2b2c73 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10876_LeadersGrace/Q10876_LeadersGrace.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10876_LeadersGrace/Q10876_LeadersGrace.java
@@ -56,7 +56,7 @@ public class Q10876_LeadersGrace extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10877_BreakThroughCrisis/Q10877_BreakThroughCrisis.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10877_BreakThroughCrisis/Q10877_BreakThroughCrisis.java
index 8f0c4a3231..929436212f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10877_BreakThroughCrisis/Q10877_BreakThroughCrisis.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10877_BreakThroughCrisis/Q10877_BreakThroughCrisis.java
@@ -59,7 +59,7 @@ public class Q10877_BreakThroughCrisis extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java
index 9fa54a275d..a291386f62 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java
@@ -57,7 +57,7 @@ public class Q10879_ExaltedGuideToPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10880_TheLastOneStanding/Q10880_TheLastOneStanding.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10880_TheLastOneStanding/Q10880_TheLastOneStanding.java
index 4154dcb533..a18705914f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10880_TheLastOneStanding/Q10880_TheLastOneStanding.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10880_TheLastOneStanding/Q10880_TheLastOneStanding.java
@@ -126,7 +126,7 @@ public class Q10880_TheLastOneStanding extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10881_ForThePride/Q10881_ForThePride.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10881_ForThePride/Q10881_ForThePride.java
index 60f565fe71..c3ccdaa708 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10881_ForThePride/Q10881_ForThePride.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10881_ForThePride/Q10881_ForThePride.java
@@ -56,7 +56,7 @@ public class Q10881_ForThePride extends Quest
 	private static final int MIN_LEVEL = 104;
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10882_VictoryCollection/Q10882_VictoryCollection.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10882_VictoryCollection/Q10882_VictoryCollection.java
index 0b64afccd2..8ae5ea873e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10882_VictoryCollection/Q10882_VictoryCollection.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10882_VictoryCollection/Q10882_VictoryCollection.java
@@ -78,7 +78,7 @@ public class Q10882_VictoryCollection extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10883_ImmortalHonor/Q10883_ImmortalHonor.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10883_ImmortalHonor/Q10883_ImmortalHonor.java
index ba80484f13..3bb1ae6dd2 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10883_ImmortalHonor/Q10883_ImmortalHonor.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10883_ImmortalHonor/Q10883_ImmortalHonor.java
@@ -57,7 +57,7 @@ public class Q10883_ImmortalHonor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10891_AtANewPlace/Q10891_AtANewPlace.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10891_AtANewPlace/Q10891_AtANewPlace.java
index 803a23cda2..8557ecf613 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10891_AtANewPlace/Q10891_AtANewPlace.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10891_AtANewPlace/Q10891_AtANewPlace.java
@@ -49,7 +49,7 @@ public class Q10891_AtANewPlace extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10892_RevengeOneStepAtATime/Q10892_RevengeOneStepAtATime.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10892_RevengeOneStepAtATime/Q10892_RevengeOneStepAtATime.java
index ba10e4624a..88fa2da9dd 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10892_RevengeOneStepAtATime/Q10892_RevengeOneStepAtATime.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10892_RevengeOneStepAtATime/Q10892_RevengeOneStepAtATime.java
@@ -82,7 +82,7 @@ public class Q10892_RevengeOneStepAtATime extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10895_RestrainQueenKrosha/Q10895_RestrainQueenKrosha.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10895_RestrainQueenKrosha/Q10895_RestrainQueenKrosha.java
index b82995daa5..ab8e925f0b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10895_RestrainQueenKrosha/Q10895_RestrainQueenKrosha.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10895_RestrainQueenKrosha/Q10895_RestrainQueenKrosha.java
@@ -54,7 +54,7 @@ public final class Q10895_RestrainQueenKrosha extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10896_VisitTheAdventureGuild/Q10896_VisitTheAdventureGuild.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10896_VisitTheAdventureGuild/Q10896_VisitTheAdventureGuild.java
index 6d96922591..e737233cb7 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10896_VisitTheAdventureGuild/Q10896_VisitTheAdventureGuild.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10896_VisitTheAdventureGuild/Q10896_VisitTheAdventureGuild.java
@@ -44,7 +44,7 @@ public class Q10896_VisitTheAdventureGuild extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10897_ShowYourAbility/Q10897_ShowYourAbility.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10897_ShowYourAbility/Q10897_ShowYourAbility.java
index b6ce38cf57..c544be0f57 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10897_ShowYourAbility/Q10897_ShowYourAbility.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10897_ShowYourAbility/Q10897_ShowYourAbility.java
@@ -47,7 +47,7 @@ public class Q10897_ShowYourAbility extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10898_TowardAGoal/Q10898_TowardAGoal.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10898_TowardAGoal/Q10898_TowardAGoal.java
index b3c22d2165..90482f8750 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10898_TowardAGoal/Q10898_TowardAGoal.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10898_TowardAGoal/Q10898_TowardAGoal.java
@@ -47,7 +47,7 @@ public class Q10898_TowardAGoal extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10899_VeteranAdventurer/Q10899_VeteranAdventurer.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10899_VeteranAdventurer/Q10899_VeteranAdventurer.java
index ab86f8923f..c9de61ff18 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10899_VeteranAdventurer/Q10899_VeteranAdventurer.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10899_VeteranAdventurer/Q10899_VeteranAdventurer.java
@@ -47,7 +47,7 @@ public class Q10899_VeteranAdventurer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10900_PathToStrength/Q10900_PathToStrength.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10900_PathToStrength/Q10900_PathToStrength.java
index 4803fe537b..24ac444c19 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10900_PathToStrength/Q10900_PathToStrength.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10900_PathToStrength/Q10900_PathToStrength.java
@@ -47,7 +47,7 @@ public class Q10900_PathToStrength extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10901_AModelAdventurer/Q10901_AModelAdventurer.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10901_AModelAdventurer/Q10901_AModelAdventurer.java
index 3c2d39c272..cc4b227f0a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10901_AModelAdventurer/Q10901_AModelAdventurer.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10901_AModelAdventurer/Q10901_AModelAdventurer.java
@@ -49,7 +49,7 @@ public class Q10901_AModelAdventurer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/ThirdClassTransferQuest.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
index b230b12a5b..e0ee0b931a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
@@ -133,7 +133,7 @@ public abstract class ThirdClassTransferQuest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/custom/Q00683_AdventOfKrofinSubspecies/Q00683_AdventOfKrofinSubspecies.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/custom/Q00683_AdventOfKrofinSubspecies/Q00683_AdventOfKrofinSubspecies.java
index fd612e19fd..e7af10d5e2 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/custom/Q00683_AdventOfKrofinSubspecies/Q00683_AdventOfKrofinSubspecies.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/custom/Q00683_AdventOfKrofinSubspecies/Q00683_AdventOfKrofinSubspecies.java
@@ -70,7 +70,7 @@ public class Q00683_AdventOfKrofinSubspecies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/custom/Q00684_DisturbedFields/Q00684_DisturbedFields.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/custom/Q00684_DisturbedFields/Q00684_DisturbedFields.java
index 80bb3b3ea5..93caeeeeba 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/custom/Q00684_DisturbedFields/Q00684_DisturbedFields.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/custom/Q00684_DisturbedFields/Q00684_DisturbedFields.java
@@ -67,7 +67,7 @@ public class Q00684_DisturbedFields extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/vehicles/AirShipController.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/vehicles/AirShipController.java
index 682f3b238b..ee534c5f04 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/vehicles/AirShipController.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/vehicles/AirShipController.java
@@ -117,7 +117,7 @@ public abstract class AirShipController extends AbstractNpcAI
 	private static final SystemMessage SM_NEED_MORE = new SystemMessage(SystemMessageId.AN_AIRSHIP_CANNOT_BE_SUMMONED_BECAUSE_YOU_DON_T_HAVE_ENOUGH_S1).addItemName(STARSTONE);
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("summon".equalsIgnoreCase(event))
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
index a1ff9f0e0a..c5dc6f515f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
@@ -162,7 +162,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player.isTransformed())
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
index 7ff39fb0c0..8675a7ec2c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
@@ -51,7 +51,7 @@ public class AllianceMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!"9001-01.htm".equals(event) && (player.getClan() == null))
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
index 0100a1e9c5..b14f3cb0bd 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
@@ -74,7 +74,7 @@ public class ClanMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LEADER_REQUIRED.containsKey(event) && !player.isClanLeader())
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/Quest.java
index 270725d319..09e6c336cc 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/Quest.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/Quest.java
@@ -247,7 +247,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -269,7 +269,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -560,7 +560,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 			{
 				player.setSimulatedTalking(false);
 			}
-			res = onAdvEvent(event, npc, player);
+			res = onEvent(event, npc, player);
 		}
 		catch (Exception e)
 		{
@@ -1038,12 +1038,11 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 */
 	public String onDeath(Creature killer, Creature victim, QuestState qs)
 	{
-		return onAdvEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
+		return onEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
 	}
 	
 	/**
 	 * This function is called whenever a player clicks on a link in a quest dialog and whenever a timer fires.<br>
-	 * If is not overridden by a subclass, then default to the returned value of the simpler (and older) {@link #onEvent(String, QuestState)} override.<br>
 	 * If the player has a quest state, use it as parameter in the next call, otherwise return null.
 	 * @param event this parameter contains a string identifier for the event.<br>
 	 *            Generally, this string is passed directly via the link.<br>
@@ -1062,35 +1061,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 *            This parameter may be {@code null} in certain circumstances.
 	 * @return the text returned by the event (may be {@code null}, a filename or just text)
 	 */
-	public String onAdvEvent(String event, Npc npc, Player player)
-	{
-		if (player != null)
-		{
-			final QuestState qs = player.getQuestState(getName());
-			if (qs != null)
-			{
-				return onEvent(event, qs);
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * This function is called in place of {@link #onAdvEvent(String, Npc, Player)} if the former is not implemented.<br>
-	 * If a script contains both {@link #onAdvEvent(String, Npc, Player)} and this implementation, then this method will never be called unless the script's {@link #onAdvEvent(String, Npc, Player)} explicitly calls this method.
-	 * @param event this parameter contains a string identifier for the event.<br>
-	 *            Generally, this string is passed directly via the link.<br>
-	 *            For example:<br>
-	 *            <code>
-	 *            &lt;a action="bypass -h Quest 626_ADarkTwilight 31517-01.htm"&gt;hello&lt;/a&gt;
-	 *            </code><br>
-	 *            The above link sets the event variable to "31517-01.htm" for the quest 626_ADarkTwilight.<br>
-	 *            In the case of timers, this will be the name of the timer.<br>
-	 *            This parameter serves as a sort of identifier.
-	 * @param qs this parameter contains a reference to the quest state of the player who used the link or started the timer.
-	 * @return the text returned by the event (may be {@code null}, a filename or just text)
-	 */
-	public String onEvent(String event, QuestState qs)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return null;
 	}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Aden/Gallias/Gallias.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Aden/Gallias/Gallias.java
index 3caa693eef..d0984779b6 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Aden/Gallias/Gallias.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Aden/Gallias/Gallias.java
@@ -65,7 +65,7 @@ public class Gallias extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String[] substrings = event.split(" ");
 		if (substrings.length < 1)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java
index 3246831bf4..62d6ebb211 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java
@@ -47,7 +47,7 @@ public class Herphah extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Aden/Joachim/Joachim.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Aden/Joachim/Joachim.java
index a1f5cd1655..c54f44664d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Aden/Joachim/Joachim.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Aden/Joachim/Joachim.java
@@ -89,7 +89,7 @@ public class Joachim extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java
index 235fd9d2a3..086f8aeab5 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java
@@ -47,7 +47,7 @@ public class Penny extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java
index 2ab35f83dc..6740fe6383 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java
@@ -46,7 +46,7 @@ public class Ruine extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
index 6d5cc1c6c3..d3a66dd924 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
@@ -68,7 +68,7 @@ public class AncientArcanCity extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CHANGE_STATE"))
 		{
@@ -102,7 +102,7 @@ public class AncientArcanCity extends AbstractNpcAI
 				cat.broadcastSocialAction(2);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
index d76c158f9e..d38ceb917e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
@@ -42,7 +42,7 @@ public class Lykus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
index 4fd3e87bb7..92979a713e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
@@ -39,7 +39,7 @@ public class Mumu extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
index 56ceed0cda..34c3cc9100 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
@@ -329,7 +329,7 @@ public class AteliaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/AteliaFortress/TeleportDevice/TeleportDevice.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/AteliaFortress/TeleportDevice/TeleportDevice.java
index 9ea87d2149..7ff361c8e1 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/AteliaFortress/TeleportDevice/TeleportDevice.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/AteliaFortress/TeleportDevice/TeleportDevice.java
@@ -45,7 +45,7 @@ public class TeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player.getFactionLevel(Faction.KINGDOM_ROYAL_GUARDS) < 3)
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java
index e589643825..af3454fafd 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java
@@ -62,7 +62,7 @@ public class AteliaRefinery extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
index c87c4e9224..a2a2891b57 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
@@ -56,7 +56,7 @@ public class BabyPets extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("HEAL") && (player != null))
 		{
@@ -78,7 +78,7 @@ public class BabyPets extends AbstractNpcAI
 				cancelQuestTimer("HEAL", null, player);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGOUT)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
index b0153ef5da..f0f610c8b9 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
@@ -56,7 +56,7 @@ public class ImprovedBabyPets extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player != null)
 		{
@@ -108,7 +108,7 @@ public class ImprovedBabyPets extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
index 6b4a147550..301899a76f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
@@ -42,7 +42,7 @@ public class Tunatun extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/BlackbirdCampsite/BlackbirdCampsite.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/BlackbirdCampsite/BlackbirdCampsite.java
index 8940c4c672..984a0abd2e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/BlackbirdCampsite/BlackbirdCampsite.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/BlackbirdCampsite/BlackbirdCampsite.java
@@ -48,7 +48,7 @@ public class BlackbirdCampsite extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -81,7 +81,7 @@ public class BlackbirdCampsite extends AbstractNpcAI
 				return "34434-5.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
index a2b4810dfa..ad01bdba4a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
@@ -46,14 +46,14 @@ public class CrumaTower extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("MESSAGE") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_GO_TO_UNDERGROUND_LV_3_USING_THE_ELEVATOR_IN_THE_BACK);
 			startQuestTimer(event, 15000, npc, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
index fe838f52cf..ba359695c2 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
@@ -77,7 +77,7 @@ public class FrightenedRagnaOrc extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
index ee5d44d59e..db9d7838fc 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
@@ -53,7 +53,7 @@ public class DragonVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("Spawn".equals(event))
 		{
@@ -104,7 +104,7 @@ public class DragonVortex extends AbstractNpcAI
 		{
 			npc.setScriptValue(0);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
index de54d68cf6..ce248d3f8f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
@@ -53,7 +53,7 @@ public class LairOfAntharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CHECK_HOME") && (npc != null) && !npc.isDead())
 		{
@@ -67,7 +67,7 @@ public class LairOfAntharas extends AbstractNpcAI
 				npc.broadcastPacket(new ValidateLocation(npc));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
index bf46d16542..c4e625c565 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
@@ -55,7 +55,7 @@ public class LeopardDragonHachling extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && event.equals("MOVE_TO_TRANSFORM"))
 		{
@@ -77,7 +77,7 @@ public class LeopardDragonHachling extends AbstractNpcAI
 				npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, nearestLocation(npc));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
index 04396d3683..6f794f4008 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
@@ -40,13 +40,13 @@ public class MercenaryCaptain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THE_EASTERN_PART_OF_DRAGON_VALLEY_IS_MUCH_MORE_DANGEROUS_THAN_THE_WEST_BE_CAREFUL));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
index 13dfbd313b..324120327b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
@@ -61,10 +61,10 @@ public class MercenaryTeleport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		player.teleToLocation(LOCATIONS.get(event), true);
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DragonValley/Namo.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
index 99057c816c..f21c497157 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
@@ -40,13 +40,13 @@ public class Namo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THIS_PLACE_SWARMS_WITH_DRAGONS_BY_DAY_AND_UNDEAD_BY_NIGHT));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
index 32c7beb400..c02404f76a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
@@ -40,13 +40,13 @@ public class Rakun extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THIS_PLACE_SWARMS_WITH_DRAGONS_BY_DAY_AND_UNDEAD_BY_NIGHT));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
index 349976c56b..cc5487971c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
@@ -72,7 +72,7 @@ public class SeparatedSoul extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LOCATIONS.containsKey(event))
 		{
@@ -98,7 +98,7 @@ public class SeparatedSoul extends AbstractNpcAI
 				return "no-items.htm";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java
index 2125fca0d8..870b8a5820 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java
@@ -50,7 +50,7 @@ public class Celestiel extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java
index 4cb6303606..8d927f12d2 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java
@@ -48,7 +48,7 @@ public class FlowerBud extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("spawn") && npc.isDead())
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
index 8ca5f0c7d4..a3b3d2da62 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
@@ -49,7 +49,7 @@ public class AltarOfSouls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -96,7 +96,7 @@ public class AltarOfSouls extends AbstractNpcAI
 				return "33920-9.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
index 47beace94a..c82e8969f1 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
@@ -41,7 +41,7 @@ public class RemembranceTower extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("action") && npc.isScriptValue(0))
 		{
@@ -54,7 +54,7 @@ public class RemembranceTower extends AbstractNpcAI
 			npc.setScriptValue(0);
 			npc.broadcastPacket(new OnEventTrigger(EMMITER_ID, false));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
index 70d2b3547f..10d0315383 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
@@ -57,7 +57,7 @@ public class LargeCocoon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -134,7 +134,7 @@ public class LargeCocoon extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
index d4a9137f8d..20aad104b0 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
@@ -41,7 +41,7 @@ public class KrateisCube extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
index 54f813c829..c1de7e5630 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
@@ -365,7 +365,7 @@ public class TalentShow extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((event == null) || event.isEmpty())
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
index 8029a17703..20dfae5ccf 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
@@ -88,7 +88,7 @@ public class ForgeOfTheGods extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
index ff380d4515..407b1fa132 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
@@ -84,7 +84,7 @@ public class Rooney extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport") && !npc.isDecayed())
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
index a3bc5828d9..40c8ad2e0d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
@@ -87,7 +87,7 @@ public class GainakSiege extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("GAINAK_WAR"))
 		{
@@ -129,7 +129,7 @@ public class GainakSiege extends AbstractNpcAI
 				ZoneManager.getInstance().getZoneById(GAINAK_TOWN_ZONE.getId(), PeaceZone.class).setEnabled(false);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
index 27e969e0c9..955c7ddd25 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
@@ -46,7 +46,7 @@ public class Lailly extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
index 35274b2de7..ca8919593a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
@@ -128,7 +128,7 @@ public class TavernEmployee extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
index c99c7cdf42..0ff79c4f5d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
@@ -76,7 +76,7 @@ public class Apherus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("buff"))
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
index 06a75493ac..d7944dd6f3 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
@@ -40,7 +40,7 @@ public class ApherusLookout extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		if (event.equals("open_bag"))
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
index e984558e2c..0d30623e93 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
@@ -48,7 +48,7 @@ public class GardenWatchman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -78,7 +78,7 @@ public class GardenWatchman extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
index 02b6a47091..42752aea0c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
@@ -42,7 +42,7 @@ public class GenesisVines extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CAST_SKILL") && npc.isScriptValue(1))
 		{
@@ -58,7 +58,7 @@ public class GenesisVines extends AbstractNpcAI
 			npc.setScriptValue(0);
 			npc.deleteMe();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
index 3216884d13..ab0d91e3cd 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
@@ -53,7 +53,7 @@ public class Statues extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("fight"))
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfSpirits/Belas/Belas.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfSpirits/Belas/Belas.java
index 526cfce78f..00cfa7a674 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfSpirits/Belas/Belas.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfSpirits/Belas/Belas.java
@@ -44,7 +44,7 @@ public class Belas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfSpirits/Dinford/Dinford.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfSpirits/Dinford/Dinford.java
index 6f9f40ec3c..742cc37560 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfSpirits/Dinford/Dinford.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfSpirits/Dinford/Dinford.java
@@ -46,7 +46,7 @@ public class Dinford extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java
index bdffef8294..386587cc49 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java
@@ -40,7 +40,7 @@ public class Eubina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
index 29ccfb6308..64246fbb51 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
@@ -46,7 +46,7 @@ public class FuryKiku extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -76,7 +76,7 @@ public class FuryKiku extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
index 7c2b546530..203f873b61 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
@@ -50,7 +50,7 @@ public class Isabella extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAWN"))
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java
index fab023bab3..5e9e8d3a57 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java
@@ -40,7 +40,7 @@ public class Rotoeh extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
index dc07df1c2f..a7ab45ea5e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
@@ -42,7 +42,7 @@ public class GiantsCave extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
index 50c14b79bb..20f3adf32d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
@@ -57,7 +57,7 @@ public class Kekropus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
index d4c54fcddd..9e41be2b4a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
@@ -82,7 +82,7 @@ public class Spirit extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -102,7 +102,7 @@ public class Spirit extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Heine/WrapGate.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
index eb934ee4dc..bd1d86a743 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
@@ -43,7 +43,7 @@ public class WrapGate extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("enter_hellbound".equals(event))
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java
index d7a5e674c0..83fa2b778e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/HellboundIsland/BelethsMagicCircle/EnchantedMegaliths.java
@@ -73,7 +73,7 @@ public class EnchantedMegaliths extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
index e49050b695..c4486b2670 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
@@ -39,7 +39,7 @@ public class LeonaBlackbird extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
index 3b1cebc30c..bd44c3481d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
@@ -60,7 +60,7 @@ public class Theorn extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
index e026f3cd57..5ef95aed5e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
@@ -47,7 +47,7 @@ public class Merlot extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/ImperialTomb/BloodySuccubus.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/ImperialTomb/BloodySuccubus.java
index e4b234847d..ef91f321b5 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/ImperialTomb/BloodySuccubus.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/ImperialTomb/BloodySuccubus.java
@@ -118,7 +118,7 @@ public class BloodySuccubus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
index 8ca61e5e9b..78ff485aca 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
@@ -218,7 +218,7 @@ public class FourSepulchers extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
index 6ea0a0760f..14c4560f16 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
@@ -43,7 +43,7 @@ public class Zenya extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
index 2b048463f8..99e8fa6078 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
@@ -63,7 +63,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -135,7 +135,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 				npc.reduceCurrentHp(500, npc, null); // poison kills Fafurion if he is not healed
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
index 2a0a8014f8..d4dc25aab8 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
@@ -47,7 +47,7 @@ public class Rignos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -90,7 +90,7 @@ public class Rignos extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
index 43e2c64226..af4b116516 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
@@ -57,7 +57,7 @@ public class HillsOfGold extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -75,7 +75,7 @@ public class HillsOfGold extends AbstractNpcAI
 			});
 			startQuestTimer("SPICULA_AGGRO", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
index edf9416113..efaf6d6bf8 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
@@ -61,7 +61,7 @@ public class AvantGarde extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
index 37f35f00f8..ac8772d975 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
@@ -108,7 +108,7 @@ public class KetraOrcSupport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
index 6c1085f7d0..f253eadcb6 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
@@ -38,13 +38,13 @@ public class El extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_USE_THE_JUMP_BOARD_TO_GET_STRAIGHT_TO_THE_2ND_FLOOR, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
index 92b4915758..085300cd9c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
@@ -47,7 +47,7 @@ public class Erda extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
@@ -113,7 +113,7 @@ public class Erda extends AbstractNpcAI
 		{
 			player.teleToLocation(CAMILLE_LOC, true);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
index 282d7a6326..debef79252 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
@@ -58,7 +58,7 @@ public class GeneralDilios extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("command_"))
 		{
@@ -87,7 +87,7 @@ public class GeneralDilios extends AbstractNpcAI
 				startQuestTimer("guard_animation_" + (value + 1), 1500, null, null);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
index 0a84cf47a0..b4dbbc74ae 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
@@ -47,7 +47,7 @@ public class Lekon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
index e4edb350d4..3cdddadb06 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
@@ -56,7 +56,7 @@ public class LindviorScene extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -109,7 +109,7 @@ public class LindviorScene extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public void scheduleNextLindviorVisit()
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
index 43c01dcd8b..8f6933b116 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
@@ -57,7 +57,7 @@ public class Nottingale extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
index 975e4a2614..b0ded82d61 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
@@ -38,13 +38,13 @@ public class Plenos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_BE_TELEPORTED_TO_EACH_SEED_IF_YOU_VOLUNTEER_WHY_NOT_TRY, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
index 18f2110178..7fc2284ccb 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
@@ -46,7 +46,7 @@ public class SeedTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -75,7 +75,7 @@ public class SeedTeleportDevice extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
index 23b5c50033..c8498cbee5 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
@@ -49,7 +49,7 @@ public class MithrilMinesTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int index = Integer.parseInt(event) - 1;
 		if (LOCS.length > index)
@@ -57,7 +57,7 @@ public class MithrilMinesTeleporter extends AbstractNpcAI
 			final Location loc = LOCS[index];
 			player.teleToLocation(loc, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
index 6f4192f837..e5abb08edb 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
@@ -84,7 +84,7 @@ public class MonasteryOfSilence extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -132,7 +132,7 @@ public class MonasteryOfSilence extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
index 9a2ee10f60..434807bd9e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
@@ -62,7 +62,7 @@ public class PaganTeleporters extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
index 7eed58ebec..1c6e6ba756 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
@@ -60,7 +60,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -90,7 +90,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI
 				instanceScript.notifyEvent(event, npc, player);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
index 9d4b3bde33..781bfa3af3 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
@@ -39,13 +39,13 @@ public class Fioren extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("startMovie"))
 		{
 			playMovie(player, Movie.SI_BARLOG_STORY);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
index 5ffc401682..6a166ec683 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
@@ -74,7 +74,7 @@ public class Kaysen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
index 619d9e57f4..ceb8d8a7b9 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
@@ -63,7 +63,7 @@ public class NervasTemporaryPrison extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
index b8b803e57f..43691cef06 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
@@ -38,14 +38,14 @@ public class RoAGuard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THIS_IS_RUINS_OF_AGONY_WHERE_KANILOV_IS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
index f3af67aba7..dd2a52bdc5 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
@@ -38,14 +38,14 @@ public class RoDGuard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THIS_IS_THE_RUINS_OF_AGONY_WHERE_POSLOF_IS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
index 5e57a9fb94..a19c1d4085 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
@@ -48,7 +48,7 @@ public class AltarOfSacrifice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("msg_text"))
 		{
@@ -68,7 +68,7 @@ public class AltarOfSacrifice extends AbstractNpcAI
 			startQuestTimer("msg_text", 135000, npc, null);
 			_jenas_guard.setScriptValue(0);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
index a025e62542..b50f530164 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
@@ -147,7 +147,7 @@ public class Venom extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
index ed4ce2d782..cd89ebcb9e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
@@ -43,7 +43,7 @@ public class Klemis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("portInside"))
 		{
@@ -56,7 +56,7 @@ public class Klemis extends AbstractNpcAI
 				return "32734-01.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
index d66782538a..c1db3c8180 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
@@ -80,7 +80,7 @@ public class Maguen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || (player == null))
 		{
@@ -163,7 +163,7 @@ public class Maguen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
index 344d65a44f..d5ab73ff74 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
@@ -48,7 +48,7 @@ public class Nemo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
index 251458ea98..ae26a6c701 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
@@ -297,7 +297,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("ChangeSeedsStatus"))
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
index d6f644fa86..765deb4a7d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
@@ -51,7 +51,7 @@ public class Seyo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (npc == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
index 84bddcea69..58af171614 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
@@ -133,7 +133,7 @@ public class SelMahumDrill extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -189,7 +189,7 @@ public class SelMahumDrill extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
index e6eb07f1a2..7f5b6e8bff 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
@@ -83,7 +83,7 @@ public class SelMahumSquad extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -189,7 +189,7 @@ public class SelMahumSquad extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
index ebf70cc5ae..6ba58ffc8e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
@@ -197,7 +197,7 @@ public class StakatoNest extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || (player == null) || npc.isDead())
 		{
@@ -225,7 +225,7 @@ public class StakatoNest extends AbstractNpcAI
 			addAttackPlayerDesire(spawned, player);
 			npc.deleteMe();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private static Monster checkMinion(Npc npc)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
index 356608d0fc..49a25ec26b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
@@ -47,7 +47,7 @@ public class StakatoNestTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int index = Integer.parseInt(event) - 1;
 		if (LOCS.length > index)
@@ -65,7 +65,7 @@ public class StakatoNestTeleporter extends AbstractNpcAI
 			}
 			player.teleToLocation(loc, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
index 4a64afbd00..ba580c2dad 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
@@ -44,7 +44,7 @@ public class Apprentice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("rideKukuru"))
 		{
@@ -61,7 +61,7 @@ public class Apprentice extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TRY_RIDING_A_KUKURI, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
index 4a9603c4c4..40f728b4bc 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
@@ -95,7 +95,7 @@ public class AwakeningMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
index cd6185a888..8ed7701c68 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
@@ -38,7 +38,7 @@ public class Banette extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
@@ -62,7 +62,7 @@ public class Banette extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
index 87e0629227..858331ae3e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
@@ -38,13 +38,13 @@ public class Bink extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TALKING_ISLAND_VILLAGE_IS_REALLY_BEAUTIFUL, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
index a8d2292f76..f37ea8e8b8 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
@@ -45,7 +45,7 @@ public class BoyAndGirl extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_CHANGEWEAP"))
 		{
@@ -66,7 +66,7 @@ public class BoyAndGirl extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, npc.getId() == BOY ? NpcStringId.WOW_2 : NpcStringId.BOYS_ARE_SO_ANNOYING);
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
index ff53080809..22d19b3496 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
@@ -41,7 +41,7 @@ public class Devno extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -74,7 +74,7 @@ public class Devno extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
index a4f08b8c99..18c04b2e7e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
@@ -42,7 +42,7 @@ public class DrillSergeant extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SOCIAL_SHOW"))
 		{
@@ -66,7 +66,7 @@ public class DrillSergeant extends AbstractNpcAI
 				npc.broadcastSocialAction(socialActionId);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
index 8e3f9e5943..83363ef157 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
@@ -41,7 +41,7 @@ public class Eleve extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Eleve extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
index b8863b9963..114728632b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
@@ -44,13 +44,13 @@ public class Gagabu extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, GAGABU_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
index 44dab7df42..d490504792 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
@@ -38,14 +38,14 @@ public class Galad extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSocialAction(3);
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.OCCASIONALLY_RARE_JEWELS_OF_GIANTS_ARE_DISCOVERED_IN_THE_BEACH, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
index a0c7f71816..3a56943e20 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
@@ -52,7 +52,7 @@ public class GiantSoldiers extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
index a703c40323..b94d2f9624 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
@@ -38,7 +38,7 @@ public class GuardSoldier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -49,7 +49,7 @@ public class GuardSoldier extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(2);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
index b26d9fd748..1b0dd65c82 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
@@ -43,7 +43,7 @@ public class Hadel extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
index bdb70d1f2d..d7ff70d9a0 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
@@ -38,7 +38,7 @@ public class Handermonkey extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE") && (npc != null))
 		{
@@ -54,7 +54,7 @@ public class Handermonkey extends AbstractNpcAI
 				npc.broadcastSocialAction(9);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
index 6874a606ec..f48b530d56 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
@@ -61,7 +61,7 @@ public class Hardin extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = getHtmlMessage(player);
 		if (htmltext != null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
index a8bded51f1..536ee7f5cd 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
@@ -58,7 +58,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("HARNAK_SPAWN"))
 		{
@@ -70,7 +70,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
 				_templates.forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName), null));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private static class zoneInfo
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
index 3c2080e85a..03dca71bb5 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
@@ -55,13 +55,13 @@ public class HurnakMobMsg extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("ATTACK"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomEntry(ON_ATTACK_MSG));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
index 81f6617329..7055381eab 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
@@ -38,14 +38,14 @@ public class Hera extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomBoolean() ? NpcStringId.DOES_THE_GODDESS_SEE_WHAT_SHE_HAS_DONE : NpcStringId.WHY_HAVE_THE_HEROES_ABANDONED_US);
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
index 7003ad014d..2b6a1a1e51 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
@@ -38,7 +38,7 @@ public class Heymond extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
@@ -62,7 +62,7 @@ public class Heymond extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
index 52ce99be7f..8033f3c1ec 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
@@ -38,7 +38,7 @@ public class Holly extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -48,7 +48,7 @@ public class Holly extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(6);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
index 3f9141b931..e11490debc 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
@@ -41,7 +41,7 @@ public class Karonf extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Karonf extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
index 597cfd80f2..c102b0cc4c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
@@ -44,7 +44,7 @@ public class Luderic extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -54,7 +54,7 @@ public class Luderic extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(1);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
index 0c07720a0a..08de6143f0 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
@@ -45,13 +45,13 @@ public class Lumi extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, LUMI_SHOUT[getRandom(3)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
index 68b2789416..3bdb8de60b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
@@ -38,13 +38,13 @@ public class Mahram extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.ALCHEMY_IS_A_SCIENCE_AND_AN_ART, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
index e00fd6c98c..85117713a0 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
@@ -38,13 +38,13 @@ public class Mai extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EVERY_RACE_BUILT_A_PIECE_OF_THIS_VILLAGE, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
index dcd47a9822..2d44f1568a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
@@ -38,13 +38,13 @@ public class MarinSmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.HMM_IS_THIS_STILL_A_DECENT_WEAPON, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
index d5e5496e16..0d4e8f79e3 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
@@ -41,7 +41,7 @@ public class Marsha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Marsha extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
index aa9eb0eb87..81bc246742 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
@@ -43,7 +43,7 @@ public class Milia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("gludioAirship"))
 		{
@@ -53,7 +53,7 @@ public class Milia extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SPEAK_WITH_ME_ABOUT_TRAVELING_AROUND_ADEN, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
index b1e037eb5a..933c139b8c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
@@ -64,7 +64,7 @@ public class MonkOfChaos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
index f6cd83883a..0bedb09eb6 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
@@ -41,7 +41,7 @@ public class Morgan extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Morgan extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
index e7ce45a4e5..fd5e025cd2 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
@@ -40,7 +40,7 @@ public class Oris extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SOCIAL_ACTION_1"))
 		{
@@ -55,7 +55,7 @@ public class Oris extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_HAVEN_T_FELT_THIS_GOOD_IN_AGES, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
index 629e695955..bc23f8bd49 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
@@ -46,7 +46,7 @@ public class Pantheon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
index 8923f048b6..109864aff4 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
@@ -149,7 +149,7 @@ public class Raina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
index 4c8862c733..8d66a71766 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
@@ -41,7 +41,7 @@ public class Rubentis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Rubentis extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
index d5c86cee97..87e1df4a6b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
@@ -38,14 +38,14 @@ public class Ruks extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomBoolean() ? NpcStringId.THE_SEVEN_SIGNS_ENDED : NpcStringId.WE_NEED_TO_FIND_HER_WEAKNESS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
index cc9a63c666..880532e52c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
@@ -38,13 +38,13 @@ public class Sebion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TIS_A_SCRATCH, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
index fa3cc06633..4b05120bde 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
@@ -38,13 +38,13 @@ public class Shannon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.LOOK_AT_ALL_THE_NEWBIES_HA_HA_HA, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
index 219ac48515..7fd067c374 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
@@ -44,13 +44,13 @@ public class Sodian extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, SODIAN_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
index e11dfb9aaf..8413c93bc8 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
@@ -44,13 +44,13 @@ public class Stiller extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, STILLER_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
index b10f044196..d196091a8e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
@@ -38,13 +38,13 @@ public class Theodore extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.AND_NOW_YOUR_JOURNEY_BEGINS, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
index 4290aa8fc6..8e4f8ed738 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
@@ -38,7 +38,7 @@ public class TomaJunior extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -49,7 +49,7 @@ public class TomaJunior extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(6);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
index c3aa031317..78ce6f2c8c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
@@ -38,7 +38,7 @@ public class TrainningSoldier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -55,7 +55,7 @@ public class TrainningSoldier extends AbstractNpcAI
 			}
 			startQuestTimer("START_ATTACK", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
index 848196c047..b92e79413b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
@@ -63,7 +63,7 @@ public class Trandon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String[] substrings = event.split(" ");
 		if (substrings.length < 1)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
index 8cd3cd965d..b65bd9a7ad 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
@@ -42,7 +42,7 @@ public class YeSagiraGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -56,7 +56,7 @@ public class YeSagiraGuards extends AbstractNpcAI
 			}
 			startQuestTimer("GUARD_AGGRO", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
index 5fb219dcef..77b212f1af 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
@@ -84,7 +84,7 @@ public class YeSegiraTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LOCATIONS.containsKey(event))
 		{
@@ -107,7 +107,7 @@ public class YeSegiraTeleportDevice extends AbstractNpcAI
 				// }
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_PLAYER_CREATE)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
index 2c8e967539..4bb6be2086 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
@@ -40,7 +40,7 @@ public class Acateo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("give_circlet"))
 		{
@@ -51,7 +51,7 @@ public class Acateo extends AbstractNpcAI
 			giveItems(player, ACADEMY_CIRCLET, 1);
 			return "33905-2.html";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
index 949fb8f279..48ca778074 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
@@ -108,7 +108,7 @@ public class VarkaSilenosSupport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
index b7fb571500..3a94d3d378 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
@@ -43,7 +43,7 @@ public class ElmoredenServantsGhost extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("teleport1") || event.equals("teleport2"))
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
index 427084ea7a..150fee7dfb 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
@@ -83,7 +83,7 @@ public class Wastelands extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || !npc.isSpawned())
 		{
@@ -184,7 +184,7 @@ public class Wastelands extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
index 61678a5cb2..5e24c8040c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
@@ -47,7 +47,7 @@ public class ZealotOfShilen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -75,7 +75,7 @@ public class ZealotOfShilen extends AbstractNpcAI
 			}
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
index 2da266ca0e..ab6a6ebc3e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
@@ -38,14 +38,14 @@ public class Commando extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.WE_RE_COLLECTING_SEEKER_OF_ADEN);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Anais/Anais.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Anais/Anais.java
index 74fe879672..823d08142f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Anais/Anais.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Anais/Anais.java
@@ -75,7 +75,7 @@ public class Anais extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -134,7 +134,7 @@ public class Anais extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
index a4a93ce801..97936f1ddc 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
@@ -114,7 +114,7 @@ public class Anakim extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -187,7 +187,7 @@ public class Anakim extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Anakim/AnakimBoss.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Anakim/AnakimBoss.java
index e082cf6354..d3b785f7e1 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Anakim/AnakimBoss.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Anakim/AnakimBoss.java
@@ -51,7 +51,7 @@ public class AnakimBoss extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -64,7 +64,7 @@ public class AnakimBoss extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Anakim/AnakimElitePriest.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Anakim/AnakimElitePriest.java
index 21f3ff12cb..8511577c7b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Anakim/AnakimElitePriest.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Anakim/AnakimElitePriest.java
@@ -46,7 +46,7 @@ public class AnakimElitePriest extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -59,7 +59,7 @@ public class AnakimElitePriest extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index d236e19d43..a5157acfc7 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -193,7 +193,7 @@ public class Antharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -605,7 +605,7 @@ public class Antharas extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 6aa670a2de..5fe20e9fa4 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -162,7 +162,7 @@ public class Baium extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -471,7 +471,7 @@ public class Baium extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
index 992eae3c7c..7bea095520 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
@@ -105,7 +105,7 @@ public class BalokWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -115,7 +115,7 @@ public class BalokWarzone extends AbstractInstance
 				takeItems(player, PRISON_KEY, -1);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
index 451836bc83..86ea240c0a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
@@ -72,7 +72,7 @@ public class BaylorWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -124,7 +124,7 @@ public class BaylorWarzone extends AbstractInstance
 				player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index b5a24845bb..3748875859 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -126,7 +126,7 @@ public class Beleth extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -536,7 +536,7 @@ public class Beleth extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
index e2770b5bec..b768e563e9 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
@@ -49,7 +49,7 @@ public class Wormhole extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Camille/Camille.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Camille/Camille.java
index 24757df47d..ee0ad1539f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Camille/Camille.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Camille/Camille.java
@@ -54,7 +54,7 @@ public class Camille extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class Camille extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Core/Core.java
index 344ad52a0a..34584c31c3 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -143,7 +143,7 @@ public class Core extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
@@ -162,7 +162,7 @@ public class Core extends AbstractNpcAI
 			_minions.forEach(Attackable::decayMe);
 			_minions.clear();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Cyrax/Cyrax.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Cyrax/Cyrax.java
index 3cf963c685..b5a3be172b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Cyrax/Cyrax.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Cyrax/Cyrax.java
@@ -48,7 +48,7 @@ public class Cyrax extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -61,7 +61,7 @@ public class Cyrax extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Cyrax/TempleEliteWizard.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Cyrax/TempleEliteWizard.java
index 1b68f87df9..33d0e6b941 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Cyrax/TempleEliteWizard.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Cyrax/TempleEliteWizard.java
@@ -44,7 +44,7 @@ public class TempleEliteWizard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleEliteWizard extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/ChoirOfDarkness.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/ChoirOfDarkness.java
index c07620df2f..22735a6228 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/ChoirOfDarkness.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/ChoirOfDarkness.java
@@ -44,7 +44,7 @@ public class ChoirOfDarkness extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class ChoirOfDarkness extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/Etina.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/Etina.java
index 21647bc333..3f20e07ce9 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/Etina.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/Etina.java
@@ -47,7 +47,7 @@ public class Etina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -60,7 +60,7 @@ public class Etina extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
index e7275b843f..47455b4c67 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
@@ -348,7 +348,7 @@ public class EtisVanEtina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -515,7 +515,7 @@ public class EtisVanEtina extends AbstractNpcAI
 			}
 			
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private void clean()
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleDarkJudge.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleDarkJudge.java
index 609abafe5c..c89586710f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleDarkJudge.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleDarkJudge.java
@@ -44,7 +44,7 @@ public class GreatTempleDarkJudge extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class GreatTempleDarkJudge extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleSoulGuide.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleSoulGuide.java
index 7ffe33d918..a08a1c79c2 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleSoulGuide.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleSoulGuide.java
@@ -44,7 +44,7 @@ public class GreatTempleSoulGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class GreatTempleSoulGuide extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/JudgeOfHeresy.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/JudgeOfHeresy.java
index acfba50e7d..a9e53959c5 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/JudgeOfHeresy.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/JudgeOfHeresy.java
@@ -44,7 +44,7 @@ public class JudgeOfHeresy extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class JudgeOfHeresy extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/Kain.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/Kain.java
index 8c81abebe3..7b910760fd 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/Kain.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/Kain.java
@@ -46,7 +46,7 @@ public class Kain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -59,7 +59,7 @@ public class Kain extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/LiberatorOfLust.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/LiberatorOfLust.java
index 081d00456a..628d8f4399 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/LiberatorOfLust.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/LiberatorOfLust.java
@@ -44,7 +44,7 @@ public class LiberatorOfLust extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class LiberatorOfLust extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/SeekerOfDespair.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/SeekerOfDespair.java
index 4cb190b064..b9fadc44ad 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/SeekerOfDespair.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/SeekerOfDespair.java
@@ -44,7 +44,7 @@ public class SeekerOfDespair extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class SeekerOfDespair extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/SoulDestroyer.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/SoulDestroyer.java
index defafa1d95..7382c7e319 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/SoulDestroyer.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/SoulDestroyer.java
@@ -44,7 +44,7 @@ public class SoulDestroyer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class SoulDestroyer extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleArchon.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleArchon.java
index ba2d56ecf9..85dc410977 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleArchon.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleArchon.java
@@ -44,7 +44,7 @@ public class TempleArchon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleArchon extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleDarkWizard.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleDarkWizard.java
index c92187c67e..ff892ea50e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleDarkWizard.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleDarkWizard.java
@@ -44,7 +44,7 @@ public class TempleDarkWizard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleDarkWizard extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleFlameMaster.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleFlameMaster.java
index 57a930ddd5..341a3663b7 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleFlameMaster.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleFlameMaster.java
@@ -44,7 +44,7 @@ public class TempleFlameMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleFlameMaster extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleHighPriest.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleHighPriest.java
index df735b07c3..df68ee43c3 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleHighPriest.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleHighPriest.java
@@ -44,7 +44,7 @@ public class TempleHighPriest extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleHighPriest extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Fafurion/EliteWizard.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Fafurion/EliteWizard.java
index e776d5739f..2b85d8c0e0 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Fafurion/EliteWizard.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Fafurion/EliteWizard.java
@@ -44,7 +44,7 @@ public class EliteWizard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class EliteWizard extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
index 08938da90f..75aa81d4eb 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
@@ -104,7 +104,7 @@ public class Fafurion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Fafurion/FafurionBoss.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Fafurion/FafurionBoss.java
index d297cd7906..eb953be1a0 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Fafurion/FafurionBoss.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Fafurion/FafurionBoss.java
@@ -60,7 +60,7 @@ public class FafurionBoss extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -73,7 +73,7 @@ public class FafurionBoss extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
index 859e6fc695..ed664b4197 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
@@ -65,7 +65,7 @@ public class IceQueensCastle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class IceQueensCastle extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
index a07501ed22..9f3772a47d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
@@ -160,7 +160,7 @@ public class IceQueensCastleBattle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterEasy"))
 		{
@@ -700,7 +700,7 @@ public class IceQueensCastleBattle extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
index 7fa44d08d6..21e250c482 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
@@ -45,7 +45,7 @@ public class Jinia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
index 62de6736d0..3a3ddc74e7 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
@@ -165,7 +165,7 @@ public class LastImperialTomb extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
index 282b9f8fbc..254c891bc5 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
@@ -62,7 +62,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Helios/Helios.java
index d6de973ec6..8288e0626c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Helios/Helios.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Helios/Helios.java
@@ -320,7 +320,7 @@ public class Helios extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Helios/Helios1.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Helios/Helios1.java
index 7eb394719d..5d2364fbc0 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Helios/Helios1.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Helios/Helios1.java
@@ -45,7 +45,7 @@ public class Helios1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -58,7 +58,7 @@ public class Helios1 extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Helios/Helios2.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Helios/Helios2.java
index 2147bd52c0..abe0cc400e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Helios/Helios2.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Helios/Helios2.java
@@ -45,7 +45,7 @@ public class Helios2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -58,7 +58,7 @@ public class Helios2 extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Helios/Helios3.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Helios/Helios3.java
index 364dce85de..8e293ad2a4 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Helios/Helios3.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Helios/Helios3.java
@@ -46,7 +46,7 @@ public class Helios3 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -59,7 +59,7 @@ public class Helios3 extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java
index 404237e0fa..29b64fa20b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java
@@ -44,7 +44,7 @@ public class RoyalArchmageMinion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class RoyalArchmageMinion extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
index e4260628ce..d61884c91b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
@@ -92,7 +92,7 @@ public class IstinaCavern extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance instance = npc.getInstanceWorld();
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
index 27728f34c1..f1945e2def 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
@@ -40,7 +40,7 @@ public class Rumiese extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
index b94d17f47b..ae0e6aaef9 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
@@ -141,7 +141,7 @@ public class Kelbim extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -281,7 +281,7 @@ public class Kelbim extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
index 9f677053b2..c3e066a466 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
@@ -137,7 +137,7 @@ public class KimerianCommon extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance instance = npc.getInstanceWorld();
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
index 9199e144f3..a037e718d9 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
@@ -113,7 +113,7 @@ public class Lilith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -187,7 +187,7 @@ public class Lilith extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lilith/LilithBoss.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lilith/LilithBoss.java
index e0d6b0f02c..9ce319723c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lilith/LilithBoss.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lilith/LilithBoss.java
@@ -51,7 +51,7 @@ public class LilithBoss extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -64,7 +64,7 @@ public class LilithBoss extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lilith/LilithEliteShaman.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lilith/LilithEliteShaman.java
index bfe6a2aff9..cdd63a05f9 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lilith/LilithEliteShaman.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lilith/LilithEliteShaman.java
@@ -47,7 +47,7 @@ public class LilithEliteShaman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -60,7 +60,7 @@ public class LilithEliteShaman extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/LimitBarrier.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/LimitBarrier.java
index 594afe269e..70751cbe79 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/LimitBarrier.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/LimitBarrier.java
@@ -124,7 +124,7 @@ public class LimitBarrier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -153,7 +153,7 @@ public class LimitBarrier extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
index 5b16c333e2..ced833a889 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
@@ -49,7 +49,7 @@ public class KatoSicanus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
index 2bd8aeb2c6..7dacdd2c16 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
@@ -674,7 +674,7 @@ public class Lindvior extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
index 73d5d88407..f676f620a3 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
@@ -49,7 +49,7 @@ public class Vortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -110,7 +110,7 @@ public class Vortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java
index 190f1ce9ea..02f57b1bd5 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java
@@ -59,7 +59,7 @@ public class Lydia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
index 49a224c8bc..8c7d0eb77d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
@@ -122,7 +122,7 @@ public class OctavisWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -146,7 +146,7 @@ public class OctavisWarzone extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 9a58c9f1b7..6eda44726f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -145,7 +145,7 @@ public class Orfen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -201,7 +201,7 @@ public class Orfen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 93735c996b..72e174bb65 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -155,7 +155,7 @@ public class QueenAnt extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -239,7 +239,7 @@ public class QueenAnt extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
index 7a3322b68a..297948d172 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
@@ -53,7 +53,7 @@ public class QueenShyeed extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java
index 8304e07d78..80a048214d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java
@@ -149,7 +149,7 @@ public class Ramona extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -377,7 +377,7 @@ public class Ramona extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
index ad87d93fe0..20e1572d8a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
@@ -80,7 +80,7 @@ public class Sailren extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -249,7 +249,7 @@ public class Sailren extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
index 4eeb4da057..b11aa4de6a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
@@ -73,7 +73,7 @@ public class Cannon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
index f754206b22..45b4c89ee7 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
@@ -62,7 +62,7 @@ public class TautiWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -170,7 +170,7 @@ public class TautiWarzone extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
index 50da94c8b2..f973bf0e12 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
@@ -182,7 +182,7 @@ public class TeredorWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
index 7b07413999..63b2c0589a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
@@ -507,7 +507,7 @@ public class Stage1 extends AbstractInstance implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
index 70d36f9c61..d2abf63365 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
@@ -50,7 +50,7 @@ public class Daichir extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterEarthWyrnCave"))
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
index e69a688d77..2c365d7f61 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
@@ -570,7 +570,7 @@ public class Trasken extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -694,7 +694,7 @@ public class Trasken extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index 74f7b64063..4eaf667f0a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -191,7 +191,7 @@ public class Valakas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -380,7 +380,7 @@ public class Valakas extends AbstractNpcAI
 		{
 			BOSS_ZONE.oustAllPlayers();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
index a211f7bfc0..bae4d63898 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
@@ -172,7 +172,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter60"))
 		{
@@ -254,7 +254,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/AdenReconstructorManager.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
index efa4bfa6ca..65a08050b6 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
@@ -42,7 +42,7 @@ public class AdenReconstructorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -67,7 +67,7 @@ public class AdenReconstructorManager extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
index 2dec85bd94..c31f5c0175 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
@@ -141,7 +141,7 @@ public class AdventureGuildsman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
index a94b0afda2..6350b8c74b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
@@ -74,7 +74,7 @@ public class AdventurersGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
index c5ed73b2c2..7d81da92e1 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
@@ -51,7 +51,7 @@ public class AlchemistManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index b939ece983..849ed827d3 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -63,7 +63,7 @@ public class ArenaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -128,7 +128,7 @@ public class ArenaManager extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
index 1c51b94358..352c31c8fc 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
@@ -38,7 +38,7 @@ public class BlackJudge extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("weakenBreath"))
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
index d35adf8706..e203aecd5e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
@@ -42,7 +42,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equals("31092-01.html"))
@@ -79,7 +79,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 			giveAdena(player, count, false);
 			return "31092-04.html";
 		}
-		return super.onAdvEvent(htmltext, npc, player);
+		return super.onEvent(htmltext, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
index 6a44d63e0b..81e90f2d67 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
@@ -56,7 +56,7 @@ public class CastleAmbassador extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
index b07792cd2d..11b8786523 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
@@ -57,7 +57,7 @@ public class CastleBlacksmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return (event.equalsIgnoreCase(npc.getId() + "-02.html") && hasRights(player, npc)) ? event : null;
 	}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
index 2359d43ac4..35159970a6 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
@@ -393,7 +393,7 @@ public class CastleChamberlain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Castle castle = npc.getCastle();
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
index 3e2cd16930..4a8fac8c0e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
@@ -140,7 +140,7 @@ public class CastleCourtMagician extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player.getClan() == null) && (player.getClanId() != npc.getCastle().getOwnerId()))
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
index b9c1f3faf5..70bae86615 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
@@ -72,7 +72,7 @@ public class CastleDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
index bb32dde319..a319e3977f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
@@ -56,7 +56,7 @@ public class CastleMercenaryManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index ac71c1afad..0e8137bb1d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -78,7 +78,7 @@ public class CastleTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
@@ -168,7 +168,7 @@ public class CastleTeleporter extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
index bffed40bcc..ea1b40c41c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
@@ -52,7 +52,7 @@ public class CastleWarehouse extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final boolean isMyLord = player.isClanLeader() && (player.getClan().getCastleId() == (npc.getCastle() != null ? npc.getCastle().getResidenceId() : -1));
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index 8170db2b9d..d0603ecfe6 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -64,7 +64,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
index a86581206e..afd7250ca4 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
@@ -57,7 +57,7 @@ public class ClanHallDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 8e2969fe49..188fe77edb 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -105,7 +105,7 @@ public class ClanHallManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
index 1d8e114daa..77845525b2 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
@@ -68,7 +68,7 @@ public class ClanTrader extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 3bd250def2..df5ae2c206 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -235,7 +235,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		if (!_isEnabled)
 		{
@@ -942,7 +942,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	{
 		if (event.getCommand().startsWith("Quest ClassMaster "))
 		{
-			final String html = onAdvEvent(event.getCommand().substring(18), null, event.getPlayer());
+			final String html = onEvent(event.getCommand().substring(18), null, event.getPlayer());
 			event.getPlayer().sendPacket(TutorialCloseHtml.STATIC_PACKET);
 			showResult(event.getPlayer(), html);
 		}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
index 21aafa7e87..7b61214c91 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
@@ -43,7 +43,7 @@ public class CrimsonHatuOtis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -69,7 +69,7 @@ public class CrimsonHatuOtis extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java
index 3851c06ced..f83ed37058 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java
@@ -82,7 +82,7 @@ public class DimensionalMerchant extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/DivineBeast.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/DivineBeast.java
index 1f247a7b35..3f3a076992 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/DivineBeast.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/DivineBeast.java
@@ -44,7 +44,7 @@ public class DivineBeast extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player == null) || !player.hasServitors())
 		{
@@ -55,7 +55,7 @@ public class DivineBeast extends AbstractNpcAI
 			cancelQuestTimer(event, npc, player);
 			player.getServitors().values().forEach(summon -> summon.unSummon(player));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/EnergySeeds.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/EnergySeeds.java
index 509c12bbeb..befbad7bff 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/EnergySeeds.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/EnergySeeds.java
@@ -196,7 +196,7 @@ public class EnergySeeds extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("StartSoDAi"))
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/FactionCertificates/FactionCertificates.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/FactionCertificates/FactionCertificates.java
index 684a0e5a30..21c123575f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/FactionCertificates/FactionCertificates.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/FactionCertificates/FactionCertificates.java
@@ -53,7 +53,7 @@ public class FactionCertificates extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs1 = player.getQuestState(Q10875_ForReputation.class.getSimpleName());
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/FameManager/FameManager.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/FameManager/FameManager.java
index d4f16a9b96..b0a7bc0a20 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/FameManager/FameManager.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/FameManager/FameManager.java
@@ -49,7 +49,7 @@ public class FameManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
index 79742f7171..c5a075fbcf 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
@@ -69,7 +69,7 @@ public class FortressSiegeManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
index 45b6eb8f65..9e7cd8fd5d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
@@ -67,7 +67,7 @@ public class HealerTrainer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
index 94b2f5f16d..2b2e0d3c40 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
@@ -89,7 +89,7 @@ public class HermuncusMinion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(eventValue, " ");
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
index 2928fbd023..abe98a50e5 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
@@ -47,7 +47,7 @@ public class LaVieEnRose extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/Mammons/Mammons.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/Mammons/Mammons.java
index b4aa9323a2..d6d2a88fc8 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/Mammons/Mammons.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/Mammons/Mammons.java
@@ -79,12 +79,12 @@ public class Mammons extends AbstractNpcAI
 		addTalkId(MAMMONS);
 		addFirstTalkId(MAMMONS);
 		
-		onAdvEvent("RESPAWN_MAMMONS", null, null);
+		onEvent("RESPAWN_MAMMONS", null, null);
 		startQuestTimer("RESPAWN_MAMMONS", TELEPORT_DELAY, null, null, true);
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
index 8d38a27541..6763b0367c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
@@ -71,7 +71,7 @@ public class ManorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
index a4cf9b72fd..a3508931f9 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
@@ -142,7 +142,7 @@ public class MentorGuide extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("exchange"))
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/Minigame/Minigame.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/Minigame/Minigame.java
index 6e48943e76..936ed15436 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/Minigame/Minigame.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/Minigame/Minigame.java
@@ -68,7 +68,7 @@ public class Minigame extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final MinigameRoom room = getRoomByManager(npc);
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
index aa4863ae2d..75a4650405 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
@@ -78,7 +78,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
index 4ad7e0a2fc..d3576b9fff 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
@@ -48,14 +48,14 @@ public class NornilTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("teleport_"))
 		{
 			final int locId = Integer.parseInt(event.replace("teleport_", ""));
 			player.teleToLocation(LOCATIONS[locId - 1]);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
index 899c6a356f..66831c0e4e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
@@ -66,7 +66,7 @@ public class OlyBuffer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index db559f3ca6..bc0a7630c3 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -88,7 +88,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/PrisonGuards.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/PrisonGuards.java
index 4084beddca..c79356a1f0 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/PrisonGuards.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/PrisonGuards.java
@@ -53,7 +53,7 @@ public class PrisonGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CLEAR_STATUS"))
 		{
@@ -67,7 +67,7 @@ public class PrisonGuards extends AbstractNpcAI
 			}
 			startQuestTimer("CHECK_HOME", 30000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
index 21d281c6c9..435f293345 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
@@ -84,7 +84,7 @@ public class Proclaimer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("giveBuff"))
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
index 8b3515e12b..83098c1eaf 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
@@ -79,7 +79,7 @@ public class ProvisionalHalls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/Servitors/SinEater.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/Servitors/SinEater.java
index 1ed8d645a5..d7536614e8 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/Servitors/SinEater.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/Servitors/SinEater.java
@@ -48,7 +48,7 @@ public class SinEater extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TALK") && (player != null) && (player.getPet() != null))
 		{
@@ -79,7 +79,7 @@ public class SinEater extends AbstractNpcAI
 			}
 			startQuestTimer("TALK", 60000, null, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_CREATURE_DEATH)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
index ec177e537e..373c64200b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
@@ -128,7 +128,7 @@ public class SupportUnitCaptain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int fortOwner = npc.getFort().getOwnerClan() == null ? 0 : npc.getFort().getOwnerClan().getId();
 		if ((player.getClan() == null) || (player.getClanId() != fortOwner))
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
index f6d1e74529..a733b87dad 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
@@ -53,7 +53,7 @@ public class SymbolMaker extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
index f9cd32a0dd..82ec9274c2 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
@@ -94,7 +94,7 @@ public class TeleportToUndergroundColiseum extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.endsWith(".htm"))
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
index dbe26ae6a3..7052b10367 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
@@ -75,7 +75,7 @@ public class TersisHerald extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("giveBuff"))
 		{
@@ -87,7 +87,7 @@ public class TersisHerald extends AbstractNpcAI
 			npc.setTarget(player);
 			npc.doCast(DRAGON_BUFF.getSkill());
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
index 8e94950d76..520a057481 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
@@ -62,7 +62,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = "";
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
index 58d9b961f9..46b1f36ec8 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
@@ -87,7 +87,7 @@ public class ClassTransferTalk extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/WarriorFishingBlock.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
index 56b29fee5b..78e3d1c99e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
@@ -75,7 +75,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -104,7 +104,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
index b9439eb0ec..a1878b037b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
@@ -156,7 +156,7 @@ public class WeaverOlf extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.contains("_grade_"))
 		{
@@ -185,7 +185,7 @@ public class WeaverOlf extends AbstractNpcAI
 			}
 			else
 			{
-				return super.onAdvEvent(event, npc, player);
+				return super.onEvent(event, npc, player);
 			}
 			
 			if (hasQuestItems(player, itemIds[0]))
@@ -225,7 +225,7 @@ public class WeaverOlf extends AbstractNpcAI
 			{
 				return npc.getId() + "-no.htm";
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		return event;
 	}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index 777998cde4..48bf41ab6d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -210,7 +210,7 @@ public class WyvernManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
index 0c2e7586c9..c49be5297b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
@@ -36,7 +36,7 @@ public class DelevelManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.DELEVEL_MANAGER_ENABLED)
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
index 5eaddb78ba..76b7f1e559 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
@@ -54,7 +54,7 @@ public class FactionSystem extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class FactionSystem extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
index 8b9c676ad5..771c8a9058 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
@@ -34,7 +34,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -77,7 +77,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 				npc.broadcastInfo(); // update flag status
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
index ee7151c9c2..36f2ef411d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
@@ -68,7 +68,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("AUTOBUFF") && (npc != null) && !npc.isDead())
 		{
@@ -96,7 +96,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
 			}
 			startQuestTimer("AUTOBUFF", 30000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
index f19aa0cb6f..447c512987 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
@@ -39,7 +39,7 @@ public class NoblessMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.NOBLESS_MASTER_ENABLED)
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java
index b0224852ae..bb87b3096a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java
@@ -49,7 +49,7 @@ public class ShadowWeapons extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
index ba8d24ed64..82bb289dd9 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
@@ -160,7 +160,7 @@ public class Deathmatch extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
index 1eb84eca93..b92bbe7f77 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
@@ -213,7 +213,7 @@ public class Rabbits extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/events/Race/Race.java
index ff9fc462f6..6ac325ca6f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/events/Race/Race.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/events/Race/Race.java
@@ -320,7 +320,7 @@ public class Race extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index f7f63590c3..06e5073b0d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -177,7 +177,7 @@ public class TvT extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
index 77c055cc79..84a2d7763d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
@@ -45,7 +45,7 @@ public class BirthOfDraco extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
index 9bc0ff9c55..87ac868dc7 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
@@ -64,7 +64,7 @@ public class CharacterBirthday extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("despawn_npc"))
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index a966bdff3e..4648d78f95 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -56,7 +56,7 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
index a8f534ca97..76c5aa611f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
@@ -73,7 +73,7 @@ public class FreyaCelebration extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("give_potion"))
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
index b45e872a60..2570ef061a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
@@ -86,7 +86,7 @@ public class GiftOfVitality extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/HappyHours/HappyHours.java
index ff0f02aa95..589a0e3a61 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/HappyHours/HappyHours.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/HappyHours/HappyHours.java
@@ -49,7 +49,7 @@ public class HappyHours extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
index aa5419e179..76aaa4ab09 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
@@ -59,7 +59,7 @@ public class HeavyMedal extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		int level = checkLevel(player);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/HungryHorse/HungryHorse.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
index 646db8d92d..657ddb84b9 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
@@ -58,7 +58,7 @@ public class HungryHorse extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
index 6107af7f71..502fce9a30 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
@@ -55,7 +55,7 @@ public class HuntForSanta extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/LetterCollector/LetterCollector.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
index 744b1f2ae4..d87bd82b02 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
@@ -123,7 +123,7 @@ public class LetterCollector extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
index b71176a555..a42e986ee4 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
@@ -49,7 +49,7 @@ public class LoveYourGatekeeper extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
index c868fad2b3..6460eb4ab0 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
@@ -61,7 +61,7 @@ public class LoversJubilee extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmtext = event;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
index a6666bb367..5e6d36bf89 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
@@ -68,7 +68,7 @@ public class MasterOfEnchanting extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("buy_staff"))
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/RedLibra/RedLibra.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/RedLibra/RedLibra.java
index 69414f20c6..693f2efd18 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/RedLibra/RedLibra.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/RedLibra/RedLibra.java
@@ -42,7 +42,7 @@ public class RedLibra extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
index f6c714eddc..7d3462224b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
@@ -58,7 +58,7 @@ public class RudolphsBlessing extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("rudolph_eat") && (player != null) && player.isOnline())
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
index 129644cef2..025d1a617d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
@@ -297,7 +297,7 @@ public class SavingSanta extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!isEventPeriod())
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
index 5c00677d25..862a8df578 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
@@ -51,7 +51,7 @@ public class ThePowerOfLove extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java
index 4256e9042d..63d91c507d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java
@@ -45,7 +45,7 @@ public class TrainingWithDandy extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
index 6696dee542..a53ca2b3a0 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
@@ -130,7 +130,7 @@ public class AltarOfShilen extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (event.equals("enterInstance"))
@@ -266,7 +266,7 @@ public class AltarOfShilen extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
index 5129d50163..e653bab1f6 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
@@ -154,7 +154,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -269,7 +269,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
index 246a4528c4..1532a34e59 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
@@ -467,7 +467,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
index 5a6746d567..f9cc02144e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
@@ -72,7 +72,7 @@ public class ChamberOfProphecies extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
index 4f0f2f7a19..b815b5bae7 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
@@ -177,7 +177,7 @@ public class ChamberOfDelusion extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CommandPost/CommandPost.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CommandPost/CommandPost.java
index ccd790bea4..7d347b4948 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CommandPost/CommandPost.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CommandPost/CommandPost.java
@@ -105,7 +105,7 @@ public class CommandPost extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
index ff860c70bb..c8bed455cc 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
@@ -114,13 +114,13 @@ public class CrystalCavernsCoralGarden extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
index 6db8525e11..46f3d2fdf6 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
@@ -79,13 +79,13 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
index c51b5d7887..121e3a89f4 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
@@ -135,13 +135,13 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
index 72d2fe0f6f..58eec2329b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
@@ -122,7 +122,7 @@ public class DarkCloudMansion extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
index 00241b7b77..4f4fade41e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
@@ -45,7 +45,7 @@ public class DimensionMakkum extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = getPlayerInstance(player);
 		switch (event)
@@ -69,7 +69,7 @@ public class DimensionMakkum extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
index 605b8ebdf8..981a91d4a7 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
@@ -53,13 +53,13 @@ public class DimensionalArchon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), getRandomEntry(ARCHON_MSG)));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
index 176ee5b803..9243451cde 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
@@ -53,7 +53,7 @@ public class DimensionalTrap extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || npc.isAlikeDead())
 		{
@@ -102,7 +102,7 @@ public class DimensionalTrap extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
index f9540acaa2..de51a3efbe 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
@@ -115,7 +115,7 @@ public class DimensionalWrap extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
index bca7be7a72..3f771a9755 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
@@ -44,7 +44,7 @@ public class EvasHiddenSpace extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
index faa864f5b3..c2a1fe19d9 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
@@ -189,12 +189,12 @@ public class EvilIncubator extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player);
 		if ((st == null) || !st.isStarted())
 		{
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
index fef16b28b4..91e45093dd 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
@@ -58,7 +58,7 @@ public class FortressOfTheDead extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/Fortuna/Fortuna.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/Fortuna/Fortuna.java
index 339328eea4..ef7b65659f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/Fortuna/Fortuna.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/Fortuna/Fortuna.java
@@ -51,7 +51,7 @@ public class Fortuna extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -472,7 +472,7 @@ public class Fortuna extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
index d3e585d339..c8f6ce36e2 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
@@ -642,7 +642,7 @@ public class Kamaloka extends AbstractInstance
 	 * Handles only player's enter, single parameter - integer kamaloka index
 	 */
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
index cccdf5d51f..4db13d5b98 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
@@ -195,7 +195,7 @@ public class KartiasLabyrinth extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -268,7 +268,7 @@ public class KartiasLabyrinth extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java
index 0284ac988f..7f88562bc4 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java
@@ -61,7 +61,7 @@ public class MithrilMine extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -108,7 +108,7 @@ public class MithrilMine extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
index f83f2fcec1..024065f4e9 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
@@ -83,7 +83,7 @@ public class MysticTavern extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
index 48ee563ff5..56d62a42d1 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
@@ -81,7 +81,7 @@ public class StoryOfFreya extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance world = npc.getInstanceWorld();
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
index e21d937eb6..d1d82fe8d7 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
@@ -107,7 +107,7 @@ public class StoryOfTauti extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		switch (event)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
index 1413cfc1d3..294c738eb1 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
@@ -67,7 +67,7 @@ public class NightmareKamaloka extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -132,7 +132,7 @@ public class NightmareKamaloka extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
index 68ff2fba1b..d91167b4bb 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
@@ -93,7 +93,7 @@ public class NornilsGarden extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (isInInstance(world))
@@ -157,7 +157,7 @@ public class NornilsGarden extends AbstractInstance
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/Nursery/Nursery.java
index 2e394a7446..9042632611 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/Nursery/Nursery.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/Nursery/Nursery.java
@@ -192,7 +192,7 @@ public class Nursery extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance instance = npc.getInstanceWorld();
 		if (isInInstance(instance))
@@ -269,7 +269,7 @@ public class Nursery extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
index 5f1d771719..64f2155310 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
@@ -105,7 +105,7 @@ public class PailakaRuneCastle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
index 3d6d27f8e1..070ecbc638 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
@@ -173,7 +173,7 @@ public class PrisonOfDarkness extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -313,7 +313,7 @@ public class PrisonOfDarkness extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
index ab85113705..02fd7814dd 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
@@ -64,7 +64,7 @@ public class Q00032_AnObviousLie extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
index 346e21ba51..3e17f3d69c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
@@ -53,7 +53,7 @@ public class Q00033_MakeAPairOfDressShoes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
index bb2c973b13..aea6938651 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
@@ -59,7 +59,7 @@ public class Q00034_InSearchOfCloth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player, false);
 		if (st == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
index c9b8b6e19c..c2d6566765 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
@@ -57,7 +57,7 @@ public class Q00035_FindGlitteringJewelry extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
index 010533841b..00da7f46e9 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
@@ -55,7 +55,7 @@ public class Q00036_MakeASewingKit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
index 78660c7498..29c1bd2863 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
@@ -54,7 +54,7 @@ public class Q00037_MakeFormalWear extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
index 5c4d3d5074..c4274aa035 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
@@ -50,7 +50,7 @@ public class Q00040_ASpecialOrder extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
index 40a4965112..c29eaa83b6 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
@@ -55,7 +55,7 @@ public class Q00115_TheOtherSideOfTruth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
index 720f90157c..7701c4bef7 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
@@ -44,7 +44,7 @@ public class Q00119_LastImperialPrince extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
index a5a6fafea2..edae9395ac 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
@@ -113,7 +113,7 @@ public class Q00337_AudienceWithTheLandDragon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
index 946e2fb51d..be55660c3e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
@@ -50,7 +50,7 @@ public class Q00452_FindingtheLostSoldiers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
index 76ba1205f5..18e37daee3 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
@@ -174,7 +174,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java
index 507820dc6a..0fd000078b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java
@@ -63,7 +63,7 @@ public class Q00454_CompletelyLost extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00459_TheVillainOfTheUndergroundMineTeredor/Q00459_TheVillainOfTheUndergroundMineTeredor.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00459_TheVillainOfTheUndergroundMineTeredor/Q00459_TheVillainOfTheUndergroundMineTeredor.java
index bcec6a35af..0cf6ea0dcb 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00459_TheVillainOfTheUndergroundMineTeredor/Q00459_TheVillainOfTheUndergroundMineTeredor.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00459_TheVillainOfTheUndergroundMineTeredor/Q00459_TheVillainOfTheUndergroundMineTeredor.java
@@ -51,7 +51,7 @@ public class Q00459_TheVillainOfTheUndergroundMineTeredor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00460_PreciousResearchMaterial/Q00460_PreciousResearchMaterial.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00460_PreciousResearchMaterial/Q00460_PreciousResearchMaterial.java
index fb020c3040..981ff3c14e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00460_PreciousResearchMaterial/Q00460_PreciousResearchMaterial.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00460_PreciousResearchMaterial/Q00460_PreciousResearchMaterial.java
@@ -52,7 +52,7 @@ public class Q00460_PreciousResearchMaterial extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00465_WeAreFriends/Q00465_WeAreFriends.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00465_WeAreFriends/Q00465_WeAreFriends.java
index 52d86f67f3..af30a59f5d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00465_WeAreFriends/Q00465_WeAreFriends.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00465_WeAreFriends/Q00465_WeAreFriends.java
@@ -51,7 +51,7 @@ public class Q00465_WeAreFriends extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java
index c350641b85..3eb4b71954 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java
@@ -83,7 +83,7 @@ public class Q00466_PlacingMySmallPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00468_BeLostInTheMysteriousScent/Q00468_BeLostInTheMysteriousScent.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00468_BeLostInTheMysteriousScent/Q00468_BeLostInTheMysteriousScent.java
index d880c919e2..5b347e1276 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00468_BeLostInTheMysteriousScent/Q00468_BeLostInTheMysteriousScent.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00468_BeLostInTheMysteriousScent/Q00468_BeLostInTheMysteriousScent.java
@@ -53,7 +53,7 @@ public class Q00468_BeLostInTheMysteriousScent extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00469_SuspiciousGardener/Q00469_SuspiciousGardener.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00469_SuspiciousGardener/Q00469_SuspiciousGardener.java
index 77e00cc205..c739186b4d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00469_SuspiciousGardener/Q00469_SuspiciousGardener.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00469_SuspiciousGardener/Q00469_SuspiciousGardener.java
@@ -52,7 +52,7 @@ public class Q00469_SuspiciousGardener extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00471_BreakingThroughTheEmeraldSquare/Q00471_BreakingThroughTheEmeraldSquare.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00471_BreakingThroughTheEmeraldSquare/Q00471_BreakingThroughTheEmeraldSquare.java
index 78f677a640..c563bbad31 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00471_BreakingThroughTheEmeraldSquare/Q00471_BreakingThroughTheEmeraldSquare.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00471_BreakingThroughTheEmeraldSquare/Q00471_BreakingThroughTheEmeraldSquare.java
@@ -50,7 +50,7 @@ public class Q00471_BreakingThroughTheEmeraldSquare extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00472_ChallengeSteamCorridor/Q00472_ChallengeSteamCorridor.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00472_ChallengeSteamCorridor/Q00472_ChallengeSteamCorridor.java
index 69f96d292c..0d36fed463 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00472_ChallengeSteamCorridor/Q00472_ChallengeSteamCorridor.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00472_ChallengeSteamCorridor/Q00472_ChallengeSteamCorridor.java
@@ -50,7 +50,7 @@ public class Q00472_ChallengeSteamCorridor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00473_InTheCoralGarden/Q00473_InTheCoralGarden.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00473_InTheCoralGarden/Q00473_InTheCoralGarden.java
index 3331b4528f..7489bd9a3f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00473_InTheCoralGarden/Q00473_InTheCoralGarden.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00473_InTheCoralGarden/Q00473_InTheCoralGarden.java
@@ -50,7 +50,7 @@ public class Q00473_InTheCoralGarden extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java
index 8380c30732..d8b8bd9e9e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java
@@ -53,7 +53,7 @@ public class Q00493_KickingOutUnwelcomeGuests extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java
index 0f9eb53194..4084aa0142 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java
@@ -49,7 +49,7 @@ public class Q00494_IncarnationOfGreedZellakaGroup extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java
index ccf3cd1614..e3fe44aa0f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java
@@ -49,7 +49,7 @@ public class Q00495_IncarnationOfJealousyPellineGroup extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java
index 366e0d572d..94df5d6174 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java
@@ -49,7 +49,7 @@ public class Q00496_IncarnationOfGluttonyKaliosGroup extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java
index 008f69dd2f..d1580e694f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java
@@ -49,7 +49,7 @@ public class Q00497_IncarnationOfGreedZellakaSolo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java
index fe6d1060e8..9585452d7d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java
@@ -49,7 +49,7 @@ public class Q00498_IncarnationOfJealousyPellineSolo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java
index 3023aa50c3..3c2e128522 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java
@@ -49,7 +49,7 @@ public class Q00499_IncarnationOfGluttonyKaliosSolo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
index 0bfb256a66..176b40ad56 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
@@ -69,7 +69,7 @@ public class Q00500_BrothersBoundInChains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
index 8facc4a8cd..6476fcc9c3 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
@@ -71,7 +71,7 @@ public class Q00511_AwlUnderFoot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
index eab4647ba2..31444f8866 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
@@ -58,7 +58,7 @@ public class Q00512_BladeUnderFoot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
index 0348f88e9b..f97ce90a8e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
@@ -50,7 +50,7 @@ public class Q00551_OlympiadStarter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
index 1a59edd6b7..b06358dc78 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
@@ -50,7 +50,7 @@ public class Q00553_OlympiadUndefeated extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00561_BasicMissionHarnakUndergroundRuins/Q00561_BasicMissionHarnakUndergroundRuins.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00561_BasicMissionHarnakUndergroundRuins/Q00561_BasicMissionHarnakUndergroundRuins.java
index 53f163366e..cfa2f5bc39 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00561_BasicMissionHarnakUndergroundRuins/Q00561_BasicMissionHarnakUndergroundRuins.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00561_BasicMissionHarnakUndergroundRuins/Q00561_BasicMissionHarnakUndergroundRuins.java
@@ -57,7 +57,7 @@ public class Q00561_BasicMissionHarnakUndergroundRuins extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00564_BasicMissionKartiasLabyrinthSolo/Q00564_BasicMissionKartiasLabyrinthSolo.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00564_BasicMissionKartiasLabyrinthSolo/Q00564_BasicMissionKartiasLabyrinthSolo.java
index 2a676f6085..0872eb3e58 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00564_BasicMissionKartiasLabyrinthSolo/Q00564_BasicMissionKartiasLabyrinthSolo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00564_BasicMissionKartiasLabyrinthSolo/Q00564_BasicMissionKartiasLabyrinthSolo.java
@@ -52,7 +52,7 @@ public class Q00564_BasicMissionKartiasLabyrinthSolo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00567_BasicMissionIsleOfSouls/Q00567_BasicMissionIsleOfSouls.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00567_BasicMissionIsleOfSouls/Q00567_BasicMissionIsleOfSouls.java
index 94e73d544e..c0387e3227 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00567_BasicMissionIsleOfSouls/Q00567_BasicMissionIsleOfSouls.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00567_BasicMissionIsleOfSouls/Q00567_BasicMissionIsleOfSouls.java
@@ -55,7 +55,7 @@ public class Q00567_BasicMissionIsleOfSouls extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00568_SpecialMissionNornilsCave/Q00568_SpecialMissionNornilsCave.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00568_SpecialMissionNornilsCave/Q00568_SpecialMissionNornilsCave.java
index c2dda471f8..f55baea30c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00568_SpecialMissionNornilsCave/Q00568_SpecialMissionNornilsCave.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00568_SpecialMissionNornilsCave/Q00568_SpecialMissionNornilsCave.java
@@ -55,7 +55,7 @@ public class Q00568_SpecialMissionNornilsCave extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00569_BasicMissionSealOfShilen/Q00569_BasicMissionSealOfShilen.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00569_BasicMissionSealOfShilen/Q00569_BasicMissionSealOfShilen.java
index c2cc6249be..9ad439ff60 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00569_BasicMissionSealOfShilen/Q00569_BasicMissionSealOfShilen.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00569_BasicMissionSealOfShilen/Q00569_BasicMissionSealOfShilen.java
@@ -51,7 +51,7 @@ public class Q00569_BasicMissionSealOfShilen extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00570_SpecialMissionKartiasLabyrinthParty/Q00570_SpecialMissionKartiasLabyrinthParty.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00570_SpecialMissionKartiasLabyrinthParty/Q00570_SpecialMissionKartiasLabyrinthParty.java
index 0286f4afed..021dfd2334 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00570_SpecialMissionKartiasLabyrinthParty/Q00570_SpecialMissionKartiasLabyrinthParty.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00570_SpecialMissionKartiasLabyrinthParty/Q00570_SpecialMissionKartiasLabyrinthParty.java
@@ -49,7 +49,7 @@ public class Q00570_SpecialMissionKartiasLabyrinthParty extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00571_SpecialMissionProofOfUnityFieldRaid/Q00571_SpecialMissionProofOfUnityFieldRaid.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00571_SpecialMissionProofOfUnityFieldRaid/Q00571_SpecialMissionProofOfUnityFieldRaid.java
index 8bb700546b..1fa51e0924 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00571_SpecialMissionProofOfUnityFieldRaid/Q00571_SpecialMissionProofOfUnityFieldRaid.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00571_SpecialMissionProofOfUnityFieldRaid/Q00571_SpecialMissionProofOfUnityFieldRaid.java
@@ -74,7 +74,7 @@ public class Q00571_SpecialMissionProofOfUnityFieldRaid extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00572_SpecialMissionProofOfCourageFieldRaid/Q00572_SpecialMissionProofOfCourageFieldRaid.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00572_SpecialMissionProofOfCourageFieldRaid/Q00572_SpecialMissionProofOfCourageFieldRaid.java
index 600a2aba94..c1df40aa33 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00572_SpecialMissionProofOfCourageFieldRaid/Q00572_SpecialMissionProofOfCourageFieldRaid.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00572_SpecialMissionProofOfCourageFieldRaid/Q00572_SpecialMissionProofOfCourageFieldRaid.java
@@ -79,7 +79,7 @@ public class Q00572_SpecialMissionProofOfCourageFieldRaid extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00573_SpecialMissionProofOfStrengthFieldRaid/Q00573_SpecialMissionProofOfStrengthFieldRaid.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00573_SpecialMissionProofOfStrengthFieldRaid/Q00573_SpecialMissionProofOfStrengthFieldRaid.java
index a6f3ebf8bd..d25c7a7581 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00573_SpecialMissionProofOfStrengthFieldRaid/Q00573_SpecialMissionProofOfStrengthFieldRaid.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00573_SpecialMissionProofOfStrengthFieldRaid/Q00573_SpecialMissionProofOfStrengthFieldRaid.java
@@ -79,7 +79,7 @@ public class Q00573_SpecialMissionProofOfStrengthFieldRaid extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00574_SpecialMissionNornilsGarden/Q00574_SpecialMissionNornilsGarden.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00574_SpecialMissionNornilsGarden/Q00574_SpecialMissionNornilsGarden.java
index 7255a1d251..acf06ef049 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00574_SpecialMissionNornilsGarden/Q00574_SpecialMissionNornilsGarden.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00574_SpecialMissionNornilsGarden/Q00574_SpecialMissionNornilsGarden.java
@@ -53,7 +53,7 @@ public class Q00574_SpecialMissionNornilsGarden extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00576_SpecialMissionDefeatSpezion/Q00576_SpecialMissionDefeatSpezion.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00576_SpecialMissionDefeatSpezion/Q00576_SpecialMissionDefeatSpezion.java
index bea102f667..8843dd06d4 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00576_SpecialMissionDefeatSpezion/Q00576_SpecialMissionDefeatSpezion.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00576_SpecialMissionDefeatSpezion/Q00576_SpecialMissionDefeatSpezion.java
@@ -52,7 +52,7 @@ public class Q00576_SpecialMissionDefeatSpezion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00577_BasicMissionSilentValley/Q00577_BasicMissionSilentValley.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00577_BasicMissionSilentValley/Q00577_BasicMissionSilentValley.java
index ab3b4302ec..be7ba57420 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00577_BasicMissionSilentValley/Q00577_BasicMissionSilentValley.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00577_BasicMissionSilentValley/Q00577_BasicMissionSilentValley.java
@@ -52,7 +52,7 @@ public class Q00577_BasicMissionSilentValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00578_BasicMissionCemetery/Q00578_BasicMissionCemetery.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00578_BasicMissionCemetery/Q00578_BasicMissionCemetery.java
index ef91d6c41f..5a6287b527 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00578_BasicMissionCemetery/Q00578_BasicMissionCemetery.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00578_BasicMissionCemetery/Q00578_BasicMissionCemetery.java
@@ -50,7 +50,7 @@ public class Q00578_BasicMissionCemetery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00580_BeyondTheMemories/Q00580_BeyondTheMemories.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00580_BeyondTheMemories/Q00580_BeyondTheMemories.java
index 6a4cbc7cc8..1ffd6c1de5 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00580_BeyondTheMemories/Q00580_BeyondTheMemories.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00580_BeyondTheMemories/Q00580_BeyondTheMemories.java
@@ -87,7 +87,7 @@ public class Q00580_BeyondTheMemories extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00585_CantGoAgainstTheTime/Q00585_CantGoAgainstTheTime.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00585_CantGoAgainstTheTime/Q00585_CantGoAgainstTheTime.java
index 01371768ba..ee46da0fa7 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00585_CantGoAgainstTheTime/Q00585_CantGoAgainstTheTime.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00585_CantGoAgainstTheTime/Q00585_CantGoAgainstTheTime.java
@@ -72,7 +72,7 @@ public class Q00585_CantGoAgainstTheTime extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00586_MutatedCreatures/Q00586_MutatedCreatures.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00586_MutatedCreatures/Q00586_MutatedCreatures.java
index 9d985e8c90..5c793893ad 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00586_MutatedCreatures/Q00586_MutatedCreatures.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00586_MutatedCreatures/Q00586_MutatedCreatures.java
@@ -51,7 +51,7 @@ public class Q00586_MutatedCreatures extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00587_MoreAggressiveOperation/Q00587_MoreAggressiveOperation.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00587_MoreAggressiveOperation/Q00587_MoreAggressiveOperation.java
index fba5c2202c..cca3219ed2 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00587_MoreAggressiveOperation/Q00587_MoreAggressiveOperation.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00587_MoreAggressiveOperation/Q00587_MoreAggressiveOperation.java
@@ -78,7 +78,7 @@ public class Q00587_MoreAggressiveOperation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00588_HeadOnCrash/Q00588_HeadOnCrash.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00588_HeadOnCrash/Q00588_HeadOnCrash.java
index d22846f0ba..7b47113c9b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00588_HeadOnCrash/Q00588_HeadOnCrash.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00588_HeadOnCrash/Q00588_HeadOnCrash.java
@@ -55,7 +55,7 @@ public class Q00588_HeadOnCrash extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00589_ASecretChange/Q00589_ASecretChange.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00589_ASecretChange/Q00589_ASecretChange.java
index df44caee12..9663b63f20 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00589_ASecretChange/Q00589_ASecretChange.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00589_ASecretChange/Q00589_ASecretChange.java
@@ -57,7 +57,7 @@ public class Q00589_ASecretChange extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00590_ToEachTheirOwn/Q00590_ToEachTheirOwn.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00590_ToEachTheirOwn/Q00590_ToEachTheirOwn.java
index a8b256b892..d1e02e881d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00590_ToEachTheirOwn/Q00590_ToEachTheirOwn.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00590_ToEachTheirOwn/Q00590_ToEachTheirOwn.java
@@ -56,7 +56,7 @@ public class Q00590_ToEachTheirOwn extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00593_BasicMissionPaganTemple/Q00593_BasicMissionPaganTemple.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00593_BasicMissionPaganTemple/Q00593_BasicMissionPaganTemple.java
index 3278107bd0..46aa6eb510 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00593_BasicMissionPaganTemple/Q00593_BasicMissionPaganTemple.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00593_BasicMissionPaganTemple/Q00593_BasicMissionPaganTemple.java
@@ -54,7 +54,7 @@ public class Q00593_BasicMissionPaganTemple extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00594_BasicMissionDimensionalRift/Q00594_BasicMissionDimensionalRift.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00594_BasicMissionDimensionalRift/Q00594_BasicMissionDimensionalRift.java
index 75e137696b..388f65b1d4 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00594_BasicMissionDimensionalRift/Q00594_BasicMissionDimensionalRift.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00594_BasicMissionDimensionalRift/Q00594_BasicMissionDimensionalRift.java
@@ -50,7 +50,7 @@ public class Q00594_BasicMissionDimensionalRift extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00595_SpecialMissionRaidersCrossroads/Q00595_SpecialMissionRaidersCrossroads.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00595_SpecialMissionRaidersCrossroads/Q00595_SpecialMissionRaidersCrossroads.java
index d73153e1da..e0487854c6 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00595_SpecialMissionRaidersCrossroads/Q00595_SpecialMissionRaidersCrossroads.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00595_SpecialMissionRaidersCrossroads/Q00595_SpecialMissionRaidersCrossroads.java
@@ -54,7 +54,7 @@ public class Q00595_SpecialMissionRaidersCrossroads extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00596_SpecialMissionDefeatBaylor/Q00596_SpecialMissionDefeatBaylor.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00596_SpecialMissionDefeatBaylor/Q00596_SpecialMissionDefeatBaylor.java
index 2067f39228..a2a948cb7d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00596_SpecialMissionDefeatBaylor/Q00596_SpecialMissionDefeatBaylor.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00596_SpecialMissionDefeatBaylor/Q00596_SpecialMissionDefeatBaylor.java
@@ -53,7 +53,7 @@ public class Q00596_SpecialMissionDefeatBaylor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00599_DemonsAndDimensionalEnergy/Q00599_DemonsAndDimensionalEnergy.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00599_DemonsAndDimensionalEnergy/Q00599_DemonsAndDimensionalEnergy.java
index 75437b19b1..fe490f4774 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00599_DemonsAndDimensionalEnergy/Q00599_DemonsAndDimensionalEnergy.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00599_DemonsAndDimensionalEnergy/Q00599_DemonsAndDimensionalEnergy.java
@@ -70,7 +70,7 @@ public class Q00599_DemonsAndDimensionalEnergy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00600_KeyToTheRefiningProcess/Q00600_KeyToTheRefiningProcess.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00600_KeyToTheRefiningProcess/Q00600_KeyToTheRefiningProcess.java
index e3d1cf0b49..6d61fa327f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00600_KeyToTheRefiningProcess/Q00600_KeyToTheRefiningProcess.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00600_KeyToTheRefiningProcess/Q00600_KeyToTheRefiningProcess.java
@@ -63,7 +63,7 @@ public class Q00600_KeyToTheRefiningProcess extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
index 22d8a3f362..481380c065 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
@@ -65,7 +65,7 @@ public class Q00618_IntoTheFlame extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
index 24dc552a09..554a65b448 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
@@ -108,7 +108,7 @@ public class Q00620_FourGoblets extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = player.getQuestState(getName());
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00665_BasicTrainingForHunterGuildMember/Q00665_BasicTrainingForHunterGuildMember.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00665_BasicTrainingForHunterGuildMember/Q00665_BasicTrainingForHunterGuildMember.java
index d5ea1aeadc..1dd72a5854 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00665_BasicTrainingForHunterGuildMember/Q00665_BasicTrainingForHunterGuildMember.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00665_BasicTrainingForHunterGuildMember/Q00665_BasicTrainingForHunterGuildMember.java
@@ -64,7 +64,7 @@ public class Q00665_BasicTrainingForHunterGuildMember extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00666_HunterGuildMembersKnowledge/Q00666_HunterGuildMembersKnowledge.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00666_HunterGuildMembersKnowledge/Q00666_HunterGuildMembersKnowledge.java
index 10573d3a32..745af98701 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00666_HunterGuildMembersKnowledge/Q00666_HunterGuildMembersKnowledge.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00666_HunterGuildMembersKnowledge/Q00666_HunterGuildMembersKnowledge.java
@@ -96,7 +96,7 @@ public class Q00666_HunterGuildMembersKnowledge extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00668_ABattleWithTheGiants/Q00668_ABattleWithTheGiants.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00668_ABattleWithTheGiants/Q00668_ABattleWithTheGiants.java
index 0115611bea..9a2f5d7c44 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00668_ABattleWithTheGiants/Q00668_ABattleWithTheGiants.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00668_ABattleWithTheGiants/Q00668_ABattleWithTheGiants.java
@@ -58,7 +58,7 @@ public class Q00668_ABattleWithTheGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00669_DesperateFightWithTheDragons/Q00669_DesperateFightWithTheDragons.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00669_DesperateFightWithTheDragons/Q00669_DesperateFightWithTheDragons.java
index a65a880901..5bfd05496d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00669_DesperateFightWithTheDragons/Q00669_DesperateFightWithTheDragons.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00669_DesperateFightWithTheDragons/Q00669_DesperateFightWithTheDragons.java
@@ -64,7 +64,7 @@ public class Q00669_DesperateFightWithTheDragons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00670_DefeatingTheLordOfSeed/Q00670_DefeatingTheLordOfSeed.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00670_DefeatingTheLordOfSeed/Q00670_DefeatingTheLordOfSeed.java
index 7d13e190f7..e8f1153c86 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00670_DefeatingTheLordOfSeed/Q00670_DefeatingTheLordOfSeed.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00670_DefeatingTheLordOfSeed/Q00670_DefeatingTheLordOfSeed.java
@@ -58,7 +58,7 @@ public class Q00670_DefeatingTheLordOfSeed extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00671_PathToFindingThePast/Q00671_PathToFindingThePast.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00671_PathToFindingThePast/Q00671_PathToFindingThePast.java
index bdf1b18f42..b033d03fa8 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00671_PathToFindingThePast/Q00671_PathToFindingThePast.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00671_PathToFindingThePast/Q00671_PathToFindingThePast.java
@@ -69,7 +69,7 @@ public class Q00671_PathToFindingThePast extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00672_ArchenemyEmbryo/Q00672_ArchenemyEmbryo.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00672_ArchenemyEmbryo/Q00672_ArchenemyEmbryo.java
index 596488f105..5b32e1a999 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00672_ArchenemyEmbryo/Q00672_ArchenemyEmbryo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00672_ArchenemyEmbryo/Q00672_ArchenemyEmbryo.java
@@ -55,7 +55,7 @@ public class Q00672_ArchenemyEmbryo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00673_BelethAmbition/Q00673_BelethAmbition.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00673_BelethAmbition/Q00673_BelethAmbition.java
index 997841e0b2..a188d43e4d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00673_BelethAmbition/Q00673_BelethAmbition.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00673_BelethAmbition/Q00673_BelethAmbition.java
@@ -56,7 +56,7 @@ public class Q00673_BelethAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00674_ChangesInTheShadowOfTheMotherTree/Q00674_ChangesInTheShadowOfTheMotherTree.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00674_ChangesInTheShadowOfTheMotherTree/Q00674_ChangesInTheShadowOfTheMotherTree.java
index 2b5d58ddae..0273703923 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00674_ChangesInTheShadowOfTheMotherTree/Q00674_ChangesInTheShadowOfTheMotherTree.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00674_ChangesInTheShadowOfTheMotherTree/Q00674_ChangesInTheShadowOfTheMotherTree.java
@@ -72,7 +72,7 @@ public class Q00674_ChangesInTheShadowOfTheMotherTree extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00675_WhatTheThreadOfThePastShows/Q00675_WhatTheThreadOfThePastShows.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00675_WhatTheThreadOfThePastShows/Q00675_WhatTheThreadOfThePastShows.java
index c6b5ce237a..7762bddd90 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00675_WhatTheThreadOfThePastShows/Q00675_WhatTheThreadOfThePastShows.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00675_WhatTheThreadOfThePastShows/Q00675_WhatTheThreadOfThePastShows.java
@@ -64,7 +64,7 @@ public class Q00675_WhatTheThreadOfThePastShows extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00682_TheStrongInTheClosedSpace/Q00682_TheStrongInTheClosedSpace.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00682_TheStrongInTheClosedSpace/Q00682_TheStrongInTheClosedSpace.java
index cc6df2254a..6e318ceaec 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00682_TheStrongInTheClosedSpace/Q00682_TheStrongInTheClosedSpace.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00682_TheStrongInTheClosedSpace/Q00682_TheStrongInTheClosedSpace.java
@@ -54,7 +54,7 @@ public class Q00682_TheStrongInTheClosedSpace extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
index 0278e46ec2..17895d5c45 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
@@ -69,7 +69,7 @@ public class Q00726_LightWithinTheDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
index da19640964..bd744f7aaa 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
@@ -57,7 +57,7 @@ public class Q00727_HopeWithinTheDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00737_ASwordHiddenInASmile/Q00737_ASwordHiddenInASmile.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00737_ASwordHiddenInASmile/Q00737_ASwordHiddenInASmile.java
index 1033d9d208..4095fdfb2b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00737_ASwordHiddenInASmile/Q00737_ASwordHiddenInASmile.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00737_ASwordHiddenInASmile/Q00737_ASwordHiddenInASmile.java
@@ -61,7 +61,7 @@ public class Q00737_ASwordHiddenInASmile extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00738_DimensionalExplorationOfTheUnworldlyVisitors/Q00738_DimensionalExplorationOfTheUnworldlyVisitors.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00738_DimensionalExplorationOfTheUnworldlyVisitors/Q00738_DimensionalExplorationOfTheUnworldlyVisitors.java
index 0956613cc1..8f63f869cb 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00738_DimensionalExplorationOfTheUnworldlyVisitors/Q00738_DimensionalExplorationOfTheUnworldlyVisitors.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00738_DimensionalExplorationOfTheUnworldlyVisitors/Q00738_DimensionalExplorationOfTheUnworldlyVisitors.java
@@ -72,7 +72,7 @@ public class Q00738_DimensionalExplorationOfTheUnworldlyVisitors extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00743_AtTheAltarOfOblivion/Q00743_AtTheAltarOfOblivion.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00743_AtTheAltarOfOblivion/Q00743_AtTheAltarOfOblivion.java
index 960a737453..8d82ae530f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00743_AtTheAltarOfOblivion/Q00743_AtTheAltarOfOblivion.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00743_AtTheAltarOfOblivion/Q00743_AtTheAltarOfOblivion.java
@@ -82,7 +82,7 @@ public class Q00743_AtTheAltarOfOblivion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java
index 3c5f3d9861..e22b624bc5 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java
@@ -70,7 +70,7 @@ public class Q00752_UncoverTheSecret extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java
index 6f5853054b..935c3a7c37 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java
@@ -78,7 +78,7 @@ public class Q00753_ReactingToACrisis extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00754_AssistingTheRebelForces/Q00754_AssistingTheRebelForces.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00754_AssistingTheRebelForces/Q00754_AssistingTheRebelForces.java
index efd21fd055..fbbb9eb5c6 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00754_AssistingTheRebelForces/Q00754_AssistingTheRebelForces.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00754_AssistingTheRebelForces/Q00754_AssistingTheRebelForces.java
@@ -54,7 +54,7 @@ public class Q00754_AssistingTheRebelForces extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00755_InNeedOfPetras/Q00755_InNeedOfPetras.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00755_InNeedOfPetras/Q00755_InNeedOfPetras.java
index 20aa2199c8..09d9216654 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00755_InNeedOfPetras/Q00755_InNeedOfPetras.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00755_InNeedOfPetras/Q00755_InNeedOfPetras.java
@@ -67,7 +67,7 @@ public class Q00755_InNeedOfPetras extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java
index 40e84f4dd0..9038173a19 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java
@@ -48,7 +48,7 @@ public class Q00756_TopQualityPetra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java
index 1927ac253f..0b6815a166 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java
@@ -71,7 +71,7 @@ public class Q00757_TriolsMovement extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java
index 0578c5952a..c777c72641 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java
@@ -70,7 +70,7 @@ public class Q00758_TheFallenKingsMen extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00759_TheDwarvenNightmareContinues/Q00759_TheDwarvenNightmareContinues.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00759_TheDwarvenNightmareContinues/Q00759_TheDwarvenNightmareContinues.java
index e0db615674..4715b055c5 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00759_TheDwarvenNightmareContinues/Q00759_TheDwarvenNightmareContinues.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00759_TheDwarvenNightmareContinues/Q00759_TheDwarvenNightmareContinues.java
@@ -68,7 +68,7 @@ public class Q00759_TheDwarvenNightmareContinues extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java
index e163658293..33169c48a7 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java
@@ -47,7 +47,7 @@ public class Q00760_BlockTheExit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00773_ToCalmTheFlood/Q00773_ToCalmTheFlood.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00773_ToCalmTheFlood/Q00773_ToCalmTheFlood.java
index 8b4b8fced8..96e992ccea 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00773_ToCalmTheFlood/Q00773_ToCalmTheFlood.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00773_ToCalmTheFlood/Q00773_ToCalmTheFlood.java
@@ -90,7 +90,7 @@ public class Q00773_ToCalmTheFlood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00774_DreamingOfPeace/Q00774_DreamingOfPeace.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00774_DreamingOfPeace/Q00774_DreamingOfPeace.java
index 51271afc55..26216ab6ef 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00774_DreamingOfPeace/Q00774_DreamingOfPeace.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00774_DreamingOfPeace/Q00774_DreamingOfPeace.java
@@ -88,7 +88,7 @@ public class Q00774_DreamingOfPeace extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java
index 47f672d467..0624cc12d3 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java
@@ -74,7 +74,7 @@ public class Q00775_RetrievingTheChaosFragment extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java
index ac2f54fa8d..18b9f67179 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java
@@ -49,7 +49,7 @@ public class Q00776_SlayDarkLordEkimus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java
index dad6a31213..ff385c026f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java
@@ -50,7 +50,7 @@ public class Q00777_SlayDarkLordTiat extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java
index c2266256c4..9cf140a913 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java
@@ -76,7 +76,7 @@ public class Q00778_OperationRoaringFlame extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00779_UtilizeTheDarknessSeedOfDestruction/Q00779_UtilizeTheDarknessSeedOfDestruction.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00779_UtilizeTheDarknessSeedOfDestruction/Q00779_UtilizeTheDarknessSeedOfDestruction.java
index 15fa0b1e53..c6fac96851 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00779_UtilizeTheDarknessSeedOfDestruction/Q00779_UtilizeTheDarknessSeedOfDestruction.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00779_UtilizeTheDarknessSeedOfDestruction/Q00779_UtilizeTheDarknessSeedOfDestruction.java
@@ -72,7 +72,7 @@ public class Q00779_UtilizeTheDarknessSeedOfDestruction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00780_UtilizeTheDarknessSeedOfInfinity/Q00780_UtilizeTheDarknessSeedOfInfinity.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00780_UtilizeTheDarknessSeedOfInfinity/Q00780_UtilizeTheDarknessSeedOfInfinity.java
index a71bdf61dc..3820918c63 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00780_UtilizeTheDarknessSeedOfInfinity/Q00780_UtilizeTheDarknessSeedOfInfinity.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00780_UtilizeTheDarknessSeedOfInfinity/Q00780_UtilizeTheDarknessSeedOfInfinity.java
@@ -61,7 +61,7 @@ public class Q00780_UtilizeTheDarknessSeedOfInfinity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00781_UtilizeTheDarknessSeedOfAnnihilation/Q00781_UtilizeTheDarknessSeedOfAnnihilation.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00781_UtilizeTheDarknessSeedOfAnnihilation/Q00781_UtilizeTheDarknessSeedOfAnnihilation.java
index 190b971f36..d662d9fc6d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00781_UtilizeTheDarknessSeedOfAnnihilation/Q00781_UtilizeTheDarknessSeedOfAnnihilation.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00781_UtilizeTheDarknessSeedOfAnnihilation/Q00781_UtilizeTheDarknessSeedOfAnnihilation.java
@@ -78,7 +78,7 @@ public class Q00781_UtilizeTheDarknessSeedOfAnnihilation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00782_UtilizeTheDarknessSeedOfHellfire/Q00782_UtilizeTheDarknessSeedOfHellfire.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00782_UtilizeTheDarknessSeedOfHellfire/Q00782_UtilizeTheDarknessSeedOfHellfire.java
index 7feaaf443e..3b181f5417 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00782_UtilizeTheDarknessSeedOfHellfire/Q00782_UtilizeTheDarknessSeedOfHellfire.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00782_UtilizeTheDarknessSeedOfHellfire/Q00782_UtilizeTheDarknessSeedOfHellfire.java
@@ -79,7 +79,7 @@ public class Q00782_UtilizeTheDarknessSeedOfHellfire extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java
index 4f56f51841..2bd1819f2d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java
@@ -71,7 +71,7 @@ public class Q00783_VestigeOfTheMagicPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final int chance = getRandom(100);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00790_ObtainingFerinsTrust/Q00790_ObtainingFerinsTrust.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00790_ObtainingFerinsTrust/Q00790_ObtainingFerinsTrust.java
index 7056a05ab3..a12633bddd 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00790_ObtainingFerinsTrust/Q00790_ObtainingFerinsTrust.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00790_ObtainingFerinsTrust/Q00790_ObtainingFerinsTrust.java
@@ -73,7 +73,7 @@ public class Q00790_ObtainingFerinsTrust extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00792_TheSuperionGiants/Q00792_TheSuperionGiants.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00792_TheSuperionGiants/Q00792_TheSuperionGiants.java
index a494fa2d3a..1f8af8f813 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00792_TheSuperionGiants/Q00792_TheSuperionGiants.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00792_TheSuperionGiants/Q00792_TheSuperionGiants.java
@@ -70,7 +70,7 @@ public class Q00792_TheSuperionGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00816_PlansToRepairTheStronghold/Q00816_PlansToRepairTheStronghold.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00816_PlansToRepairTheStronghold/Q00816_PlansToRepairTheStronghold.java
index 0507702506..2427136f91 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00816_PlansToRepairTheStronghold/Q00816_PlansToRepairTheStronghold.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00816_PlansToRepairTheStronghold/Q00816_PlansToRepairTheStronghold.java
@@ -65,7 +65,7 @@ public class Q00816_PlansToRepairTheStronghold extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00823_DisappearedRaceNewFairy/Q00823_DisappearedRaceNewFairy.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00823_DisappearedRaceNewFairy/Q00823_DisappearedRaceNewFairy.java
index cd55044b35..62d5dafe62 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00823_DisappearedRaceNewFairy/Q00823_DisappearedRaceNewFairy.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00823_DisappearedRaceNewFairy/Q00823_DisappearedRaceNewFairy.java
@@ -66,7 +66,7 @@ public class Q00823_DisappearedRaceNewFairy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00824_AttackTheCommandPost/Q00824_AttackTheCommandPost.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00824_AttackTheCommandPost/Q00824_AttackTheCommandPost.java
index db25590de0..c89f2abb8a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00824_AttackTheCommandPost/Q00824_AttackTheCommandPost.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00824_AttackTheCommandPost/Q00824_AttackTheCommandPost.java
@@ -51,7 +51,7 @@ public class Q00824_AttackTheCommandPost extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java
index 33c9979b4a..4f6a1dd284 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java
@@ -68,7 +68,7 @@ public class Q00826_InSearchOfTheSecretWeapon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java
index 8b7399c41e..739655c72f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java
@@ -89,7 +89,7 @@ public class Q00827_EinhasadsOrder extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00828_EvasBlessing/Q00828_EvasBlessing.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00828_EvasBlessing/Q00828_EvasBlessing.java
index 202e0fc3ca..72b34bd5f9 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00828_EvasBlessing/Q00828_EvasBlessing.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00828_EvasBlessing/Q00828_EvasBlessing.java
@@ -95,7 +95,7 @@ public class Q00828_EvasBlessing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00829_MaphrsSalvation/Q00829_MaphrsSalvation.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00829_MaphrsSalvation/Q00829_MaphrsSalvation.java
index 977c610974..457faaa28c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00829_MaphrsSalvation/Q00829_MaphrsSalvation.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00829_MaphrsSalvation/Q00829_MaphrsSalvation.java
@@ -54,7 +54,7 @@ public class Q00829_MaphrsSalvation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00830_TheWayOfTheGiantsPawn/Q00830_TheWayOfTheGiantsPawn.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00830_TheWayOfTheGiantsPawn/Q00830_TheWayOfTheGiantsPawn.java
index 1bac202074..64715ee4c7 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00830_TheWayOfTheGiantsPawn/Q00830_TheWayOfTheGiantsPawn.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00830_TheWayOfTheGiantsPawn/Q00830_TheWayOfTheGiantsPawn.java
@@ -89,7 +89,7 @@ public class Q00830_TheWayOfTheGiantsPawn extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java
index 9584d686bc..cb7bae51ab 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java
@@ -55,7 +55,7 @@ public class Q00831_SayhasScheme extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
index 755ff509f8..42c14d342e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
@@ -65,7 +65,7 @@ public class Q00833_DevilsTreasureTauti extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
index 6448125f2f..d2db3dae19 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
@@ -61,7 +61,7 @@ public class Q00835_PitiableMelisa extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00842_CaptiveDemons/Q00842_CaptiveDemons.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00842_CaptiveDemons/Q00842_CaptiveDemons.java
index 6a3f793adb..7c93c26cf7 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00842_CaptiveDemons/Q00842_CaptiveDemons.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00842_CaptiveDemons/Q00842_CaptiveDemons.java
@@ -67,7 +67,7 @@ public class Q00842_CaptiveDemons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00843_GiantEvolutionControl/Q00843_GiantEvolutionControl.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00843_GiantEvolutionControl/Q00843_GiantEvolutionControl.java
index 17fbceb090..f66b6c4eec 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00843_GiantEvolutionControl/Q00843_GiantEvolutionControl.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00843_GiantEvolutionControl/Q00843_GiantEvolutionControl.java
@@ -80,7 +80,7 @@ public final class Q00843_GiantEvolutionControl extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00844_GiantsTreasure/Q00844_GiantsTreasure.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00844_GiantsTreasure/Q00844_GiantsTreasure.java
index ea0d277f7d..06827de98e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00844_GiantsTreasure/Q00844_GiantsTreasure.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00844_GiantsTreasure/Q00844_GiantsTreasure.java
@@ -63,7 +63,7 @@ public class Q00844_GiantsTreasure extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00845_SabotageTheEmbryoSupplies/Q00845_SabotageTheEmbryoSupplies.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00845_SabotageTheEmbryoSupplies/Q00845_SabotageTheEmbryoSupplies.java
index e4a2ecd1e9..c81c7e73bf 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00845_SabotageTheEmbryoSupplies/Q00845_SabotageTheEmbryoSupplies.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00845_SabotageTheEmbryoSupplies/Q00845_SabotageTheEmbryoSupplies.java
@@ -72,7 +72,7 @@ public class Q00845_SabotageTheEmbryoSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00846_BuildingUpStrength/Q00846_BuildingUpStrength.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00846_BuildingUpStrength/Q00846_BuildingUpStrength.java
index c003dafa91..69c93caa37 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00846_BuildingUpStrength/Q00846_BuildingUpStrength.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00846_BuildingUpStrength/Q00846_BuildingUpStrength.java
@@ -75,7 +75,7 @@ public final class Q00846_BuildingUpStrength extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
index 1140fc7490..2a6c62bb48 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
@@ -58,7 +58,7 @@ public class Q00901_HowLavasaurusesAreMade extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
index 8587c2f741..d15889aad7 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
@@ -55,7 +55,7 @@ public class Q00903_TheCallOfAntharas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
index 79522f8309..73589e1dbb 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
@@ -103,7 +103,7 @@ public class Q00905_RefinedDragonBlood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
index 3f6c9f9a30..4494d2a115 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
@@ -65,7 +65,7 @@ public class Q00906_TheCallOfValakas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00923_ShinedustExtraction/Q00923_ShinedustExtraction.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00923_ShinedustExtraction/Q00923_ShinedustExtraction.java
index 94701276bf..d3f49dca31 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00923_ShinedustExtraction/Q00923_ShinedustExtraction.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00923_ShinedustExtraction/Q00923_ShinedustExtraction.java
@@ -68,7 +68,7 @@ public class Q00923_ShinedustExtraction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00924_GiantOfTheRestorationRoom/Q00924_GiantOfTheRestorationRoom.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00924_GiantOfTheRestorationRoom/Q00924_GiantOfTheRestorationRoom.java
index de9e6695cc..5fe6d77b8b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00924_GiantOfTheRestorationRoom/Q00924_GiantOfTheRestorationRoom.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00924_GiantOfTheRestorationRoom/Q00924_GiantOfTheRestorationRoom.java
@@ -66,7 +66,7 @@ public class Q00924_GiantOfTheRestorationRoom extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java
index 0c68f67f34..9c53c37390 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java
@@ -58,7 +58,7 @@ public class Q00926_30DaySearchOperation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java
index 18391c86e3..a162ef4426 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java
@@ -65,7 +65,7 @@ public class Q00928_100DaySubjugationOperation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00930_DisparagingThePhantoms/Q00930_DisparagingThePhantoms.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00930_DisparagingThePhantoms/Q00930_DisparagingThePhantoms.java
index 28bb494903..755b411c57 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00930_DisparagingThePhantoms/Q00930_DisparagingThePhantoms.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00930_DisparagingThePhantoms/Q00930_DisparagingThePhantoms.java
@@ -80,7 +80,7 @@ public class Q00930_DisparagingThePhantoms extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00931_MemoriesOfTheWind/Q00931_MemoriesOfTheWind.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00931_MemoriesOfTheWind/Q00931_MemoriesOfTheWind.java
index 5f92dba5cd..31ffff4f32 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00931_MemoriesOfTheWind/Q00931_MemoriesOfTheWind.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00931_MemoriesOfTheWind/Q00931_MemoriesOfTheWind.java
@@ -78,7 +78,7 @@ public class Q00931_MemoriesOfTheWind extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00932_SayhasEnergy/Q00932_SayhasEnergy.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00932_SayhasEnergy/Q00932_SayhasEnergy.java
index 374f7566ba..2682626efb 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00932_SayhasEnergy/Q00932_SayhasEnergy.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00932_SayhasEnergy/Q00932_SayhasEnergy.java
@@ -68,7 +68,7 @@ public class Q00932_SayhasEnergy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java
index 784084e18f..3f3674f408 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java
@@ -79,7 +79,7 @@ public class Q00937_ToReviveTheFishingGuild extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java
index fcaea628f2..14766f9216 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java
@@ -73,7 +73,7 @@ public class Q00938_TheFishermansOtherHobby extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00985_AdventureGuildsSpecialRequestLv1/Q00985_AdventureGuildsSpecialRequestLv1.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00985_AdventureGuildsSpecialRequestLv1/Q00985_AdventureGuildsSpecialRequestLv1.java
index ccca802eb7..056ae47d76 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00985_AdventureGuildsSpecialRequestLv1/Q00985_AdventureGuildsSpecialRequestLv1.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00985_AdventureGuildsSpecialRequestLv1/Q00985_AdventureGuildsSpecialRequestLv1.java
@@ -66,7 +66,7 @@ public class Q00985_AdventureGuildsSpecialRequestLv1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
index aea1e23329..adb2982ac1 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
@@ -48,7 +48,7 @@ public class Q10282_ToTheSeedOfAnnihilation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
index e5310632bd..dc9e9a1de4 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
@@ -51,7 +51,7 @@ public class Q10283_RequestOfIceMerchant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java
index c8822c8a8a..fb0cefa677 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java
@@ -54,7 +54,7 @@ public class Q10284_AcquisitionOfDivineSword extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
index a5a7eaace6..d0294d0369 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
@@ -55,7 +55,7 @@ public class Q10285_MeetingSirra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
index b9a00e8388..94f82457bd 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
@@ -56,7 +56,7 @@ public class Q10286_ReunionWithSirra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
index c072297d38..d98cd117bd 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
@@ -50,7 +50,7 @@ public class Q10287_StoryOfThoseLeft extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java
index fbcd6311a7..990366217f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java
@@ -50,7 +50,7 @@ public class Q10297_GrandOpeningComeToOurPub extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java
index 075ada8600..77e10de1fd 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java
@@ -75,7 +75,7 @@ public class Q10303_CrossroadsBetweenLightAndDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10355_BlacksmithsSoul1/Q10355_BlacksmithsSoul1.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10355_BlacksmithsSoul1/Q10355_BlacksmithsSoul1.java
index 16e5c07fbf..28629cd353 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10355_BlacksmithsSoul1/Q10355_BlacksmithsSoul1.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10355_BlacksmithsSoul1/Q10355_BlacksmithsSoul1.java
@@ -73,7 +73,7 @@ public class Q10355_BlacksmithsSoul1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10356_BlacksmithsSoul2/Q10356_BlacksmithsSoul2.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10356_BlacksmithsSoul2/Q10356_BlacksmithsSoul2.java
index 34ddbeb550..92d621ebe8 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10356_BlacksmithsSoul2/Q10356_BlacksmithsSoul2.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10356_BlacksmithsSoul2/Q10356_BlacksmithsSoul2.java
@@ -65,7 +65,7 @@ public class Q10356_BlacksmithsSoul2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10373_ExploringTheDimensionSealingTheDimension/Q10373_ExploringTheDimensionSealingTheDimension.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10373_ExploringTheDimensionSealingTheDimension/Q10373_ExploringTheDimensionSealingTheDimension.java
index 7056e8b72a..425b0c979d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10373_ExploringTheDimensionSealingTheDimension/Q10373_ExploringTheDimensionSealingTheDimension.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10373_ExploringTheDimensionSealingTheDimension/Q10373_ExploringTheDimensionSealingTheDimension.java
@@ -44,7 +44,7 @@ public class Q10373_ExploringTheDimensionSealingTheDimension extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java
index 3fdb1d2625..1a0550ce7a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java
@@ -49,7 +49,7 @@ public class Q10381_ToTheSeedOfHellfire extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java
index 5a50c186ec..97fd290cdb 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java
@@ -61,7 +61,7 @@ public class Q10383_FergasonsOffer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10386_MysteriousJourney/Q10386_MysteriousJourney.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10386_MysteriousJourney/Q10386_MysteriousJourney.java
index 199681b2fa..51a014c8bf 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10386_MysteriousJourney/Q10386_MysteriousJourney.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10386_MysteriousJourney/Q10386_MysteriousJourney.java
@@ -50,7 +50,7 @@ public class Q10386_MysteriousJourney extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10387_SoullessOne/Q10387_SoullessOne.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10387_SoullessOne/Q10387_SoullessOne.java
index 3b4e70d070..90284f0de9 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10387_SoullessOne/Q10387_SoullessOne.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10387_SoullessOne/Q10387_SoullessOne.java
@@ -54,7 +54,7 @@ public class Q10387_SoullessOne extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java
index 174ea1a300..e5a8517a69 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java
@@ -46,7 +46,7 @@ public class Q10388_ConspiracyBehindDoor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java
index 6d60016a06..619cf89fa5 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java
@@ -66,7 +66,7 @@ public class Q10389_TheVoiceOfAuthority extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10418_TheImmortalPirateKing/Q10418_TheImmortalPirateKing.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10418_TheImmortalPirateKing/Q10418_TheImmortalPirateKing.java
index 239ef8a3a7..d6d93746c2 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10418_TheImmortalPirateKing/Q10418_TheImmortalPirateKing.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10418_TheImmortalPirateKing/Q10418_TheImmortalPirateKing.java
@@ -48,7 +48,7 @@ public class Q10418_TheImmortalPirateKing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java
index b8823b8e7a..dc76dc4f94 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java
@@ -88,7 +88,7 @@ public class Q10423_EmbryoStrongholdRaid extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10445_AnImpendingThreat/Q10445_AnImpendingThreat.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10445_AnImpendingThreat/Q10445_AnImpendingThreat.java
index c78d904936..dac215a5b1 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10445_AnImpendingThreat/Q10445_AnImpendingThreat.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10445_AnImpendingThreat/Q10445_AnImpendingThreat.java
@@ -53,7 +53,7 @@ public class Q10445_AnImpendingThreat extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java
index 1f244a23a1..407e7af01d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java
@@ -58,7 +58,7 @@ public class Q10446_HitAndRun extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java
index c49b98c92d..c173bf24b6 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java
@@ -74,7 +74,7 @@ public class Q10447_TimingIsEverything extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10450_ADarkAmbition/Q10450_ADarkAmbition.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10450_ADarkAmbition/Q10450_ADarkAmbition.java
index c3f232b499..8f085a2197 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10450_ADarkAmbition/Q10450_ADarkAmbition.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10450_ADarkAmbition/Q10450_ADarkAmbition.java
@@ -49,7 +49,7 @@ public class Q10450_ADarkAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java
index 133390e3ed..b58a5b6e94 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java
@@ -49,7 +49,7 @@ public class Q10454_FinalEmbryoApostle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java
index b6cec7570e..7268e0de45 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java
@@ -50,7 +50,7 @@ public class Q10455_ElikiasLetter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10457_KefensisIllusion/Q10457_KefensisIllusion.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10457_KefensisIllusion/Q10457_KefensisIllusion.java
index 907cca5e98..32d56eba4b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10457_KefensisIllusion/Q10457_KefensisIllusion.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10457_KefensisIllusion/Q10457_KefensisIllusion.java
@@ -65,7 +65,7 @@ public class Q10457_KefensisIllusion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java
index fc5b941631..11718fe3dc 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java
@@ -54,7 +54,7 @@ public class Q10459_ASickAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
index bacbb7058b..ad79a5980b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
@@ -73,7 +73,7 @@ public class Q10501_ZakenEmbroideredSoulCloak extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (player.getLevel() >= MIN_LEVEL) && event.equals("32612-04.html"))
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
index d1678a7601..38f4514197 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
@@ -73,7 +73,7 @@ public class Q10502_FreyaEmbroideredSoulCloak extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (player.getLevel() >= MIN_LEVEL) && event.equals("32612-04.html"))
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
index 224940ecd9..08aa62d532 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
@@ -74,7 +74,7 @@ public class Q10503_FrintezzaEmbroideredSoulCloak extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (player.getLevel() >= MIN_LEVEL) && event.equals("32612-04.html"))
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10514_NewPathToGlory/Q10514_NewPathToGlory.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10514_NewPathToGlory/Q10514_NewPathToGlory.java
index 030e03101e..ab715147f5 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10514_NewPathToGlory/Q10514_NewPathToGlory.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10514_NewPathToGlory/Q10514_NewPathToGlory.java
@@ -105,7 +105,7 @@ public class Q10514_NewPathToGlory extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10515_NewWayForPride/Q10515_NewWayForPride.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10515_NewWayForPride/Q10515_NewWayForPride.java
index 350f1fcbbf..c47ad9e4ee 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10515_NewWayForPride/Q10515_NewWayForPride.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10515_NewWayForPride/Q10515_NewWayForPride.java
@@ -106,7 +106,7 @@ public class Q10515_NewWayForPride extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10516_UnveiledFafurionTemple/Q10516_UnveiledFafurionTemple.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10516_UnveiledFafurionTemple/Q10516_UnveiledFafurionTemple.java
index 8c57b6c5d4..ba137a8d4b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10516_UnveiledFafurionTemple/Q10516_UnveiledFafurionTemple.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10516_UnveiledFafurionTemple/Q10516_UnveiledFafurionTemple.java
@@ -53,7 +53,7 @@ public final class Q10516_UnveiledFafurionTemple extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10517_FafurionsMinions/Q10517_FafurionsMinions.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10517_FafurionsMinions/Q10517_FafurionsMinions.java
index d0340b79e0..9d538b1c73 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10517_FafurionsMinions/Q10517_FafurionsMinions.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10517_FafurionsMinions/Q10517_FafurionsMinions.java
@@ -83,7 +83,7 @@ public final class Q10517_FafurionsMinions extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10518_SucceedingThePriestess/Q10518_SucceedingThePriestess.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10518_SucceedingThePriestess/Q10518_SucceedingThePriestess.java
index de9b731200..b67086433c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10518_SucceedingThePriestess/Q10518_SucceedingThePriestess.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10518_SucceedingThePriestess/Q10518_SucceedingThePriestess.java
@@ -103,7 +103,7 @@ public final class Q10518_SucceedingThePriestess extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10519_ControllingYourTemper/Q10519_ControllingYourTemper.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10519_ControllingYourTemper/Q10519_ControllingYourTemper.java
index e8c23e42d8..711ca3d248 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10519_ControllingYourTemper/Q10519_ControllingYourTemper.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10519_ControllingYourTemper/Q10519_ControllingYourTemper.java
@@ -67,7 +67,7 @@ public final class Q10519_ControllingYourTemper extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10520_TempleGuardians/Q10520_TempleGuardians.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10520_TempleGuardians/Q10520_TempleGuardians.java
index 66bbbef920..9960251886 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10520_TempleGuardians/Q10520_TempleGuardians.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10520_TempleGuardians/Q10520_TempleGuardians.java
@@ -57,7 +57,7 @@ public final class Q10520_TempleGuardians extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10533_OrfensAmbition/Q10533_OrfensAmbition.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10533_OrfensAmbition/Q10533_OrfensAmbition.java
index 44029ff4b4..9afa05744d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10533_OrfensAmbition/Q10533_OrfensAmbition.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10533_OrfensAmbition/Q10533_OrfensAmbition.java
@@ -54,7 +54,7 @@ public final class Q10533_OrfensAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10537_KamaelDisarray/Q10537_KamaelDisarray.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10537_KamaelDisarray/Q10537_KamaelDisarray.java
index 3f641802c2..63def42cfb 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10537_KamaelDisarray/Q10537_KamaelDisarray.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10537_KamaelDisarray/Q10537_KamaelDisarray.java
@@ -82,7 +82,7 @@ public class Q10537_KamaelDisarray extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10538_GiantsEvolution/Q10538_GiantsEvolution.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10538_GiantsEvolution/Q10538_GiantsEvolution.java
index ec2a84b368..4235aa28f7 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10538_GiantsEvolution/Q10538_GiantsEvolution.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10538_GiantsEvolution/Q10538_GiantsEvolution.java
@@ -60,7 +60,7 @@ public class Q10538_GiantsEvolution extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10539_EnergySupplyCutoffPlan/Q10539_EnergySupplyCutoffPlan.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10539_EnergySupplyCutoffPlan/Q10539_EnergySupplyCutoffPlan.java
index f97a6b1c21..4be23c454e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10539_EnergySupplyCutoffPlan/Q10539_EnergySupplyCutoffPlan.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10539_EnergySupplyCutoffPlan/Q10539_EnergySupplyCutoffPlan.java
@@ -61,7 +61,7 @@ public class Q10539_EnergySupplyCutoffPlan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10540_ThwartingMimirsPlan/Q10540_ThwartingMimirsPlan.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10540_ThwartingMimirsPlan/Q10540_ThwartingMimirsPlan.java
index aa8e864fb4..6462015e4a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10540_ThwartingMimirsPlan/Q10540_ThwartingMimirsPlan.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10540_ThwartingMimirsPlan/Q10540_ThwartingMimirsPlan.java
@@ -49,7 +49,7 @@ public class Q10540_ThwartingMimirsPlan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
index 06dce8cce6..98043cea28 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
@@ -54,7 +54,7 @@ public class Q10566_BestChoice extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10567_SpecialMissionNornilsGarden/Q10567_SpecialMissionNornilsGarden.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10567_SpecialMissionNornilsGarden/Q10567_SpecialMissionNornilsGarden.java
index 6550a4d03e..a1f7ff00f3 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10567_SpecialMissionNornilsGarden/Q10567_SpecialMissionNornilsGarden.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10567_SpecialMissionNornilsGarden/Q10567_SpecialMissionNornilsGarden.java
@@ -54,7 +54,7 @@ public class Q10567_SpecialMissionNornilsGarden extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10568_KamaelsTechnologicalAdvancement/Q10568_KamaelsTechnologicalAdvancement.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10568_KamaelsTechnologicalAdvancement/Q10568_KamaelsTechnologicalAdvancement.java
index ce6037f64c..02b831dc03 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10568_KamaelsTechnologicalAdvancement/Q10568_KamaelsTechnologicalAdvancement.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10568_KamaelsTechnologicalAdvancement/Q10568_KamaelsTechnologicalAdvancement.java
@@ -64,7 +64,7 @@ public class Q10568_KamaelsTechnologicalAdvancement extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10569_DeclarationOfWar/Q10569_DeclarationOfWar.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10569_DeclarationOfWar/Q10569_DeclarationOfWar.java
index 947ea94aeb..4bb0999643 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10569_DeclarationOfWar/Q10569_DeclarationOfWar.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10569_DeclarationOfWar/Q10569_DeclarationOfWar.java
@@ -82,7 +82,7 @@ public class Q10569_DeclarationOfWar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10571_StrategicReconciliation/Q10571_StrategicReconciliation.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10571_StrategicReconciliation/Q10571_StrategicReconciliation.java
index 19234b84e3..f913993474 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10571_StrategicReconciliation/Q10571_StrategicReconciliation.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10571_StrategicReconciliation/Q10571_StrategicReconciliation.java
@@ -68,7 +68,7 @@ public class Q10571_StrategicReconciliation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java
index d47e535813..6ee4c52622 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java
@@ -74,7 +74,7 @@ public class Q10575_LetsGoFishing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java
index fbe765e74c..0e131f0668 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java
@@ -62,7 +62,7 @@ public class Q10576_GlitteringWeapons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java
index 1e62f333cb..546829376d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java
@@ -63,7 +63,7 @@ public class Q10577_TemperARustingBlade extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java
index 77b8eb101c..19bc9449dd 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java
@@ -63,7 +63,7 @@ public class Q10578_TheSoulOfASword extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java
index fc3a65c076..d7dbc2a6cb 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java
@@ -67,7 +67,7 @@ public class Q10579_ContainingTheAttributePower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/Q10589_WhereFatesIntersect.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/Q10589_WhereFatesIntersect.java
index c703967a97..610d53b61f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/Q10589_WhereFatesIntersect.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/Q10589_WhereFatesIntersect.java
@@ -79,7 +79,7 @@ public class Q10589_WhereFatesIntersect extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10590_ReawakenedFate/Q10590_ReawakenedFate.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10590_ReawakenedFate/Q10590_ReawakenedFate.java
index e62d84de21..87f72a3eb8 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10590_ReawakenedFate/Q10590_ReawakenedFate.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10590_ReawakenedFate/Q10590_ReawakenedFate.java
@@ -78,7 +78,7 @@ public class Q10590_ReawakenedFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java
index 8174028e92..60808831c6 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java
@@ -88,7 +88,7 @@ public class Q10591_NobleMaterial extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10594_FergasonsScheme/Q10594_FergasonsScheme.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10594_FergasonsScheme/Q10594_FergasonsScheme.java
index 5c64dfa8cf..a897c26670 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10594_FergasonsScheme/Q10594_FergasonsScheme.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10594_FergasonsScheme/Q10594_FergasonsScheme.java
@@ -81,7 +81,7 @@ public final class Q10594_FergasonsScheme extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10597_EscapeToTheShadowOfTheMotherTree/Q10597_EscapeToTheShadowOfTheMotherTree.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10597_EscapeToTheShadowOfTheMotherTree/Q10597_EscapeToTheShadowOfTheMotherTree.java
index cf0beab6c6..287e636fb4 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10597_EscapeToTheShadowOfTheMotherTree/Q10597_EscapeToTheShadowOfTheMotherTree.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10597_EscapeToTheShadowOfTheMotherTree/Q10597_EscapeToTheShadowOfTheMotherTree.java
@@ -78,7 +78,7 @@ public class Q10597_EscapeToTheShadowOfTheMotherTree extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10598_WithAllYourMight/Q10598_WithAllYourMight.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10598_WithAllYourMight/Q10598_WithAllYourMight.java
index 0830015b97..11d8243e30 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10598_WithAllYourMight/Q10598_WithAllYourMight.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10598_WithAllYourMight/Q10598_WithAllYourMight.java
@@ -79,7 +79,7 @@ public class Q10598_WithAllYourMight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10599_ThreadOfFateHangingOnTheMotherTree/Q10599_ThreadOfFateHangingOnTheMotherTree.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10599_ThreadOfFateHangingOnTheMotherTree/Q10599_ThreadOfFateHangingOnTheMotherTree.java
index b87a0c021d..02d436c330 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10599_ThreadOfFateHangingOnTheMotherTree/Q10599_ThreadOfFateHangingOnTheMotherTree.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10599_ThreadOfFateHangingOnTheMotherTree/Q10599_ThreadOfFateHangingOnTheMotherTree.java
@@ -78,7 +78,7 @@ public class Q10599_ThreadOfFateHangingOnTheMotherTree extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/Q10658_MakkumInTheDimension.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/Q10658_MakkumInTheDimension.java
index 4345dfeba7..1f1ee2e21d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/Q10658_MakkumInTheDimension.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10658_MakkumInTheDimension/Q10658_MakkumInTheDimension.java
@@ -50,7 +50,7 @@ public class Q10658_MakkumInTheDimension extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java
index 593c0d4936..e2bb80f5e5 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java
@@ -46,7 +46,7 @@ public class Q10701_TheRoadToDestruction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java
index 1ede0c4ba5..ba1153cd88 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java
@@ -46,7 +46,7 @@ public class Q10702_TheRoadToInfinity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10748_MysteriousSuggestion1/Q10748_MysteriousSuggestion1.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10748_MysteriousSuggestion1/Q10748_MysteriousSuggestion1.java
index bf24739d4a..1db27a83de 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10748_MysteriousSuggestion1/Q10748_MysteriousSuggestion1.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10748_MysteriousSuggestion1/Q10748_MysteriousSuggestion1.java
@@ -54,7 +54,7 @@ public final class Q10748_MysteriousSuggestion1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10749_MysteriousSuggestion2/Q10749_MysteriousSuggestion2.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10749_MysteriousSuggestion2/Q10749_MysteriousSuggestion2.java
index 2e1b4f7932..fe683bb978 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10749_MysteriousSuggestion2/Q10749_MysteriousSuggestion2.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10749_MysteriousSuggestion2/Q10749_MysteriousSuggestion2.java
@@ -54,7 +54,7 @@ public final class Q10749_MysteriousSuggestion2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
index b1dca4d5b3..15fc371c1a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
@@ -55,7 +55,7 @@ public class Q10801_TheDimensionalWarpPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
index 1339720830..1b0c8d74d0 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
@@ -56,7 +56,7 @@ public class Q10802_TheDimensionalWarpPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
index 117f5cc53e..4cae513e93 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
@@ -57,7 +57,7 @@ public class Q10803_TheDimensionalWarpPart3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
index 124823783a..f16e276a8f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
@@ -57,7 +57,7 @@ public class Q10804_TheDimensionalWarpPart4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
index a6796e0c63..b80b2b6ae5 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
@@ -57,7 +57,7 @@ public class Q10805_TheDimensionalWarpPart5 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
index d6ecba6b8e..5a8d67d930 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
@@ -56,7 +56,7 @@ public class Q10806_TheDimensionalWarpPart6 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
index 12462309a1..393bbe074c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
@@ -56,7 +56,7 @@ public class Q10807_TheDimensionalWarpPart7 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
index 7d5ba5aa23..48d283830c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
@@ -56,7 +56,7 @@ public class Q10811_ExaltedOneWhoFacesTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java
index d213b06ea2..d5f92b57d9 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10812_FacingSadness/Q10812_FacingSadness.java
@@ -114,7 +114,7 @@ public class Q10812_FacingSadness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10813_ForGlory/Q10813_ForGlory.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10813_ForGlory/Q10813_ForGlory.java
index c5a8547e08..15e3fbf1c9 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10813_ForGlory/Q10813_ForGlory.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10813_ForGlory/Q10813_ForGlory.java
@@ -59,7 +59,7 @@ public class Q10813_ForGlory extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java
index c6aa77d256..532a695e1c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java
@@ -75,7 +75,7 @@ public class Q10814_BefittingOfTheStatus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java
index 5d37c51ef2..c486325f62 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java
@@ -66,7 +66,7 @@ public class Q10815_StepUp extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
index fdbdca62a6..e00434acbe 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
@@ -57,7 +57,7 @@ public class Q10817_ExaltedOneWhoOvercomesTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java
index fbdf1516c2..0f2f9e9a26 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java
@@ -106,7 +106,7 @@ public class Q10818_ConfrontingAGiantMonster extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10819_ForHonor/Q10819_ForHonor.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10819_ForHonor/Q10819_ForHonor.java
index fd31002053..6876665051 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10819_ForHonor/Q10819_ForHonor.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10819_ForHonor/Q10819_ForHonor.java
@@ -63,7 +63,7 @@ public class Q10819_ForHonor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10820_RelationshipsBefittingOfTheStatus/Q10820_RelationshipsBefittingOfTheStatus.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10820_RelationshipsBefittingOfTheStatus/Q10820_RelationshipsBefittingOfTheStatus.java
index d23b38f64a..126444e4a6 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10820_RelationshipsBefittingOfTheStatus/Q10820_RelationshipsBefittingOfTheStatus.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10820_RelationshipsBefittingOfTheStatus/Q10820_RelationshipsBefittingOfTheStatus.java
@@ -58,7 +58,7 @@ public class Q10820_RelationshipsBefittingOfTheStatus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10821_HelpingOthers/Q10821_HelpingOthers.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10821_HelpingOthers/Q10821_HelpingOthers.java
index eaff627843..e11c2fec79 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10821_HelpingOthers/Q10821_HelpingOthers.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10821_HelpingOthers/Q10821_HelpingOthers.java
@@ -67,7 +67,7 @@ public class Q10821_HelpingOthers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
index 6bf1ee6a4e..a795ecb975 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
@@ -59,7 +59,7 @@ public class Q10823_ExaltedOneWhoShattersTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java
index 55416c7d8d..4241d6b6c2 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10824_ConfrontingTheGreatestDanger/Q10824_ConfrontingTheGreatestDanger.java
@@ -123,7 +123,7 @@ public class Q10824_ConfrontingTheGreatestDanger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java
index 6940d15827..7a22af40e1 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java
@@ -75,7 +75,7 @@ public class Q10825_ForVictory extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10826_LuckBefittingOfTheStatus/Q10826_LuckBefittingOfTheStatus.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10826_LuckBefittingOfTheStatus/Q10826_LuckBefittingOfTheStatus.java
index 3ce9e62843..a74f6b22e4 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10826_LuckBefittingOfTheStatus/Q10826_LuckBefittingOfTheStatus.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10826_LuckBefittingOfTheStatus/Q10826_LuckBefittingOfTheStatus.java
@@ -76,7 +76,7 @@ public class Q10826_LuckBefittingOfTheStatus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10827_StepUpToLead/Q10827_StepUpToLead.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10827_StepUpToLead/Q10827_StepUpToLead.java
index fb267e9fb1..4cf6abbe8a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10827_StepUpToLead/Q10827_StepUpToLead.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10827_StepUpToLead/Q10827_StepUpToLead.java
@@ -59,7 +59,7 @@ public class Q10827_StepUpToLead extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10829_InSearchOfTheCause/Q10829_InSearchOfTheCause.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10829_InSearchOfTheCause/Q10829_InSearchOfTheCause.java
index 8f4b8ea015..8d961007e0 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10829_InSearchOfTheCause/Q10829_InSearchOfTheCause.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10829_InSearchOfTheCause/Q10829_InSearchOfTheCause.java
@@ -49,7 +49,7 @@ public class Q10829_InSearchOfTheCause extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/Q10830_TheLostGardenOfSpirits.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/Q10830_TheLostGardenOfSpirits.java
index ecff54a025..d9bb896baa 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/Q10830_TheLostGardenOfSpirits.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/Q10830_TheLostGardenOfSpirits.java
@@ -65,7 +65,7 @@ public class Q10830_TheLostGardenOfSpirits extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10831_UnbelievableSight/Q10831_UnbelievableSight.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10831_UnbelievableSight/Q10831_UnbelievableSight.java
index 2e0774278f..76ad1d387f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10831_UnbelievableSight/Q10831_UnbelievableSight.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10831_UnbelievableSight/Q10831_UnbelievableSight.java
@@ -64,7 +64,7 @@ public class Q10831_UnbelievableSight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10832_EnergyOfSadnessAndAnger/Q10832_EnergyOfSadnessAndAnger.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10832_EnergyOfSadnessAndAnger/Q10832_EnergyOfSadnessAndAnger.java
index c3ba629f61..69125c3c8e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10832_EnergyOfSadnessAndAnger/Q10832_EnergyOfSadnessAndAnger.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10832_EnergyOfSadnessAndAnger/Q10832_EnergyOfSadnessAndAnger.java
@@ -79,7 +79,7 @@ public class Q10832_EnergyOfSadnessAndAnger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10833_PutTheQueenOfSpiritsToSleep/Q10833_PutTheQueenOfSpiritsToSleep.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10833_PutTheQueenOfSpiritsToSleep/Q10833_PutTheQueenOfSpiritsToSleep.java
index f139198949..0072e5d723 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10833_PutTheQueenOfSpiritsToSleep/Q10833_PutTheQueenOfSpiritsToSleep.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10833_PutTheQueenOfSpiritsToSleep/Q10833_PutTheQueenOfSpiritsToSleep.java
@@ -56,7 +56,7 @@ public class Q10833_PutTheQueenOfSpiritsToSleep extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10836_DisappearedClanMember/Q10836_DisappearedClanMember.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10836_DisappearedClanMember/Q10836_DisappearedClanMember.java
index 3b3f852c70..3230d13891 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10836_DisappearedClanMember/Q10836_DisappearedClanMember.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10836_DisappearedClanMember/Q10836_DisappearedClanMember.java
@@ -59,7 +59,7 @@ public class Q10836_DisappearedClanMember extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10837_LookingForTheBlackbirdClanMember/Q10837_LookingForTheBlackbirdClanMember.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10837_LookingForTheBlackbirdClanMember/Q10837_LookingForTheBlackbirdClanMember.java
index 217cabf9fb..a83cf4e3fa 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10837_LookingForTheBlackbirdClanMember/Q10837_LookingForTheBlackbirdClanMember.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10837_LookingForTheBlackbirdClanMember/Q10837_LookingForTheBlackbirdClanMember.java
@@ -54,7 +54,7 @@ public class Q10837_LookingForTheBlackbirdClanMember extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java
index 2ef2a3e32e..6b0de70720 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java
@@ -64,7 +64,7 @@ public class Q10838_TheReasonForNotBeingAbleToGetOut extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java
index 248d9275e5..c4ba15bb8f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java
@@ -61,7 +61,7 @@ public class Q10839_BlackbirdsNameValue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java
index 218f86f996..1a12c524a9 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java
@@ -63,7 +63,7 @@ public class Q10840_TimeToRecover extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10843_AnomalyInTheEnchantedValley/Q10843_AnomalyInTheEnchantedValley.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10843_AnomalyInTheEnchantedValley/Q10843_AnomalyInTheEnchantedValley.java
index e1712c2ba9..ae707e925f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10843_AnomalyInTheEnchantedValley/Q10843_AnomalyInTheEnchantedValley.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10843_AnomalyInTheEnchantedValley/Q10843_AnomalyInTheEnchantedValley.java
@@ -48,7 +48,7 @@ public class Q10843_AnomalyInTheEnchantedValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10844_BloodyBattleSeizingSupplies/Q10844_BloodyBattleSeizingSupplies.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10844_BloodyBattleSeizingSupplies/Q10844_BloodyBattleSeizingSupplies.java
index 3a18492bfa..95e9f265f1 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10844_BloodyBattleSeizingSupplies/Q10844_BloodyBattleSeizingSupplies.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10844_BloodyBattleSeizingSupplies/Q10844_BloodyBattleSeizingSupplies.java
@@ -56,7 +56,7 @@ public class Q10844_BloodyBattleSeizingSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10845_BloodyBattleRescueTheSmiths/Q10845_BloodyBattleRescueTheSmiths.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10845_BloodyBattleRescueTheSmiths/Q10845_BloodyBattleRescueTheSmiths.java
index 262fbdc4b5..632574f511 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10845_BloodyBattleRescueTheSmiths/Q10845_BloodyBattleRescueTheSmiths.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10845_BloodyBattleRescueTheSmiths/Q10845_BloodyBattleRescueTheSmiths.java
@@ -62,7 +62,7 @@ public final class Q10845_BloodyBattleRescueTheSmiths extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = event;
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10846_BloodyBattleMeetingTheCommander/Q10846_BloodyBattleMeetingTheCommander.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10846_BloodyBattleMeetingTheCommander/Q10846_BloodyBattleMeetingTheCommander.java
index 6a229188da..e3d0e59e43 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10846_BloodyBattleMeetingTheCommander/Q10846_BloodyBattleMeetingTheCommander.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10846_BloodyBattleMeetingTheCommander/Q10846_BloodyBattleMeetingTheCommander.java
@@ -53,7 +53,7 @@ public class Q10846_BloodyBattleMeetingTheCommander extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10848_TrialsBeforeTheBattle/Q10848_TrialsBeforeTheBattle.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10848_TrialsBeforeTheBattle/Q10848_TrialsBeforeTheBattle.java
index 868ecb9bdc..cad927beb2 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10848_TrialsBeforeTheBattle/Q10848_TrialsBeforeTheBattle.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10848_TrialsBeforeTheBattle/Q10848_TrialsBeforeTheBattle.java
@@ -58,7 +58,7 @@ public final class Q10848_TrialsBeforeTheBattle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10849_TrialsForAdaptation/Q10849_TrialsForAdaptation.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10849_TrialsForAdaptation/Q10849_TrialsForAdaptation.java
index 8f77ff4caf..437e5c9a8e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10849_TrialsForAdaptation/Q10849_TrialsForAdaptation.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10849_TrialsForAdaptation/Q10849_TrialsForAdaptation.java
@@ -76,7 +76,7 @@ public class Q10849_TrialsForAdaptation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10851_ElvenBotany/Q10851_ElvenBotany.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10851_ElvenBotany/Q10851_ElvenBotany.java
index d22f5130b5..e74becd0de 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10851_ElvenBotany/Q10851_ElvenBotany.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10851_ElvenBotany/Q10851_ElvenBotany.java
@@ -58,7 +58,7 @@ public class Q10851_ElvenBotany extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10852_TheMotherTreeRevivalProject/Q10852_TheMotherTreeRevivalProject.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10852_TheMotherTreeRevivalProject/Q10852_TheMotherTreeRevivalProject.java
index 650f2a8248..ea67637b49 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10852_TheMotherTreeRevivalProject/Q10852_TheMotherTreeRevivalProject.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10852_TheMotherTreeRevivalProject/Q10852_TheMotherTreeRevivalProject.java
@@ -82,7 +82,7 @@ public class Q10852_TheMotherTreeRevivalProject extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10853_ToWeakenTheGiants/Q10853_ToWeakenTheGiants.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10853_ToWeakenTheGiants/Q10853_ToWeakenTheGiants.java
index d631d47348..70eddc1c55 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10853_ToWeakenTheGiants/Q10853_ToWeakenTheGiants.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10853_ToWeakenTheGiants/Q10853_ToWeakenTheGiants.java
@@ -60,7 +60,7 @@ public final class Q10853_ToWeakenTheGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10854_ToSeizeTheFortress/Q10854_ToSeizeTheFortress.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10854_ToSeizeTheFortress/Q10854_ToSeizeTheFortress.java
index 0f131cd3d9..dbdc97fc8b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10854_ToSeizeTheFortress/Q10854_ToSeizeTheFortress.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10854_ToSeizeTheFortress/Q10854_ToSeizeTheFortress.java
@@ -77,7 +77,7 @@ public final class Q10854_ToSeizeTheFortress extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = event;
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10856_SuperionAppears/Q10856_SuperionAppears.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10856_SuperionAppears/Q10856_SuperionAppears.java
index 6beea62bcf..37c5a21afe 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10856_SuperionAppears/Q10856_SuperionAppears.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10856_SuperionAppears/Q10856_SuperionAppears.java
@@ -45,7 +45,7 @@ public class Q10856_SuperionAppears extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10857_SecretTeleport/Q10857_SecretTeleport.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10857_SecretTeleport/Q10857_SecretTeleport.java
index 80fce78d5e..8db2ad22a1 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10857_SecretTeleport/Q10857_SecretTeleport.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10857_SecretTeleport/Q10857_SecretTeleport.java
@@ -69,7 +69,7 @@ public class Q10857_SecretTeleport extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
index fd0b915382..322ef56171 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
@@ -57,7 +57,7 @@ public class Q10873_ExaltedReachingAnotherLevel extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10874_AgainstTheNewEnemy/Q10874_AgainstTheNewEnemy.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10874_AgainstTheNewEnemy/Q10874_AgainstTheNewEnemy.java
index 89d8e08da5..3e6b662f71 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10874_AgainstTheNewEnemy/Q10874_AgainstTheNewEnemy.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10874_AgainstTheNewEnemy/Q10874_AgainstTheNewEnemy.java
@@ -103,7 +103,7 @@ public class Q10874_AgainstTheNewEnemy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10875_ForReputation/Q10875_ForReputation.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10875_ForReputation/Q10875_ForReputation.java
index f0824ac680..907d918c2f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10875_ForReputation/Q10875_ForReputation.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10875_ForReputation/Q10875_ForReputation.java
@@ -54,7 +54,7 @@ public class Q10875_ForReputation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10876_LeadersGrace/Q10876_LeadersGrace.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10876_LeadersGrace/Q10876_LeadersGrace.java
index e50d0c3e5a..2a430bd3aa 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10876_LeadersGrace/Q10876_LeadersGrace.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10876_LeadersGrace/Q10876_LeadersGrace.java
@@ -56,7 +56,7 @@ public class Q10876_LeadersGrace extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10877_BreakThroughCrisis/Q10877_BreakThroughCrisis.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10877_BreakThroughCrisis/Q10877_BreakThroughCrisis.java
index 8f0c4a3231..929436212f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10877_BreakThroughCrisis/Q10877_BreakThroughCrisis.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10877_BreakThroughCrisis/Q10877_BreakThroughCrisis.java
@@ -59,7 +59,7 @@ public class Q10877_BreakThroughCrisis extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java
index 661e774d30..a4f23fdc7d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java
@@ -57,7 +57,7 @@ public class Q10879_ExaltedGuideToPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10880_TheLastOneStanding/Q10880_TheLastOneStanding.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10880_TheLastOneStanding/Q10880_TheLastOneStanding.java
index 37bd832104..9abec1a125 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10880_TheLastOneStanding/Q10880_TheLastOneStanding.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10880_TheLastOneStanding/Q10880_TheLastOneStanding.java
@@ -126,7 +126,7 @@ public class Q10880_TheLastOneStanding extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10881_ForThePride/Q10881_ForThePride.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10881_ForThePride/Q10881_ForThePride.java
index 60f565fe71..c3ccdaa708 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10881_ForThePride/Q10881_ForThePride.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10881_ForThePride/Q10881_ForThePride.java
@@ -56,7 +56,7 @@ public class Q10881_ForThePride extends Quest
 	private static final int MIN_LEVEL = 104;
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10882_VictoryCollection/Q10882_VictoryCollection.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10882_VictoryCollection/Q10882_VictoryCollection.java
index 99b1db2c84..112785ca94 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10882_VictoryCollection/Q10882_VictoryCollection.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10882_VictoryCollection/Q10882_VictoryCollection.java
@@ -77,7 +77,7 @@ public class Q10882_VictoryCollection extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10883_ImmortalHonor/Q10883_ImmortalHonor.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10883_ImmortalHonor/Q10883_ImmortalHonor.java
index ba80484f13..3bb1ae6dd2 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10883_ImmortalHonor/Q10883_ImmortalHonor.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10883_ImmortalHonor/Q10883_ImmortalHonor.java
@@ -57,7 +57,7 @@ public class Q10883_ImmortalHonor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10891_AtANewPlace/Q10891_AtANewPlace.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10891_AtANewPlace/Q10891_AtANewPlace.java
index e5e2b2365f..34a9d6cbfa 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10891_AtANewPlace/Q10891_AtANewPlace.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10891_AtANewPlace/Q10891_AtANewPlace.java
@@ -49,7 +49,7 @@ public class Q10891_AtANewPlace extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10892_RevengeOneStepAtATime/Q10892_RevengeOneStepAtATime.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10892_RevengeOneStepAtATime/Q10892_RevengeOneStepAtATime.java
index ba10e4624a..88fa2da9dd 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10892_RevengeOneStepAtATime/Q10892_RevengeOneStepAtATime.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10892_RevengeOneStepAtATime/Q10892_RevengeOneStepAtATime.java
@@ -82,7 +82,7 @@ public class Q10892_RevengeOneStepAtATime extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10896_VisitTheAdventureGuild/Q10896_VisitTheAdventureGuild.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10896_VisitTheAdventureGuild/Q10896_VisitTheAdventureGuild.java
index 6d96922591..e737233cb7 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10896_VisitTheAdventureGuild/Q10896_VisitTheAdventureGuild.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10896_VisitTheAdventureGuild/Q10896_VisitTheAdventureGuild.java
@@ -44,7 +44,7 @@ public class Q10896_VisitTheAdventureGuild extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10897_ShowYourAbility/Q10897_ShowYourAbility.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10897_ShowYourAbility/Q10897_ShowYourAbility.java
index b6ce38cf57..c544be0f57 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10897_ShowYourAbility/Q10897_ShowYourAbility.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10897_ShowYourAbility/Q10897_ShowYourAbility.java
@@ -47,7 +47,7 @@ public class Q10897_ShowYourAbility extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10898_TowardAGoal/Q10898_TowardAGoal.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10898_TowardAGoal/Q10898_TowardAGoal.java
index b3c22d2165..90482f8750 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10898_TowardAGoal/Q10898_TowardAGoal.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10898_TowardAGoal/Q10898_TowardAGoal.java
@@ -47,7 +47,7 @@ public class Q10898_TowardAGoal extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10899_VeteranAdventurer/Q10899_VeteranAdventurer.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10899_VeteranAdventurer/Q10899_VeteranAdventurer.java
index ab86f8923f..c9de61ff18 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10899_VeteranAdventurer/Q10899_VeteranAdventurer.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10899_VeteranAdventurer/Q10899_VeteranAdventurer.java
@@ -47,7 +47,7 @@ public class Q10899_VeteranAdventurer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10900_PathToStrength/Q10900_PathToStrength.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10900_PathToStrength/Q10900_PathToStrength.java
index 4803fe537b..24ac444c19 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10900_PathToStrength/Q10900_PathToStrength.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10900_PathToStrength/Q10900_PathToStrength.java
@@ -47,7 +47,7 @@ public class Q10900_PathToStrength extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10901_AModelAdventurer/Q10901_AModelAdventurer.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10901_AModelAdventurer/Q10901_AModelAdventurer.java
index 3c2d39c272..cc4b227f0a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10901_AModelAdventurer/Q10901_AModelAdventurer.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10901_AModelAdventurer/Q10901_AModelAdventurer.java
@@ -49,7 +49,7 @@ public class Q10901_AModelAdventurer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
index 53955bcd9a..ddb2e8273b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
@@ -94,7 +94,7 @@ public class Q11025_PathOfDestinyProving extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
index ee8170292f..6baa7df099 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
@@ -62,7 +62,7 @@ public class Q11026_PathOfDestinyConviction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
index fb742d8169..dbb8550ab3 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
@@ -89,7 +89,7 @@ public class Q11027_PathOfDestinyOvercome extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11031_TrainingBeginsNow/Q11031_TrainingBeginsNow.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11031_TrainingBeginsNow/Q11031_TrainingBeginsNow.java
index b8cc5b70b0..ba5df833d5 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11031_TrainingBeginsNow/Q11031_TrainingBeginsNow.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11031_TrainingBeginsNow/Q11031_TrainingBeginsNow.java
@@ -74,7 +74,7 @@ public class Q11031_TrainingBeginsNow extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11032_CurseOfUndying/Q11032_CurseOfUndying.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11032_CurseOfUndying/Q11032_CurseOfUndying.java
index d9031ebad9..5761b940f8 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11032_CurseOfUndying/Q11032_CurseOfUndying.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11032_CurseOfUndying/Q11032_CurseOfUndying.java
@@ -77,7 +77,7 @@ public class Q11032_CurseOfUndying extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11033_AntidoteIngredients/Q11033_AntidoteIngredients.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11033_AntidoteIngredients/Q11033_AntidoteIngredients.java
index 6a8e91cc03..ca5fa06e35 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11033_AntidoteIngredients/Q11033_AntidoteIngredients.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11033_AntidoteIngredients/Q11033_AntidoteIngredients.java
@@ -62,7 +62,7 @@ public class Q11033_AntidoteIngredients extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11034_ResurrectedOne/Q11034_ResurrectedOne.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11034_ResurrectedOne/Q11034_ResurrectedOne.java
index c78a83fc11..98f1624fc5 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11034_ResurrectedOne/Q11034_ResurrectedOne.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11034_ResurrectedOne/Q11034_ResurrectedOne.java
@@ -68,7 +68,7 @@ public class Q11034_ResurrectedOne extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11035_DeathlyMischief/Q11035_DeathlyMischief.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11035_DeathlyMischief/Q11035_DeathlyMischief.java
index eec00440a5..38022a2541 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11035_DeathlyMischief/Q11035_DeathlyMischief.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11035_DeathlyMischief/Q11035_DeathlyMischief.java
@@ -62,7 +62,7 @@ public class Q11035_DeathlyMischief extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/Q11036_ChangedSpirits.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/Q11036_ChangedSpirits.java
index a89d911bbc..319e87fb47 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/Q11036_ChangedSpirits.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/Q11036_ChangedSpirits.java
@@ -69,7 +69,7 @@ public class Q11036_ChangedSpirits extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/Q11037_WhyAreTheRatelHere.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/Q11037_WhyAreTheRatelHere.java
index d353d7ed44..0233c2bd51 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/Q11037_WhyAreTheRatelHere.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/Q11037_WhyAreTheRatelHere.java
@@ -67,7 +67,7 @@ public class Q11037_WhyAreTheRatelHere extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11038_GrowlersTurnedViolent/Q11038_GrowlersTurnedViolent.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11038_GrowlersTurnedViolent/Q11038_GrowlersTurnedViolent.java
index 8f3db54278..14c239ea80 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11038_GrowlersTurnedViolent/Q11038_GrowlersTurnedViolent.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11038_GrowlersTurnedViolent/Q11038_GrowlersTurnedViolent.java
@@ -60,7 +60,7 @@ public class Q11038_GrowlersTurnedViolent extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11039_CommunicationBreakdown/Q11039_CommunicationBreakdown.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11039_CommunicationBreakdown/Q11039_CommunicationBreakdown.java
index 79bb127541..897cde6470 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11039_CommunicationBreakdown/Q11039_CommunicationBreakdown.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11039_CommunicationBreakdown/Q11039_CommunicationBreakdown.java
@@ -59,7 +59,7 @@ public class Q11039_CommunicationBreakdown extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/Q11040_AttackOfTheEnragedForest.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/Q11040_AttackOfTheEnragedForest.java
index 2164d330d7..07579e1305 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/Q11040_AttackOfTheEnragedForest.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/Q11040_AttackOfTheEnragedForest.java
@@ -68,7 +68,7 @@ public class Q11040_AttackOfTheEnragedForest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11041_CheckOutTheSituation/Q11041_CheckOutTheSituation.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11041_CheckOutTheSituation/Q11041_CheckOutTheSituation.java
index 3fd057a984..6ade21cf9c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11041_CheckOutTheSituation/Q11041_CheckOutTheSituation.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11041_CheckOutTheSituation/Q11041_CheckOutTheSituation.java
@@ -68,7 +68,7 @@ public class Q11041_CheckOutTheSituation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11042_SuspiciousMovements/Q11042_SuspiciousMovements.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11042_SuspiciousMovements/Q11042_SuspiciousMovements.java
index 648c7cbbb0..ff5ec89743 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11042_SuspiciousMovements/Q11042_SuspiciousMovements.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11042_SuspiciousMovements/Q11042_SuspiciousMovements.java
@@ -67,7 +67,7 @@ public class Q11042_SuspiciousMovements extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11043_SomeonesTrace/Q11043_SomeonesTrace.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11043_SomeonesTrace/Q11043_SomeonesTrace.java
index c681dfdd27..044fbc47ff 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11043_SomeonesTrace/Q11043_SomeonesTrace.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11043_SomeonesTrace/Q11043_SomeonesTrace.java
@@ -62,7 +62,7 @@ public class Q11043_SomeonesTrace extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11044_KetraOrcs/Q11044_KetraOrcs.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11044_KetraOrcs/Q11044_KetraOrcs.java
index d0afbe2b96..11d21b957d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11044_KetraOrcs/Q11044_KetraOrcs.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11044_KetraOrcs/Q11044_KetraOrcs.java
@@ -67,7 +67,7 @@ public class Q11044_KetraOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11045_TheyMustBeUpToSomething/Q11045_TheyMustBeUpToSomething.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11045_TheyMustBeUpToSomething/Q11045_TheyMustBeUpToSomething.java
index a676fe3119..e062909fac 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11045_TheyMustBeUpToSomething/Q11045_TheyMustBeUpToSomething.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11045_TheyMustBeUpToSomething/Q11045_TheyMustBeUpToSomething.java
@@ -62,7 +62,7 @@ public class Q11045_TheyMustBeUpToSomething extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11046_PrayingForSafety/Q11046_PrayingForSafety.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11046_PrayingForSafety/Q11046_PrayingForSafety.java
index b371ee3a32..4f4ed7f7e3 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11046_PrayingForSafety/Q11046_PrayingForSafety.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11046_PrayingForSafety/Q11046_PrayingForSafety.java
@@ -68,7 +68,7 @@ public class Q11046_PrayingForSafety extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/ThirdClassTransferQuest.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
index b230b12a5b..e0ee0b931a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
@@ -133,7 +133,7 @@ public abstract class ThirdClassTransferQuest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/custom/Q00529_RegularBarrierMaintenance/Q00529_RegularBarrierMaintenance.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/custom/Q00529_RegularBarrierMaintenance/Q00529_RegularBarrierMaintenance.java
index 38539272f0..d34cacbabe 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/custom/Q00529_RegularBarrierMaintenance/Q00529_RegularBarrierMaintenance.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/custom/Q00529_RegularBarrierMaintenance/Q00529_RegularBarrierMaintenance.java
@@ -79,7 +79,7 @@ public class Q00529_RegularBarrierMaintenance extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/custom/Q00560_HowToOvercomeFear/Q00560_HowToOvercomeFear.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/custom/Q00560_HowToOvercomeFear/Q00560_HowToOvercomeFear.java
index ede65a1765..f2b5b62d31 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/custom/Q00560_HowToOvercomeFear/Q00560_HowToOvercomeFear.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/custom/Q00560_HowToOvercomeFear/Q00560_HowToOvercomeFear.java
@@ -77,7 +77,7 @@ public class Q00560_HowToOvercomeFear extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/custom/Q00683_AdventOfKrofinSubspecies/Q00683_AdventOfKrofinSubspecies.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/custom/Q00683_AdventOfKrofinSubspecies/Q00683_AdventOfKrofinSubspecies.java
index fd612e19fd..e7af10d5e2 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/custom/Q00683_AdventOfKrofinSubspecies/Q00683_AdventOfKrofinSubspecies.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/custom/Q00683_AdventOfKrofinSubspecies/Q00683_AdventOfKrofinSubspecies.java
@@ -70,7 +70,7 @@ public class Q00683_AdventOfKrofinSubspecies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/custom/Q00684_DisturbedFields/Q00684_DisturbedFields.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/custom/Q00684_DisturbedFields/Q00684_DisturbedFields.java
index 80bb3b3ea5..93caeeeeba 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/custom/Q00684_DisturbedFields/Q00684_DisturbedFields.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/custom/Q00684_DisturbedFields/Q00684_DisturbedFields.java
@@ -67,7 +67,7 @@ public class Q00684_DisturbedFields extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/custom/Q10529_IvoryTowersResearchFloatingSeaJournal/Q10529_IvoryTowersResearchFloatingSeaJournal.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/custom/Q10529_IvoryTowersResearchFloatingSeaJournal/Q10529_IvoryTowersResearchFloatingSeaJournal.java
index 438a0cdb29..17307c0198 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/custom/Q10529_IvoryTowersResearchFloatingSeaJournal/Q10529_IvoryTowersResearchFloatingSeaJournal.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/custom/Q10529_IvoryTowersResearchFloatingSeaJournal/Q10529_IvoryTowersResearchFloatingSeaJournal.java
@@ -87,7 +87,7 @@ public class Q10529_IvoryTowersResearchFloatingSeaJournal extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/vehicles/AirShipController.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/vehicles/AirShipController.java
index 218cfa1a06..2b93c65dab 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/vehicles/AirShipController.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/vehicles/AirShipController.java
@@ -117,7 +117,7 @@ public abstract class AirShipController extends AbstractNpcAI
 	private static final SystemMessage SM_NEED_MORE = new SystemMessage(SystemMessageId.AN_AIRSHIP_CANNOT_BE_SUMMONED_BECAUSE_YOU_DON_T_HAVE_ENOUGH_S1).addItemName(STARSTONE);
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("summon".equalsIgnoreCase(event))
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
index a1ff9f0e0a..c5dc6f515f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
@@ -162,7 +162,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player.isTransformed())
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
index 7ff39fb0c0..8675a7ec2c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
@@ -51,7 +51,7 @@ public class AllianceMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!"9001-01.htm".equals(event) && (player.getClan() == null))
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
index c6283aa1cb..5ba0115c27 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
@@ -95,7 +95,7 @@ public class ClanMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LEADER_REQUIRED.containsKey(event) && !player.isClanLeader())
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/Quest.java
index e2e126b748..67fab88c81 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/Quest.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/Quest.java
@@ -257,7 +257,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -279,7 +279,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -570,7 +570,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 			{
 				player.setSimulatedTalking(false);
 			}
-			res = onAdvEvent(event, npc, player);
+			res = onEvent(event, npc, player);
 		}
 		catch (Exception e)
 		{
@@ -1048,12 +1048,11 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 */
 	public String onDeath(Creature killer, Creature victim, QuestState qs)
 	{
-		return onAdvEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
+		return onEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
 	}
 	
 	/**
 	 * This function is called whenever a player clicks on a link in a quest dialog and whenever a timer fires.<br>
-	 * If is not overridden by a subclass, then default to the returned value of the simpler (and older) {@link #onEvent(String, QuestState)} override.<br>
 	 * If the player has a quest state, use it as parameter in the next call, otherwise return null.
 	 * @param event this parameter contains a string identifier for the event.<br>
 	 *            Generally, this string is passed directly via the link.<br>
@@ -1072,35 +1071,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 *            This parameter may be {@code null} in certain circumstances.
 	 * @return the text returned by the event (may be {@code null}, a filename or just text)
 	 */
-	public String onAdvEvent(String event, Npc npc, Player player)
-	{
-		if (player != null)
-		{
-			final QuestState qs = player.getQuestState(getName());
-			if (qs != null)
-			{
-				return onEvent(event, qs);
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * This function is called in place of {@link #onAdvEvent(String, Npc, Player)} if the former is not implemented.<br>
-	 * If a script contains both {@link #onAdvEvent(String, Npc, Player)} and this implementation, then this method will never be called unless the script's {@link #onAdvEvent(String, Npc, Player)} explicitly calls this method.
-	 * @param event this parameter contains a string identifier for the event.<br>
-	 *            Generally, this string is passed directly via the link.<br>
-	 *            For example:<br>
-	 *            <code>
-	 *            &lt;a action="bypass -h Quest 626_ADarkTwilight 31517-01.htm"&gt;hello&lt;/a&gt;
-	 *            </code><br>
-	 *            The above link sets the event variable to "31517-01.htm" for the quest 626_ADarkTwilight.<br>
-	 *            In the case of timers, this will be the name of the timer.<br>
-	 *            This parameter serves as a sort of identifier.
-	 * @param qs this parameter contains a reference to the quest state of the player who used the link or started the timer.
-	 * @return the text returned by the event (may be {@code null}, a filename or just text)
-	 */
-	public String onEvent(String event, QuestState qs)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return null;
 	}
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Aden/Gallias/Gallias.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Aden/Gallias/Gallias.java
index 1a694c4224..62a9cc69f1 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Aden/Gallias/Gallias.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Aden/Gallias/Gallias.java
@@ -66,7 +66,7 @@ public class Gallias extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String[] substrings = event.split(" ");
 		if (substrings.length < 1)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java
index 3246831bf4..62d6ebb211 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java
@@ -47,7 +47,7 @@ public class Herphah extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Aden/Joachim/Joachim.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Aden/Joachim/Joachim.java
index a1f5cd1655..c54f44664d 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Aden/Joachim/Joachim.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Aden/Joachim/Joachim.java
@@ -89,7 +89,7 @@ public class Joachim extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Aden/Lulu/Lulu.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Aden/Lulu/Lulu.java
index da862c18d8..7d9b1c314b 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Aden/Lulu/Lulu.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Aden/Lulu/Lulu.java
@@ -58,7 +58,7 @@ public class Lulu extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("LULU_BLESSING") && (npc != null) && (npc.getId() == LULU))
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java
index 235fd9d2a3..086f8aeab5 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java
@@ -47,7 +47,7 @@ public class Penny extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java
index 2ab35f83dc..6740fe6383 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java
@@ -46,7 +46,7 @@ public class Ruine extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
index 6d5cc1c6c3..d3a66dd924 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
@@ -68,7 +68,7 @@ public class AncientArcanCity extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CHANGE_STATE"))
 		{
@@ -102,7 +102,7 @@ public class AncientArcanCity extends AbstractNpcAI
 				cat.broadcastSocialAction(2);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
index d76c158f9e..d38ceb917e 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
@@ -42,7 +42,7 @@ public class Lykus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
index 4fd3e87bb7..92979a713e 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
@@ -39,7 +39,7 @@ public class Mumu extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
index 3b12c5b289..5cbb54afe6 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
@@ -329,7 +329,7 @@ public class AteliaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java
index c223f26d2d..0829a26403 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java
@@ -74,7 +74,7 @@ public class AteliaRefinery extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java
index 36666c5e39..0ec0d94d61 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java
@@ -49,7 +49,7 @@ public class Leona extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
@@ -115,7 +115,7 @@ public class Leona extends AbstractNpcAI
 		{
 			player.teleToLocation(REFINERY, true);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
index c87c4e9224..a2a2891b57 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
@@ -56,7 +56,7 @@ public class BabyPets extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("HEAL") && (player != null))
 		{
@@ -78,7 +78,7 @@ public class BabyPets extends AbstractNpcAI
 				cancelQuestTimer("HEAL", null, player);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGOUT)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
index b0153ef5da..f0f610c8b9 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
@@ -56,7 +56,7 @@ public class ImprovedBabyPets extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player != null)
 		{
@@ -108,7 +108,7 @@ public class ImprovedBabyPets extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
index 6b4a147550..301899a76f 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
@@ -42,7 +42,7 @@ public class Tunatun extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Belas/Belas.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Belas/Belas.java
index 74c43a1a82..d4c3218289 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Belas/Belas.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Belas/Belas.java
@@ -44,7 +44,7 @@ public class Belas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/BlackbirdCampsite/SoulSummonStone/SoulSummonStone.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/BlackbirdCampsite/SoulSummonStone/SoulSummonStone.java
index a2cb1dca5d..396341ec1a 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/BlackbirdCampsite/SoulSummonStone/SoulSummonStone.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/BlackbirdCampsite/SoulSummonStone/SoulSummonStone.java
@@ -47,7 +47,7 @@ public class SoulSummonStone extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class SoulSummonStone extends AbstractNpcAI
 				return "34434-05.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/BlackbirdCampsite/TeleportDevice/TeleportDevice.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/BlackbirdCampsite/TeleportDevice/TeleportDevice.java
index de306cfe8e..66cf9096f1 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/BlackbirdCampsite/TeleportDevice/TeleportDevice.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/BlackbirdCampsite/TeleportDevice/TeleportDevice.java
@@ -44,7 +44,7 @@ public class TeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Valleria/Valleria.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Valleria/Valleria.java
index 3f8f202032..2deec1346e 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Valleria/Valleria.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Valleria/Valleria.java
@@ -46,7 +46,7 @@ public class Valleria extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
index a2b4810dfa..ad01bdba4a 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
@@ -46,14 +46,14 @@ public class CrumaTower extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("MESSAGE") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_GO_TO_UNDERGROUND_LV_3_USING_THE_ELEVATOR_IN_THE_BACK);
 			startQuestTimer(event, 15000, npc, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
index fe838f52cf..ba359695c2 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
@@ -77,7 +77,7 @@ public class FrightenedRagnaOrc extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
index ee5d44d59e..db9d7838fc 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
@@ -53,7 +53,7 @@ public class DragonVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("Spawn".equals(event))
 		{
@@ -104,7 +104,7 @@ public class DragonVortex extends AbstractNpcAI
 		{
 			npc.setScriptValue(0);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
index e511676cc6..5c1dc0ce44 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
@@ -53,7 +53,7 @@ public class LairOfAntharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CHECK_HOME") && (npc != null) && !npc.isDead())
 		{
@@ -67,7 +67,7 @@ public class LairOfAntharas extends AbstractNpcAI
 				npc.broadcastPacket(new ValidateLocation(npc));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
index bf46d16542..c4e625c565 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
@@ -55,7 +55,7 @@ public class LeopardDragonHachling extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && event.equals("MOVE_TO_TRANSFORM"))
 		{
@@ -77,7 +77,7 @@ public class LeopardDragonHachling extends AbstractNpcAI
 				npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, nearestLocation(npc));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
index 04396d3683..6f794f4008 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
@@ -40,13 +40,13 @@ public class MercenaryCaptain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THE_EASTERN_PART_OF_DRAGON_VALLEY_IS_MUCH_MORE_DANGEROUS_THAN_THE_WEST_BE_CAREFUL));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
index 13dfbd313b..324120327b 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
@@ -61,10 +61,10 @@ public class MercenaryTeleport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		player.teleToLocation(LOCATIONS.get(event), true);
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DragonValley/Namo.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
index 99057c816c..f21c497157 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
@@ -40,13 +40,13 @@ public class Namo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THIS_PLACE_SWARMS_WITH_DRAGONS_BY_DAY_AND_UNDEAD_BY_NIGHT));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
index 32c7beb400..c02404f76a 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
@@ -40,13 +40,13 @@ public class Rakun extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THIS_PLACE_SWARMS_WITH_DRAGONS_BY_DAY_AND_UNDEAD_BY_NIGHT));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
index 349976c56b..cc5487971c 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
@@ -72,7 +72,7 @@ public class SeparatedSoul extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LOCATIONS.containsKey(event))
 		{
@@ -98,7 +98,7 @@ public class SeparatedSoul extends AbstractNpcAI
 				return "no-items.htm";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java
index 2125fca0d8..870b8a5820 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java
@@ -50,7 +50,7 @@ public class Celestiel extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
index 8ca5f0c7d4..a3b3d2da62 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
@@ -49,7 +49,7 @@ public class AltarOfSouls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -96,7 +96,7 @@ public class AltarOfSouls extends AbstractNpcAI
 				return "33920-9.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
index 47beace94a..c82e8969f1 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
@@ -41,7 +41,7 @@ public class RemembranceTower extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("action") && npc.isScriptValue(0))
 		{
@@ -54,7 +54,7 @@ public class RemembranceTower extends AbstractNpcAI
 			npc.setScriptValue(0);
 			npc.broadcastPacket(new OnEventTrigger(EMMITER_ID, false));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
index 70d2b3547f..10d0315383 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
@@ -57,7 +57,7 @@ public class LargeCocoon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -134,7 +134,7 @@ public class LargeCocoon extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
index d4a9137f8d..20aad104b0 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
@@ -41,7 +41,7 @@ public class KrateisCube extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
index 54f813c829..c1de7e5630 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
@@ -365,7 +365,7 @@ public class TalentShow extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((event == null) || event.isEmpty())
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
index 8029a17703..20dfae5ccf 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
@@ -88,7 +88,7 @@ public class ForgeOfTheGods extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
index ff380d4515..407b1fa132 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
@@ -84,7 +84,7 @@ public class Rooney extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport") && !npc.isDecayed())
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
index a3bc5828d9..40c8ad2e0d 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
@@ -87,7 +87,7 @@ public class GainakSiege extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("GAINAK_WAR"))
 		{
@@ -129,7 +129,7 @@ public class GainakSiege extends AbstractNpcAI
 				ZoneManager.getInstance().getZoneById(GAINAK_TOWN_ZONE.getId(), PeaceZone.class).setEnabled(false);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
index 27e969e0c9..955c7ddd25 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
@@ -46,7 +46,7 @@ public class Lailly extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
index 35274b2de7..ca8919593a 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
@@ -128,7 +128,7 @@ public class TavernEmployee extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
index c99c7cdf42..0ff79c4f5d 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
@@ -76,7 +76,7 @@ public class Apherus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("buff"))
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
index 06a75493ac..d7944dd6f3 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
@@ -40,7 +40,7 @@ public class ApherusLookout extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		if (event.equals("open_bag"))
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
index e984558e2c..0d30623e93 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
@@ -48,7 +48,7 @@ public class GardenWatchman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -78,7 +78,7 @@ public class GardenWatchman extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
index 02b6a47091..42752aea0c 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
@@ -42,7 +42,7 @@ public class GenesisVines extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CAST_SKILL") && npc.isScriptValue(1))
 		{
@@ -58,7 +58,7 @@ public class GenesisVines extends AbstractNpcAI
 			npc.setScriptValue(0);
 			npc.deleteMe();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
index 3216884d13..ab0d91e3cd 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
@@ -53,7 +53,7 @@ public class Statues extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("fight"))
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java
index 33a89a6336..d901db15b1 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java
@@ -39,7 +39,7 @@ public class Eubina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
index 29ccfb6308..64246fbb51 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
@@ -46,7 +46,7 @@ public class FuryKiku extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -76,7 +76,7 @@ public class FuryKiku extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
index 7c2b546530..203f873b61 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
@@ -50,7 +50,7 @@ public class Isabella extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAWN"))
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java
index 2f731a5d38..132a96baba 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java
@@ -39,7 +39,7 @@ public class Rotoeh extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
index 0772b2e4fc..6eca04c92a 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
@@ -42,7 +42,7 @@ public class GiantsCave extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Giran/Grace/Grace.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Giran/Grace/Grace.java
index 88ec90ea8f..b238ecff84 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Giran/Grace/Grace.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Giran/Grace/Grace.java
@@ -56,7 +56,7 @@ public class Grace extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("GRACE_BLESSING") && (npc != null) && (npc.getId() == GRACE))
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
index 50c14b79bb..20f3adf32d 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
@@ -57,7 +57,7 @@ public class Kekropus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
index d4c54fcddd..9e41be2b4a 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
@@ -82,7 +82,7 @@ public class Spirit extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -102,7 +102,7 @@ public class Spirit extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java
index a62bbab9b4..5418e91c90 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java
@@ -62,7 +62,7 @@ public class LionelHunter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs1 = player.getQuestState(Q10811_ExaltedOneWhoFacesTheLimit.class.getSimpleName());
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Heine/WrapGate.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
index d42bf072bd..5a438ac325 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
@@ -40,7 +40,7 @@ public class WrapGate extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("enter_hellbound".equals(event))
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
index e49050b695..c4486b2670 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
@@ -39,7 +39,7 @@ public class LeonaBlackbird extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
index 3b1cebc30c..bd44c3481d 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
@@ -60,7 +60,7 @@ public class Theorn extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
index e026f3cd57..5ef95aed5e 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
@@ -47,7 +47,7 @@ public class Merlot extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
index 6ea0a0760f..14c4560f16 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
@@ -43,7 +43,7 @@ public class Zenya extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
index 2b048463f8..99e8fa6078 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
@@ -63,7 +63,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -135,7 +135,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 				npc.reduceCurrentHp(500, npc, null); // poison kills Fafurion if he is not healed
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
index 2a0a8014f8..d4dc25aab8 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
@@ -47,7 +47,7 @@ public class Rignos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -90,7 +90,7 @@ public class Rignos extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
index 43e2c64226..af4b116516 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
@@ -57,7 +57,7 @@ public class HillsOfGold extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -75,7 +75,7 @@ public class HillsOfGold extends AbstractNpcAI
 			});
 			startQuestTimer("SPICULA_AGGRO", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
index edf9416113..efaf6d6bf8 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
@@ -61,7 +61,7 @@ public class AvantGarde extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
index 37f35f00f8..ac8772d975 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
@@ -108,7 +108,7 @@ public class KetraOrcSupport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
index 6c1085f7d0..f253eadcb6 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
@@ -38,13 +38,13 @@ public class El extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_USE_THE_JUMP_BOARD_TO_GET_STRAIGHT_TO_THE_2ND_FLOOR, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
index 92b4915758..085300cd9c 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
@@ -47,7 +47,7 @@ public class Erda extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
@@ -113,7 +113,7 @@ public class Erda extends AbstractNpcAI
 		{
 			player.teleToLocation(CAMILLE_LOC, true);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
index 282d7a6326..debef79252 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
@@ -58,7 +58,7 @@ public class GeneralDilios extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("command_"))
 		{
@@ -87,7 +87,7 @@ public class GeneralDilios extends AbstractNpcAI
 				startQuestTimer("guard_animation_" + (value + 1), 1500, null, null);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
index 0a84cf47a0..b4dbbc74ae 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
@@ -47,7 +47,7 @@ public class Lekon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
index e4edb350d4..3cdddadb06 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
@@ -56,7 +56,7 @@ public class LindviorScene extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -109,7 +109,7 @@ public class LindviorScene extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public void scheduleNextLindviorVisit()
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
index eedcc75645..0b50c57b06 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
@@ -57,7 +57,7 @@ public class Nottingale extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
index 975e4a2614..b0ded82d61 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
@@ -38,13 +38,13 @@ public class Plenos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_BE_TELEPORTED_TO_EACH_SEED_IF_YOU_VOLUNTEER_WHY_NOT_TRY, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
index 18f2110178..7fc2284ccb 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
@@ -46,7 +46,7 @@ public class SeedTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -75,7 +75,7 @@ public class SeedTeleportDevice extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
index 23b5c50033..c8498cbee5 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
@@ -49,7 +49,7 @@ public class MithrilMinesTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int index = Integer.parseInt(event) - 1;
 		if (LOCS.length > index)
@@ -57,7 +57,7 @@ public class MithrilMinesTeleporter extends AbstractNpcAI
 			final Location loc = LOCS[index];
 			player.teleToLocation(loc, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
index 6f4192f837..e5abb08edb 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
@@ -84,7 +84,7 @@ public class MonasteryOfSilence extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -132,7 +132,7 @@ public class MonasteryOfSilence extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
index 9a2ee10f60..434807bd9e 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
@@ -62,7 +62,7 @@ public class PaganTeleporters extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
index 7eed58ebec..1c6e6ba756 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
@@ -60,7 +60,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -90,7 +90,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI
 				instanceScript.notifyEvent(event, npc, player);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
index 9d4b3bde33..781bfa3af3 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
@@ -39,13 +39,13 @@ public class Fioren extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("startMovie"))
 		{
 			playMovie(player, Movie.SI_BARLOG_STORY);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
index 5ffc401682..6a166ec683 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
@@ -74,7 +74,7 @@ public class Kaysen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
index 619d9e57f4..ceb8d8a7b9 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
@@ -63,7 +63,7 @@ public class NervasTemporaryPrison extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
index b8b803e57f..43691cef06 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
@@ -38,14 +38,14 @@ public class RoAGuard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THIS_IS_RUINS_OF_AGONY_WHERE_KANILOV_IS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
index f3af67aba7..dd2a52bdc5 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
@@ -38,14 +38,14 @@ public class RoDGuard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THIS_IS_THE_RUINS_OF_AGONY_WHERE_POSLOF_IS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
index 5e57a9fb94..a19c1d4085 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
@@ -48,7 +48,7 @@ public class AltarOfSacrifice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("msg_text"))
 		{
@@ -68,7 +68,7 @@ public class AltarOfSacrifice extends AbstractNpcAI
 			startQuestTimer("msg_text", 135000, npc, null);
 			_jenas_guard.setScriptValue(0);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java
index e2a2dba97f..96e17ec39b 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java
@@ -50,7 +50,7 @@ public class Roiental extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterGoldberg"))
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
index a025e62542..b50f530164 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
@@ -147,7 +147,7 @@ public class Venom extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Rune/SwampOfScreams/SwampOfScreamsSiege.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Rune/SwampOfScreams/SwampOfScreamsSiege.java
index 5eacdf1f03..d6cf38175b 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Rune/SwampOfScreams/SwampOfScreamsSiege.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Rune/SwampOfScreams/SwampOfScreamsSiege.java
@@ -79,7 +79,7 @@ public class SwampOfScreamsSiege extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -116,7 +116,7 @@ public class SwampOfScreamsSiege extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
index ed4ce2d782..cd89ebcb9e 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
@@ -43,7 +43,7 @@ public class Klemis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("portInside"))
 		{
@@ -56,7 +56,7 @@ public class Klemis extends AbstractNpcAI
 				return "32734-01.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
index d66782538a..c1db3c8180 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
@@ -80,7 +80,7 @@ public class Maguen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || (player == null))
 		{
@@ -163,7 +163,7 @@ public class Maguen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
index 344d65a44f..d5ab73ff74 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
@@ -48,7 +48,7 @@ public class Nemo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
index 251458ea98..ae26a6c701 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
@@ -297,7 +297,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("ChangeSeedsStatus"))
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
index d6f644fa86..765deb4a7d 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
@@ -51,7 +51,7 @@ public class Seyo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (npc == null)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
index 2ed70a48ec..6bd6e841f8 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
@@ -127,7 +127,7 @@ public class SelMahumDrill extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -183,7 +183,7 @@ public class SelMahumDrill extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
index df269e2362..9f51d582c1 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
@@ -81,7 +81,7 @@ public class SelMahumSquad extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -187,7 +187,7 @@ public class SelMahumSquad extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
index ebf70cc5ae..6ba58ffc8e 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
@@ -197,7 +197,7 @@ public class StakatoNest extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || (player == null) || npc.isDead())
 		{
@@ -225,7 +225,7 @@ public class StakatoNest extends AbstractNpcAI
 			addAttackPlayerDesire(spawned, player);
 			npc.deleteMe();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private static Monster checkMinion(Npc npc)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
index 356608d0fc..49a25ec26b 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
@@ -47,7 +47,7 @@ public class StakatoNestTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int index = Integer.parseInt(event) - 1;
 		if (LOCS.length > index)
@@ -65,7 +65,7 @@ public class StakatoNestTeleporter extends AbstractNpcAI
 			}
 			player.teleToLocation(loc, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
index 4a64afbd00..ba580c2dad 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
@@ -44,7 +44,7 @@ public class Apprentice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("rideKukuru"))
 		{
@@ -61,7 +61,7 @@ public class Apprentice extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TRY_RIDING_A_KUKURI, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
index 4a9603c4c4..40f728b4bc 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
@@ -95,7 +95,7 @@ public class AwakeningMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		if (qs == null)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
index cd6185a888..8ed7701c68 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
@@ -38,7 +38,7 @@ public class Banette extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
@@ -62,7 +62,7 @@ public class Banette extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
index 87e0629227..858331ae3e 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
@@ -38,13 +38,13 @@ public class Bink extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TALKING_ISLAND_VILLAGE_IS_REALLY_BEAUTIFUL, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
index a8d2292f76..f37ea8e8b8 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
@@ -45,7 +45,7 @@ public class BoyAndGirl extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_CHANGEWEAP"))
 		{
@@ -66,7 +66,7 @@ public class BoyAndGirl extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, npc.getId() == BOY ? NpcStringId.WOW_2 : NpcStringId.BOYS_ARE_SO_ANNOYING);
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
index ff53080809..22d19b3496 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
@@ -41,7 +41,7 @@ public class Devno extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -74,7 +74,7 @@ public class Devno extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
index a4f08b8c99..18c04b2e7e 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
@@ -42,7 +42,7 @@ public class DrillSergeant extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SOCIAL_SHOW"))
 		{
@@ -66,7 +66,7 @@ public class DrillSergeant extends AbstractNpcAI
 				npc.broadcastSocialAction(socialActionId);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
index 8e3f9e5943..83363ef157 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
@@ -41,7 +41,7 @@ public class Eleve extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Eleve extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
index b8863b9963..114728632b 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
@@ -44,13 +44,13 @@ public class Gagabu extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, GAGABU_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
index 44dab7df42..d490504792 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
@@ -38,14 +38,14 @@ public class Galad extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSocialAction(3);
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.OCCASIONALLY_RARE_JEWELS_OF_GIANTS_ARE_DISCOVERED_IN_THE_BEACH, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
index a0c7f71816..3a56943e20 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
@@ -52,7 +52,7 @@ public class GiantSoldiers extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
index a703c40323..b94d2f9624 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
@@ -38,7 +38,7 @@ public class GuardSoldier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -49,7 +49,7 @@ public class GuardSoldier extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(2);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
index b26d9fd748..1b0dd65c82 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
@@ -43,7 +43,7 @@ public class Hadel extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
index bdb70d1f2d..d7ff70d9a0 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
@@ -38,7 +38,7 @@ public class Handermonkey extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE") && (npc != null))
 		{
@@ -54,7 +54,7 @@ public class Handermonkey extends AbstractNpcAI
 				npc.broadcastSocialAction(9);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
index 6874a606ec..f48b530d56 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
@@ -61,7 +61,7 @@ public class Hardin extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = getHtmlMessage(player);
 		if (htmltext != null)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
index a8bded51f1..536ee7f5cd 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
@@ -58,7 +58,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("HARNAK_SPAWN"))
 		{
@@ -70,7 +70,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
 				_templates.forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName), null));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private static class zoneInfo
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
index 3c2080e85a..03dca71bb5 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
@@ -55,13 +55,13 @@ public class HurnakMobMsg extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("ATTACK"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomEntry(ON_ATTACK_MSG));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
index 81f6617329..7055381eab 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
@@ -38,14 +38,14 @@ public class Hera extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomBoolean() ? NpcStringId.DOES_THE_GODDESS_SEE_WHAT_SHE_HAS_DONE : NpcStringId.WHY_HAVE_THE_HEROES_ABANDONED_US);
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
index 7003ad014d..2b6a1a1e51 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
@@ -38,7 +38,7 @@ public class Heymond extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
@@ -62,7 +62,7 @@ public class Heymond extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
index 52ce99be7f..8033f3c1ec 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
@@ -38,7 +38,7 @@ public class Holly extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -48,7 +48,7 @@ public class Holly extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(6);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
index 3f9141b931..e11490debc 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
@@ -41,7 +41,7 @@ public class Karonf extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Karonf extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
index 597cfd80f2..c102b0cc4c 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
@@ -44,7 +44,7 @@ public class Luderic extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -54,7 +54,7 @@ public class Luderic extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(1);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
index 0c07720a0a..08de6143f0 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
@@ -45,13 +45,13 @@ public class Lumi extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, LUMI_SHOUT[getRandom(3)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
index 68b2789416..3bdb8de60b 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
@@ -38,13 +38,13 @@ public class Mahram extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.ALCHEMY_IS_A_SCIENCE_AND_AN_ART, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
index e00fd6c98c..85117713a0 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
@@ -38,13 +38,13 @@ public class Mai extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EVERY_RACE_BUILT_A_PIECE_OF_THIS_VILLAGE, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
index dcd47a9822..2d44f1568a 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
@@ -38,13 +38,13 @@ public class MarinSmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.HMM_IS_THIS_STILL_A_DECENT_WEAPON, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
index d5e5496e16..0d4e8f79e3 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
@@ -41,7 +41,7 @@ public class Marsha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Marsha extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
index aa9eb0eb87..81bc246742 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
@@ -43,7 +43,7 @@ public class Milia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("gludioAirship"))
 		{
@@ -53,7 +53,7 @@ public class Milia extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SPEAK_WITH_ME_ABOUT_TRAVELING_AROUND_ADEN, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
index b1e037eb5a..933c139b8c 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
@@ -64,7 +64,7 @@ public class MonkOfChaos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
index f6cd83883a..0bedb09eb6 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
@@ -41,7 +41,7 @@ public class Morgan extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Morgan extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
index e7ce45a4e5..fd5e025cd2 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
@@ -40,7 +40,7 @@ public class Oris extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SOCIAL_ACTION_1"))
 		{
@@ -55,7 +55,7 @@ public class Oris extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_HAVEN_T_FELT_THIS_GOOD_IN_AGES, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
index 629e695955..bc23f8bd49 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
@@ -46,7 +46,7 @@ public class Pantheon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
index 8923f048b6..109864aff4 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
@@ -149,7 +149,7 @@ public class Raina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
index 4c8862c733..8d66a71766 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
@@ -41,7 +41,7 @@ public class Rubentis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Rubentis extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
index d5c86cee97..87e1df4a6b 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
@@ -38,14 +38,14 @@ public class Ruks extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomBoolean() ? NpcStringId.THE_SEVEN_SIGNS_ENDED : NpcStringId.WE_NEED_TO_FIND_HER_WEAKNESS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
index cc9a63c666..880532e52c 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
@@ -38,13 +38,13 @@ public class Sebion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TIS_A_SCRATCH, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
index fa3cc06633..4b05120bde 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
@@ -38,13 +38,13 @@ public class Shannon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.LOOK_AT_ALL_THE_NEWBIES_HA_HA_HA, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
index 219ac48515..7fd067c374 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
@@ -44,13 +44,13 @@ public class Sodian extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, SODIAN_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
index e11dfb9aaf..8413c93bc8 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
@@ -44,13 +44,13 @@ public class Stiller extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, STILLER_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
index b10f044196..d196091a8e 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
@@ -38,13 +38,13 @@ public class Theodore extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.AND_NOW_YOUR_JOURNEY_BEGINS, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
index 4290aa8fc6..8e4f8ed738 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
@@ -38,7 +38,7 @@ public class TomaJunior extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -49,7 +49,7 @@ public class TomaJunior extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(6);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
index c3aa031317..78ce6f2c8c 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
@@ -38,7 +38,7 @@ public class TrainningSoldier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -55,7 +55,7 @@ public class TrainningSoldier extends AbstractNpcAI
 			}
 			startQuestTimer("START_ATTACK", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
index 8dcdee6738..6e42cbe630 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
@@ -64,7 +64,7 @@ public class Trandon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String[] substrings = event.split(" ");
 		if (substrings.length < 1)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
index 8cd3cd965d..b65bd9a7ad 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
@@ -42,7 +42,7 @@ public class YeSagiraGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -56,7 +56,7 @@ public class YeSagiraGuards extends AbstractNpcAI
 			}
 			startQuestTimer("GUARD_AGGRO", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
index 5fb219dcef..77b212f1af 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
@@ -84,7 +84,7 @@ public class YeSegiraTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LOCATIONS.containsKey(event))
 		{
@@ -107,7 +107,7 @@ public class YeSegiraTeleportDevice extends AbstractNpcAI
 				// }
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_PLAYER_CREATE)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TowerOfInsolence/WatchmenBosses.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TowerOfInsolence/WatchmenBosses.java
index 96d9375763..b1feb81810 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TowerOfInsolence/WatchmenBosses.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TowerOfInsolence/WatchmenBosses.java
@@ -81,7 +81,7 @@ public class WatchmenBosses extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
index 2c8e967539..4bb6be2086 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
@@ -40,7 +40,7 @@ public class Acateo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("give_circlet"))
 		{
@@ -51,7 +51,7 @@ public class Acateo extends AbstractNpcAI
 			giveItems(player, ACADEMY_CIRCLET, 1);
 			return "33905-2.html";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
index 949fb8f279..48ca778074 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
@@ -108,7 +108,7 @@ public class VarkaSilenosSupport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
index b7fb571500..3a94d3d378 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
@@ -43,7 +43,7 @@ public class ElmoredenServantsGhost extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("teleport1") || event.equals("teleport2"))
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
index 427084ea7a..150fee7dfb 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
@@ -83,7 +83,7 @@ public class Wastelands extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || !npc.isSpawned())
 		{
@@ -184,7 +184,7 @@ public class Wastelands extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
index 61678a5cb2..5e24c8040c 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
@@ -47,7 +47,7 @@ public class ZealotOfShilen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -75,7 +75,7 @@ public class ZealotOfShilen extends AbstractNpcAI
 			}
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
index 2da266ca0e..ab6a6ebc3e 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
@@ -38,14 +38,14 @@ public class Commando extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.WE_RE_COLLECTING_SEEKER_OF_ADEN);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Anais/Anais.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Anais/Anais.java
index 74fe879672..823d08142f 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Anais/Anais.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Anais/Anais.java
@@ -75,7 +75,7 @@ public class Anais extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -134,7 +134,7 @@ public class Anais extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
index 3be16633a2..91d8d0b84c 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
@@ -114,7 +114,7 @@ public class Anakim extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -187,7 +187,7 @@ public class Anakim extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Anakim/AnakimBoss.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Anakim/AnakimBoss.java
index e082cf6354..d3b785f7e1 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Anakim/AnakimBoss.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Anakim/AnakimBoss.java
@@ -51,7 +51,7 @@ public class AnakimBoss extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -64,7 +64,7 @@ public class AnakimBoss extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Anakim/AnakimElitePriest.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Anakim/AnakimElitePriest.java
index 21f3ff12cb..8511577c7b 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Anakim/AnakimElitePriest.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Anakim/AnakimElitePriest.java
@@ -46,7 +46,7 @@ public class AnakimElitePriest extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -59,7 +59,7 @@ public class AnakimElitePriest extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index 716ff9c974..cc85be84fd 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -111,7 +111,7 @@ public class Antharas extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 6aa670a2de..5fe20e9fa4 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -162,7 +162,7 @@ public class Baium extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -471,7 +471,7 @@ public class Baium extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
index 992eae3c7c..7bea095520 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
@@ -105,7 +105,7 @@ public class BalokWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -115,7 +115,7 @@ public class BalokWarzone extends AbstractInstance
 				takeItems(player, PRISON_KEY, -1);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
index 19fcd59ca4..f0518b7146 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
@@ -74,7 +74,7 @@ public class BaylorWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -126,7 +126,7 @@ public class BaylorWarzone extends AbstractInstance
 				player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index b5a24845bb..3748875859 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -126,7 +126,7 @@ public class Beleth extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -536,7 +536,7 @@ public class Beleth extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
index e2770b5bec..b768e563e9 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
@@ -49,7 +49,7 @@ public class Wormhole extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Camille/Camille.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Camille/Camille.java
index 24757df47d..ee0ad1539f 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Camille/Camille.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Camille/Camille.java
@@ -54,7 +54,7 @@ public class Camille extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class Camille extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Core/Core.java
index 344ad52a0a..34584c31c3 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -143,7 +143,7 @@ public class Core extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
@@ -162,7 +162,7 @@ public class Core extends AbstractNpcAI
 			_minions.forEach(Attackable::decayMe);
 			_minions.clear();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Cyrax/Cyrax.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Cyrax/Cyrax.java
index 3cf963c685..b5a3be172b 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Cyrax/Cyrax.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Cyrax/Cyrax.java
@@ -48,7 +48,7 @@ public class Cyrax extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -61,7 +61,7 @@ public class Cyrax extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Cyrax/TempleEliteWizard.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Cyrax/TempleEliteWizard.java
index 1b68f87df9..33d0e6b941 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Cyrax/TempleEliteWizard.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Cyrax/TempleEliteWizard.java
@@ -44,7 +44,7 @@ public class TempleEliteWizard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleEliteWizard extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/ChoirOfDarkness.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/ChoirOfDarkness.java
index c07620df2f..22735a6228 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/ChoirOfDarkness.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/ChoirOfDarkness.java
@@ -44,7 +44,7 @@ public class ChoirOfDarkness extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class ChoirOfDarkness extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/Etina.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/Etina.java
index 21647bc333..3f20e07ce9 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/Etina.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/Etina.java
@@ -47,7 +47,7 @@ public class Etina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -60,7 +60,7 @@ public class Etina extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
index 3691975b20..8abe1df6cc 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
@@ -348,7 +348,7 @@ public class EtisVanEtina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -515,7 +515,7 @@ public class EtisVanEtina extends AbstractNpcAI
 			}
 			
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private void clean()
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleDarkJudge.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleDarkJudge.java
index 609abafe5c..c89586710f 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleDarkJudge.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleDarkJudge.java
@@ -44,7 +44,7 @@ public class GreatTempleDarkJudge extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class GreatTempleDarkJudge extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleSoulGuide.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleSoulGuide.java
index 7ffe33d918..a08a1c79c2 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleSoulGuide.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleSoulGuide.java
@@ -44,7 +44,7 @@ public class GreatTempleSoulGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class GreatTempleSoulGuide extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/JudgeOfHeresy.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/JudgeOfHeresy.java
index acfba50e7d..a9e53959c5 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/JudgeOfHeresy.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/JudgeOfHeresy.java
@@ -44,7 +44,7 @@ public class JudgeOfHeresy extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class JudgeOfHeresy extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/Kain.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/Kain.java
index 8c81abebe3..7b910760fd 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/Kain.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/Kain.java
@@ -46,7 +46,7 @@ public class Kain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -59,7 +59,7 @@ public class Kain extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/LiberatorOfLust.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/LiberatorOfLust.java
index 081d00456a..628d8f4399 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/LiberatorOfLust.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/LiberatorOfLust.java
@@ -44,7 +44,7 @@ public class LiberatorOfLust extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class LiberatorOfLust extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/SeekerOfDespair.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/SeekerOfDespair.java
index 4cb190b064..b9fadc44ad 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/SeekerOfDespair.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/SeekerOfDespair.java
@@ -44,7 +44,7 @@ public class SeekerOfDespair extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class SeekerOfDespair extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/SoulDestroyer.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/SoulDestroyer.java
index defafa1d95..7382c7e319 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/SoulDestroyer.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/SoulDestroyer.java
@@ -44,7 +44,7 @@ public class SoulDestroyer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class SoulDestroyer extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleArchon.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleArchon.java
index ba2d56ecf9..85dc410977 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleArchon.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleArchon.java
@@ -44,7 +44,7 @@ public class TempleArchon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleArchon extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleDarkWizard.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleDarkWizard.java
index c92187c67e..ff892ea50e 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleDarkWizard.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleDarkWizard.java
@@ -44,7 +44,7 @@ public class TempleDarkWizard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleDarkWizard extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleFlameMaster.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleFlameMaster.java
index 57a930ddd5..341a3663b7 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleFlameMaster.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleFlameMaster.java
@@ -44,7 +44,7 @@ public class TempleFlameMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleFlameMaster extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleHighPriest.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleHighPriest.java
index df735b07c3..df68ee43c3 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleHighPriest.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleHighPriest.java
@@ -44,7 +44,7 @@ public class TempleHighPriest extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleHighPriest extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Fafurion/EliteWizard.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Fafurion/EliteWizard.java
index e776d5739f..2b85d8c0e0 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Fafurion/EliteWizard.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Fafurion/EliteWizard.java
@@ -44,7 +44,7 @@ public class EliteWizard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class EliteWizard extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
index 952cbab1be..fac0d6d7e7 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
@@ -104,7 +104,7 @@ public class Fafurion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Fafurion/FafurionBoss.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Fafurion/FafurionBoss.java
index d297cd7906..eb953be1a0 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Fafurion/FafurionBoss.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Fafurion/FafurionBoss.java
@@ -60,7 +60,7 @@ public class FafurionBoss extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -73,7 +73,7 @@ public class FafurionBoss extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
index 639cabcd8c..e7e800d352 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
@@ -63,7 +63,7 @@ public class IceQueensCastle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -113,7 +113,7 @@ public class IceQueensCastle extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
index 0f1883b1e5..4c73370ec5 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
@@ -157,7 +157,7 @@ public class IceQueensCastleBattle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterEasy"))
 		{
@@ -677,7 +677,7 @@ public class IceQueensCastleBattle extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
index 0e6e22d234..cd834bb356 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
@@ -43,7 +43,7 @@ public class Jinia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
index b35f206b93..ef19ab4287 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
@@ -165,7 +165,7 @@ public class LastImperialTomb extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
index 282b9f8fbc..254c891bc5 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
@@ -62,7 +62,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Helios/Helios.java
index d6de973ec6..8288e0626c 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Helios/Helios.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Helios/Helios.java
@@ -320,7 +320,7 @@ public class Helios extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Helios/Helios1.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Helios/Helios1.java
index 7eb394719d..5d2364fbc0 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Helios/Helios1.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Helios/Helios1.java
@@ -45,7 +45,7 @@ public class Helios1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -58,7 +58,7 @@ public class Helios1 extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Helios/Helios2.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Helios/Helios2.java
index 2147bd52c0..abe0cc400e 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Helios/Helios2.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Helios/Helios2.java
@@ -45,7 +45,7 @@ public class Helios2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -58,7 +58,7 @@ public class Helios2 extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Helios/Helios3.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Helios/Helios3.java
index 364dce85de..8e293ad2a4 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Helios/Helios3.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Helios/Helios3.java
@@ -46,7 +46,7 @@ public class Helios3 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -59,7 +59,7 @@ public class Helios3 extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java
index 404237e0fa..29b64fa20b 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java
@@ -44,7 +44,7 @@ public class RoyalArchmageMinion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class RoyalArchmageMinion extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
index e4260628ce..d61884c91b 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
@@ -92,7 +92,7 @@ public class IstinaCavern extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance instance = npc.getInstanceWorld();
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
index 27728f34c1..f1945e2def 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
@@ -40,7 +40,7 @@ public class Rumiese extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
index b94d17f47b..ae0e6aaef9 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
@@ -141,7 +141,7 @@ public class Kelbim extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -281,7 +281,7 @@ public class Kelbim extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
index 9f677053b2..c3e066a466 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
@@ -137,7 +137,7 @@ public class KimerianCommon extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance instance = npc.getInstanceWorld();
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
index 3f5ddf199c..57580cb51f 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
@@ -113,7 +113,7 @@ public class Lilith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -187,7 +187,7 @@ public class Lilith extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lilith/LilithBoss.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lilith/LilithBoss.java
index e0d6b0f02c..9ce319723c 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lilith/LilithBoss.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lilith/LilithBoss.java
@@ -51,7 +51,7 @@ public class LilithBoss extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -64,7 +64,7 @@ public class LilithBoss extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lilith/LilithEliteShaman.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lilith/LilithEliteShaman.java
index bfe6a2aff9..cdd63a05f9 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lilith/LilithEliteShaman.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lilith/LilithEliteShaman.java
@@ -47,7 +47,7 @@ public class LilithEliteShaman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -60,7 +60,7 @@ public class LilithEliteShaman extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/LimitBarrier.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/LimitBarrier.java
index c13b15094e..5810ab4b9b 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/LimitBarrier.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/LimitBarrier.java
@@ -86,7 +86,7 @@ public class LimitBarrier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -115,7 +115,7 @@ public class LimitBarrier extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
index 5b16c333e2..ced833a889 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
@@ -49,7 +49,7 @@ public class KatoSicanus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
index 2bd8aeb2c6..7dacdd2c16 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
@@ -674,7 +674,7 @@ public class Lindvior extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
index 73d5d88407..f676f620a3 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
@@ -49,7 +49,7 @@ public class Vortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -110,7 +110,7 @@ public class Vortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
index 49a224c8bc..8c7d0eb77d 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
@@ -122,7 +122,7 @@ public class OctavisWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -146,7 +146,7 @@ public class OctavisWarzone extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 9a58c9f1b7..6eda44726f 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -145,7 +145,7 @@ public class Orfen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -201,7 +201,7 @@ public class Orfen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 93735c996b..72e174bb65 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -155,7 +155,7 @@ public class QueenAnt extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -239,7 +239,7 @@ public class QueenAnt extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
index 7a3322b68a..297948d172 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
@@ -53,7 +53,7 @@ public class QueenShyeed extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java
index 8304e07d78..80a048214d 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java
@@ -149,7 +149,7 @@ public class Ramona extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -377,7 +377,7 @@ public class Ramona extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
index ad87d93fe0..20e1572d8a 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
@@ -80,7 +80,7 @@ public class Sailren extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -249,7 +249,7 @@ public class Sailren extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
index 4eeb4da057..b11aa4de6a 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
@@ -73,7 +73,7 @@ public class Cannon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
index f754206b22..45b4c89ee7 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
@@ -62,7 +62,7 @@ public class TautiWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -170,7 +170,7 @@ public class TautiWarzone extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
index 50da94c8b2..f973bf0e12 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
@@ -182,7 +182,7 @@ public class TeredorWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
index 7b07413999..63b2c0589a 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
@@ -507,7 +507,7 @@ public class Stage1 extends AbstractInstance implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
index 70d36f9c61..d2abf63365 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
@@ -50,7 +50,7 @@ public class Daichir extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterEarthWyrnCave"))
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
index b771fa95a2..7d14857632 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
@@ -570,7 +570,7 @@ public class Trasken extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -694,7 +694,7 @@ public class Trasken extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index 74f7b64063..4eaf667f0a 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -191,7 +191,7 @@ public class Valakas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -380,7 +380,7 @@ public class Valakas extends AbstractNpcAI
 		{
 			BOSS_ZONE.oustAllPlayers();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
index a211f7bfc0..bae4d63898 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
@@ -172,7 +172,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter60"))
 		{
@@ -254,7 +254,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/AdenReconstructorManager.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
index f4c79ad145..21cceee6c4 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
@@ -42,7 +42,7 @@ public class AdenReconstructorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -67,7 +67,7 @@ public class AdenReconstructorManager extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
index 290fc3312f..a45b4e6186 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
@@ -141,7 +141,7 @@ public class AdventureGuildsman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
index a94b0afda2..6350b8c74b 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
@@ -74,7 +74,7 @@ public class AdventurersGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/AetherDrops.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/AetherDrops.java
index ba90e39768..175478eb17 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/AetherDrops.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/AetherDrops.java
@@ -86,7 +86,7 @@ public class AetherDrops extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) || (player != null))
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
index c5ed73b2c2..7d81da92e1 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
@@ -51,7 +51,7 @@ public class AlchemistManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index b939ece983..849ed827d3 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -63,7 +63,7 @@ public class ArenaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -128,7 +128,7 @@ public class ArenaManager extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
index 1c51b94358..352c31c8fc 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
@@ -38,7 +38,7 @@ public class BlackJudge extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("weakenBreath"))
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
index d35adf8706..e203aecd5e 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
@@ -42,7 +42,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equals("31092-01.html"))
@@ -79,7 +79,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 			giveAdena(player, count, false);
 			return "31092-04.html";
 		}
-		return super.onAdvEvent(htmltext, npc, player);
+		return super.onEvent(htmltext, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
index 6a44d63e0b..81e90f2d67 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
@@ -56,7 +56,7 @@ public class CastleAmbassador extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
index b07792cd2d..11b8786523 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
@@ -57,7 +57,7 @@ public class CastleBlacksmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return (event.equalsIgnoreCase(npc.getId() + "-02.html") && hasRights(player, npc)) ? event : null;
 	}
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
index fd579aeb9f..6e735dc2f4 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
@@ -393,7 +393,7 @@ public class CastleChamberlain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Castle castle = npc.getCastle();
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
index 8ca546336f..6b7b60f94c 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
@@ -140,7 +140,7 @@ public class CastleCourtMagician extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player.getClan() == null) && (player.getClanId() != npc.getCastle().getOwnerId()))
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
index 4c85285e05..81b947b9e8 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
@@ -72,7 +72,7 @@ public class CastleDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
index bb32dde319..a319e3977f 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
@@ -56,7 +56,7 @@ public class CastleMercenaryManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index ac71c1afad..0e8137bb1d 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -78,7 +78,7 @@ public class CastleTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
@@ -168,7 +168,7 @@ public class CastleTeleporter extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
index bffed40bcc..ea1b40c41c 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
@@ -52,7 +52,7 @@ public class CastleWarehouse extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final boolean isMyLord = player.isClanLeader() && (player.getClan().getCastleId() == (npc.getCastle() != null ? npc.getCastle().getResidenceId() : -1));
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index 8170db2b9d..d0603ecfe6 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -64,7 +64,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
index 7b5e9d8685..7c5d3ef4d6 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
@@ -57,7 +57,7 @@ public class ClanHallDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 34d06948d8..a65c7a478c 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -103,7 +103,7 @@ public class ClanHallManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
index 995fb7eb4b..372b3f02f2 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
@@ -67,7 +67,7 @@ public class ClanTrader extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 3bd250def2..df5ae2c206 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -235,7 +235,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		if (!_isEnabled)
 		{
@@ -942,7 +942,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	{
 		if (event.getCommand().startsWith("Quest ClassMaster "))
 		{
-			final String html = onAdvEvent(event.getCommand().substring(18), null, event.getPlayer());
+			final String html = onEvent(event.getCommand().substring(18), null, event.getPlayer());
 			event.getPlayer().sendPacket(TutorialCloseHtml.STATIC_PACKET);
 			showResult(event.getPlayer(), html);
 		}
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
index 21aafa7e87..7b61214c91 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
@@ -43,7 +43,7 @@ public class CrimsonHatuOtis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -69,7 +69,7 @@ public class CrimsonHatuOtis extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/DivineBeast.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/DivineBeast.java
index 1f247a7b35..3f3a076992 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/DivineBeast.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/DivineBeast.java
@@ -44,7 +44,7 @@ public class DivineBeast extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player == null) || !player.hasServitors())
 		{
@@ -55,7 +55,7 @@ public class DivineBeast extends AbstractNpcAI
 			cancelQuestTimer(event, npc, player);
 			player.getServitors().values().forEach(summon -> summon.unSummon(player));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/EnergySeeds.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/EnergySeeds.java
index 509c12bbeb..befbad7bff 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/EnergySeeds.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/EnergySeeds.java
@@ -196,7 +196,7 @@ public class EnergySeeds extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("StartSoDAi"))
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/FameManager/FameManager.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/FameManager/FameManager.java
index d4f16a9b96..b0a7bc0a20 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/FameManager/FameManager.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/FameManager/FameManager.java
@@ -49,7 +49,7 @@ public class FameManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
index 1bb90fa8af..91e07dd86d 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
@@ -69,7 +69,7 @@ public class FortressSiegeManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
index b6bbe8745a..5fbba0148f 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
@@ -91,7 +91,7 @@ public class GameAssistant extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
index 07bd61107e..c8c1d75664 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
@@ -67,7 +67,7 @@ public class HealerTrainer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
index 94b2f5f16d..2b2e0d3c40 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
@@ -89,7 +89,7 @@ public class HermuncusMinion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(eventValue, " ");
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/KastiaResearcher/KastiaResearcher.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/KastiaResearcher/KastiaResearcher.java
index 31c9abbc43..4e615f7c40 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/KastiaResearcher/KastiaResearcher.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/KastiaResearcher/KastiaResearcher.java
@@ -38,7 +38,7 @@ public class KastiaResearcher extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("exit"))
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
index 2928fbd023..abe98a50e5 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
@@ -47,7 +47,7 @@ public class LaVieEnRose extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
index 8d38a27541..6763b0367c 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
@@ -71,7 +71,7 @@ public class ManorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
index 887ab23742..1e900c4722 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
@@ -143,7 +143,7 @@ public class MentorGuide extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("exchange"))
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/Minigame/Minigame.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/Minigame/Minigame.java
index 6e48943e76..936ed15436 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/Minigame/Minigame.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/Minigame/Minigame.java
@@ -68,7 +68,7 @@ public class Minigame extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final MinigameRoom room = getRoomByManager(npc);
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
index db5f85017a..23f4dd1ddf 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
@@ -96,7 +96,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
index 4ad7e0a2fc..d3576b9fff 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
@@ -48,14 +48,14 @@ public class NornilTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("teleport_"))
 		{
 			final int locId = Integer.parseInt(event.replace("teleport_", ""));
 			player.teleToLocation(LOCATIONS[locId - 1]);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
index 8fffe28bf3..e7942b1ac1 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
@@ -64,7 +64,7 @@ public class OlyBuffer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index c52679de22..bd5561fff0 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -88,7 +88,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/PrisonGuards.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/PrisonGuards.java
index 4084beddca..c79356a1f0 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/PrisonGuards.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/PrisonGuards.java
@@ -53,7 +53,7 @@ public class PrisonGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CLEAR_STATUS"))
 		{
@@ -67,7 +67,7 @@ public class PrisonGuards extends AbstractNpcAI
 			}
 			startQuestTimer("CHECK_HOME", 30000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
index 21d281c6c9..435f293345 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
@@ -84,7 +84,7 @@ public class Proclaimer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("giveBuff"))
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
index 8b3515e12b..83098c1eaf 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
@@ -79,7 +79,7 @@ public class ProvisionalHalls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/Servitors/SinEater.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/Servitors/SinEater.java
index 1ed8d645a5..d7536614e8 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/Servitors/SinEater.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/Servitors/SinEater.java
@@ -48,7 +48,7 @@ public class SinEater extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TALK") && (player != null) && (player.getPet() != null))
 		{
@@ -79,7 +79,7 @@ public class SinEater extends AbstractNpcAI
 			}
 			startQuestTimer("TALK", 60000, null, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_CREATURE_DEATH)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
index b491443c92..1d0a70326c 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
@@ -128,7 +128,7 @@ public class SupportUnitCaptain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int fortOwner = npc.getFort().getOwnerClan() == null ? 0 : npc.getFort().getOwnerClan().getId();
 		if ((player.getClan() == null) || (player.getClanId() != fortOwner))
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
index f6d1e74529..a733b87dad 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
@@ -53,7 +53,7 @@ public class SymbolMaker extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
index f9cd32a0dd..82ec9274c2 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
@@ -94,7 +94,7 @@ public class TeleportToUndergroundColiseum extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.endsWith(".htm"))
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
index 602b1eaeaa..1c4fddee62 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
@@ -75,7 +75,7 @@ public class TersisHerald extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("giveBuff"))
 		{
@@ -87,7 +87,7 @@ public class TersisHerald extends AbstractNpcAI
 			npc.setTarget(player);
 			npc.doCast(DRAGON_BUFF.getSkill());
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
index 8e94950d76..520a057481 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
@@ -62,7 +62,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = "";
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
index 58d9b961f9..46b1f36ec8 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
@@ -87,7 +87,7 @@ public class ClassTransferTalk extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/WarriorFishingBlock.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
index 56b29fee5b..78e3d1c99e 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
@@ -75,7 +75,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -104,7 +104,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
index b9439eb0ec..a1878b037b 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
@@ -156,7 +156,7 @@ public class WeaverOlf extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.contains("_grade_"))
 		{
@@ -185,7 +185,7 @@ public class WeaverOlf extends AbstractNpcAI
 			}
 			else
 			{
-				return super.onAdvEvent(event, npc, player);
+				return super.onEvent(event, npc, player);
 			}
 			
 			if (hasQuestItems(player, itemIds[0]))
@@ -225,7 +225,7 @@ public class WeaverOlf extends AbstractNpcAI
 			{
 				return npc.getId() + "-no.htm";
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		return event;
 	}
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index 777998cde4..48bf41ab6d 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -210,7 +210,7 @@ public class WyvernManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
index 0c2e7586c9..c49be5297b 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
@@ -36,7 +36,7 @@ public class DelevelManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.DELEVEL_MANAGER_ENABLED)
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
index 5eaddb78ba..76b7f1e559 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
@@ -54,7 +54,7 @@ public class FactionSystem extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class FactionSystem extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
index 8b9c676ad5..771c8a9058 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
@@ -34,7 +34,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -77,7 +77,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 				npc.broadcastInfo(); // update flag status
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
index e26f1c10cb..9bcb5e7500 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
@@ -65,7 +65,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("AUTOBUFF") && (npc != null) && !npc.isDead())
 		{
@@ -93,7 +93,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
 			}
 			startQuestTimer("AUTOBUFF", 30000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
index f19aa0cb6f..447c512987 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
@@ -39,7 +39,7 @@ public class NoblessMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.NOBLESS_MASTER_ENABLED)
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java
index b0224852ae..bb87b3096a 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java
@@ -49,7 +49,7 @@ public class ShadowWeapons extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
index ba8d24ed64..82bb289dd9 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
@@ -160,7 +160,7 @@ public class Deathmatch extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
index 1eb84eca93..b92bbe7f77 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
@@ -213,7 +213,7 @@ public class Rabbits extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/events/Race/Race.java
index ff9fc462f6..6ac325ca6f 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/events/Race/Race.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/events/Race/Race.java
@@ -320,7 +320,7 @@ public class Race extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index f7f63590c3..06e5073b0d 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -177,7 +177,7 @@ public class TvT extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
index 77c055cc79..84a2d7763d 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
@@ -45,7 +45,7 @@ public class BirthOfDraco extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
index 9bc0ff9c55..87ac868dc7 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
@@ -64,7 +64,7 @@ public class CharacterBirthday extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("despawn_npc"))
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index a966bdff3e..4648d78f95 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -56,7 +56,7 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
index a8f534ca97..76c5aa611f 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
@@ -73,7 +73,7 @@ public class FreyaCelebration extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("give_potion"))
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
index b45e872a60..2570ef061a 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
@@ -86,7 +86,7 @@ public class GiftOfVitality extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/HappyHours/HappyHours.java
index ff0f02aa95..589a0e3a61 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/HappyHours/HappyHours.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/HappyHours/HappyHours.java
@@ -49,7 +49,7 @@ public class HappyHours extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
index aa5419e179..76aaa4ab09 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
@@ -59,7 +59,7 @@ public class HeavyMedal extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		int level = checkLevel(player);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/HungryHorse/HungryHorse.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
index 49935a9758..18454313ac 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
@@ -56,7 +56,7 @@ public class HungryHorse extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
index 6107af7f71..502fce9a30 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
@@ -55,7 +55,7 @@ public class HuntForSanta extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/LetterCollector/LetterCollector.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
index 744b1f2ae4..d87bd82b02 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
@@ -123,7 +123,7 @@ public class LetterCollector extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
index b71176a555..a42e986ee4 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
@@ -49,7 +49,7 @@ public class LoveYourGatekeeper extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
index c868fad2b3..6460eb4ab0 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
@@ -61,7 +61,7 @@ public class LoversJubilee extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmtext = event;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
index a6666bb367..5e6d36bf89 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
@@ -68,7 +68,7 @@ public class MasterOfEnchanting extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("buy_staff"))
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/RedLibra/RedLibra.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/RedLibra/RedLibra.java
index 69414f20c6..693f2efd18 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/RedLibra/RedLibra.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/RedLibra/RedLibra.java
@@ -42,7 +42,7 @@ public class RedLibra extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
index f6c714eddc..7d3462224b 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
@@ -58,7 +58,7 @@ public class RudolphsBlessing extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("rudolph_eat") && (player != null) && player.isOnline())
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
index 3d20d7e973..d9a91a8e8b 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
@@ -297,7 +297,7 @@ public class SavingSanta extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!isEventPeriod())
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
index 5c00677d25..862a8df578 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
@@ -51,7 +51,7 @@ public class ThePowerOfLove extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java
index 4256e9042d..63d91c507d 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java
@@ -45,7 +45,7 @@ public class TrainingWithDandy extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
index 48bfedc9ad..4858072b49 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
@@ -130,7 +130,7 @@ public class AltarOfShilen extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (event.equals("enterInstance"))
@@ -266,7 +266,7 @@ public class AltarOfShilen extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
index dd5aaad843..2974a29ec0 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
@@ -158,7 +158,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -273,7 +273,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
index 246a4528c4..1532a34e59 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
@@ -467,7 +467,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
index 86dfda29db..76cd0d9485 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
@@ -72,7 +72,7 @@ public class ChamberOfProphecies extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
index 15df82af50..46cd0a9b8e 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
@@ -177,7 +177,7 @@ public class ChamberOfDelusion extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CommandPost/CommandPost.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CommandPost/CommandPost.java
index ccd790bea4..7d347b4948 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CommandPost/CommandPost.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CommandPost/CommandPost.java
@@ -105,7 +105,7 @@ public class CommandPost extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
index fd5e4f3ebf..792494f135 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
@@ -114,13 +114,13 @@ public class CrystalCavernsCoralGarden extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
index 6db8525e11..46f3d2fdf6 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
@@ -79,13 +79,13 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
index c51b5d7887..121e3a89f4 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
@@ -135,13 +135,13 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
index 72d2fe0f6f..58eec2329b 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
@@ -122,7 +122,7 @@ public class DarkCloudMansion extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
index 9e06df3365..7cb1eb092a 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
@@ -43,7 +43,7 @@ public class DimensionMakkum extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = getPlayerInstance(player);
 		switch (event)
@@ -67,7 +67,7 @@ public class DimensionMakkum extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
index 605b8ebdf8..981a91d4a7 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
@@ -53,13 +53,13 @@ public class DimensionalArchon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), getRandomEntry(ARCHON_MSG)));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
index 176ee5b803..9243451cde 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
@@ -53,7 +53,7 @@ public class DimensionalTrap extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || npc.isAlikeDead())
 		{
@@ -102,7 +102,7 @@ public class DimensionalTrap extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
index f9540acaa2..de51a3efbe 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
@@ -115,7 +115,7 @@ public class DimensionalWrap extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java
index 78b78bd309..f98564693f 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java
@@ -128,7 +128,7 @@ public class EtisVanEtinaSolo extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -476,7 +476,7 @@ public class EtisVanEtinaSolo extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
index bca7be7a72..3f771a9755 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
@@ -44,7 +44,7 @@ public class EvasHiddenSpace extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
index 9d1e924426..eac1d141ed 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
@@ -189,12 +189,12 @@ public class EvilIncubator extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player);
 		if ((st == null) || !st.isStarted())
 		{
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/FallenEmperorsThrone/FallenEmperorsThrone.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/FallenEmperorsThrone/FallenEmperorsThrone.java
index 52bfd153a7..d532951274 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/FallenEmperorsThrone/FallenEmperorsThrone.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/FallenEmperorsThrone/FallenEmperorsThrone.java
@@ -78,7 +78,7 @@ public class FallenEmperorsThrone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -244,7 +244,7 @@ public class FallenEmperorsThrone extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
index 36d96d5c5f..05d3cdeec1 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
@@ -58,7 +58,7 @@ public class FortressOfTheDead extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/Fortuna/Fortuna.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/Fortuna/Fortuna.java
index 339328eea4..ef7b65659f 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/Fortuna/Fortuna.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/Fortuna/Fortuna.java
@@ -51,7 +51,7 @@ public class Fortuna extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -472,7 +472,7 @@ public class Fortuna extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
index d3e585d339..c8f6ce36e2 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
@@ -642,7 +642,7 @@ public class Kamaloka extends AbstractInstance
 	 * Handles only player's enter, single parameter - integer kamaloka index
 	 */
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
index cccdf5d51f..4db13d5b98 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
@@ -195,7 +195,7 @@ public class KartiasLabyrinth extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -268,7 +268,7 @@ public class KartiasLabyrinth extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java
index 43f0560a19..2a40325c8d 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java
@@ -57,7 +57,7 @@ public class KastiaExceptional extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -182,7 +182,7 @@ public class KastiaExceptional extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java
index fec3334290..9d8e36a352 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java
@@ -57,7 +57,7 @@ public class KastiaExtreme extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -182,7 +182,7 @@ public class KastiaExtreme extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java
index 08bb78f5a7..c045003593 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java
@@ -57,7 +57,7 @@ public class KastiaHard extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -182,7 +182,7 @@ public class KastiaHard extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java
index 43c43a7d24..52e53eeb4b 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java
@@ -57,7 +57,7 @@ public class KastiaLow extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -182,7 +182,7 @@ public class KastiaLow extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java
index c0c87b85f8..3e2c01ac98 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java
@@ -57,7 +57,7 @@ public class KastiaMedium extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -182,7 +182,7 @@ public class KastiaMedium extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java
index 233cb3c315..2b1c007a18 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java
@@ -112,7 +112,7 @@ public class KrofinNest extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.contains("enterInstance"))
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
index 896da5bd9b..5f0196d123 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
@@ -81,7 +81,7 @@ public class MysticTavern extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
index 48ee563ff5..56d62a42d1 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
@@ -81,7 +81,7 @@ public class StoryOfFreya extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance world = npc.getInstanceWorld();
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
index e21d937eb6..d1d82fe8d7 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
@@ -107,7 +107,7 @@ public class StoryOfTauti extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		switch (event)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
index 259c67ad2e..890ee0fb9f 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
@@ -66,7 +66,7 @@ public class NightmareKamaloka extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -131,7 +131,7 @@ public class NightmareKamaloka extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
index 68ff2fba1b..d91167b4bb 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
@@ -93,7 +93,7 @@ public class NornilsGarden extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (isInInstance(world))
@@ -157,7 +157,7 @@ public class NornilsGarden extends AbstractInstance
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/Nursery/Nursery.java
index 2e394a7446..9042632611 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/Nursery/Nursery.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/Nursery/Nursery.java
@@ -192,7 +192,7 @@ public class Nursery extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance instance = npc.getInstanceWorld();
 		if (isInInstance(instance))
@@ -269,7 +269,7 @@ public class Nursery extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
index 5f1d771719..64f2155310 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
@@ -105,7 +105,7 @@ public class PailakaRuneCastle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
index 3d6d27f8e1..070ecbc638 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
@@ -173,7 +173,7 @@ public class PrisonOfDarkness extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -313,7 +313,7 @@ public class PrisonOfDarkness extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java
index 820e07ec23..1a0a89d9d5 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java
@@ -63,7 +63,7 @@ public class ThroneOfHeroesGoldberg extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -173,7 +173,7 @@ public class ThroneOfHeroesGoldberg extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java
index d684727c09..d08f88b41d 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java
@@ -64,7 +64,7 @@ public class ThroneOfHeroesMaryReed extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -184,7 +184,7 @@ public class ThroneOfHeroesMaryReed extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java
index 7a502df559..4413eec5e3 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java
@@ -61,7 +61,7 @@ public class ThroneOfHeroesTauti extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -161,7 +161,7 @@ public class ThroneOfHeroesTauti extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
index 0bfb256a66..176b40ad56 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
@@ -69,7 +69,7 @@ public class Q00500_BrothersBoundInChains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
index 8facc4a8cd..6476fcc9c3 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
@@ -71,7 +71,7 @@ public class Q00511_AwlUnderFoot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
index eab4647ba2..31444f8866 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
@@ -58,7 +58,7 @@ public class Q00512_BladeUnderFoot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
index 0278e46ec2..17895d5c45 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
@@ -69,7 +69,7 @@ public class Q00726_LightWithinTheDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
index da19640964..bd744f7aaa 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
@@ -57,7 +57,7 @@ public class Q00727_HopeWithinTheDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
index 755ff509f8..42c14d342e 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
@@ -65,7 +65,7 @@ public class Q00833_DevilsTreasureTauti extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
index 6448125f2f..d2db3dae19 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
@@ -61,7 +61,7 @@ public class Q00835_PitiableMelisa extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java
index da4e516f85..6c740463ba 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java
@@ -67,7 +67,7 @@ public class Q00933_TombRaiders extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java
index 784084e18f..3f3674f408 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java
@@ -79,7 +79,7 @@ public class Q00937_ToReviveTheFishingGuild extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java
index fcaea628f2..14766f9216 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java
@@ -73,7 +73,7 @@ public class Q00938_TheFishermansOtherHobby extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java
index b8823b8e7a..dc76dc4f94 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java
@@ -88,7 +88,7 @@ public class Q10423_EmbryoStrongholdRaid extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java
index 133390e3ed..b58a5b6e94 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java
@@ -49,7 +49,7 @@ public class Q10454_FinalEmbryoApostle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10507_ObtainingNewPower/Q10507_ObtainingNewPower.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10507_ObtainingNewPower/Q10507_ObtainingNewPower.java
index b82a32b733..bfe2704249 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10507_ObtainingNewPower/Q10507_ObtainingNewPower.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10507_ObtainingNewPower/Q10507_ObtainingNewPower.java
@@ -156,7 +156,7 @@ public class Q10507_ObtainingNewPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
index 86fea11e6d..4589339a10 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
@@ -55,7 +55,7 @@ public class Q10566_BestChoice extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java
index d47e535813..6ee4c52622 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java
@@ -74,7 +74,7 @@ public class Q10575_LetsGoFishing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java
index fbe765e74c..0e131f0668 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java
@@ -62,7 +62,7 @@ public class Q10576_GlitteringWeapons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java
index 1e62f333cb..546829376d 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java
@@ -63,7 +63,7 @@ public class Q10577_TemperARustingBlade extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java
index 77b8eb101c..19bc9449dd 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java
@@ -63,7 +63,7 @@ public class Q10578_TheSoulOfASword extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java
index fc3a65c076..d7dbc2a6cb 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java
@@ -67,7 +67,7 @@ public class Q10579_ContainingTheAttributePower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/Q10589_WhereFatesIntersect.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/Q10589_WhereFatesIntersect.java
index 8fbc51b61f..ffe30f534d 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/Q10589_WhereFatesIntersect.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/Q10589_WhereFatesIntersect.java
@@ -83,7 +83,7 @@ public class Q10589_WhereFatesIntersect extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10590_ReawakenedFate/Q10590_ReawakenedFate.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10590_ReawakenedFate/Q10590_ReawakenedFate.java
index a964146f91..8d5ba113a5 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10590_ReawakenedFate/Q10590_ReawakenedFate.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10590_ReawakenedFate/Q10590_ReawakenedFate.java
@@ -80,7 +80,7 @@ public class Q10590_ReawakenedFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java
index d26c9df03e..91b8b87f2c 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java
@@ -96,7 +96,7 @@ public class Q10591_NobleMaterial extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
index b1dca4d5b3..15fc371c1a 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
@@ -55,7 +55,7 @@ public class Q10801_TheDimensionalWarpPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
index 1339720830..1b0c8d74d0 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
@@ -56,7 +56,7 @@ public class Q10802_TheDimensionalWarpPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
index 117f5cc53e..4cae513e93 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
@@ -57,7 +57,7 @@ public class Q10803_TheDimensionalWarpPart3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
index 124823783a..f16e276a8f 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
@@ -57,7 +57,7 @@ public class Q10804_TheDimensionalWarpPart4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
index a6796e0c63..b80b2b6ae5 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
@@ -57,7 +57,7 @@ public class Q10805_TheDimensionalWarpPart5 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
index d6ecba6b8e..5a8d67d930 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
@@ -56,7 +56,7 @@ public class Q10806_TheDimensionalWarpPart6 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
index 12462309a1..393bbe074c 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
@@ -56,7 +56,7 @@ public class Q10807_TheDimensionalWarpPart7 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
index a15ff25dd2..c43e0096f3 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
@@ -226,7 +226,7 @@ public class Q10811_ExaltedOneWhoFacesTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Race race = player.getRace();
 		final ClassId classId = player.getBaseTemplate().getClassId();
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
index a2b8955764..6289f55e8f 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
@@ -217,7 +217,7 @@ public class Q10817_ExaltedOneWhoOvercomesTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Race race = player.getRace();
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
index 87297bc3fe..3e698fc204 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
@@ -200,7 +200,7 @@ public class Q10823_ExaltedOneWhoShattersTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
index 095022d0e7..2ac52de7e1 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
@@ -190,7 +190,7 @@ public class Q10873_ExaltedReachingAnotherLevel extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java
index 4751c4bc46..0bcc4c7701 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java
@@ -179,7 +179,7 @@ public class Q10879_ExaltedGuideToPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java
index 75d384ed5e..8f22d049be 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java
@@ -48,7 +48,7 @@ public class Q10885_SaviorsPathDiscovery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/Q10886_SaviorsPathSearchTheRefinery.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/Q10886_SaviorsPathSearchTheRefinery.java
index 07321dc4f6..1d77571802 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/Q10886_SaviorsPathSearchTheRefinery.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/Q10886_SaviorsPathSearchTheRefinery.java
@@ -57,7 +57,7 @@ public class Q10886_SaviorsPathSearchTheRefinery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10887_SaviorsPathDemonsAndAtelia/Q10887_SaviorsPathDemonsAndAtelia.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10887_SaviorsPathDemonsAndAtelia/Q10887_SaviorsPathDemonsAndAtelia.java
index 3ef73b93e4..b11a6efc21 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10887_SaviorsPathDemonsAndAtelia/Q10887_SaviorsPathDemonsAndAtelia.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10887_SaviorsPathDemonsAndAtelia/Q10887_SaviorsPathDemonsAndAtelia.java
@@ -75,7 +75,7 @@ public class Q10887_SaviorsPathDemonsAndAtelia extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10888_SaviorsPathDefeatTheEmbryo/Q10888_SaviorsPathDefeatTheEmbryo.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10888_SaviorsPathDefeatTheEmbryo/Q10888_SaviorsPathDefeatTheEmbryo.java
index 831a013f8a..060dcac85a 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10888_SaviorsPathDefeatTheEmbryo/Q10888_SaviorsPathDefeatTheEmbryo.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10888_SaviorsPathDefeatTheEmbryo/Q10888_SaviorsPathDefeatTheEmbryo.java
@@ -76,7 +76,7 @@ public class Q10888_SaviorsPathDefeatTheEmbryo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10889_SaviorsPathFallenEmperorsThrone/Q10889_SaviorsPathFallenEmperorsThrone.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10889_SaviorsPathFallenEmperorsThrone/Q10889_SaviorsPathFallenEmperorsThrone.java
index d9d80ab1e2..092ca9dfc3 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10889_SaviorsPathFallenEmperorsThrone/Q10889_SaviorsPathFallenEmperorsThrone.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10889_SaviorsPathFallenEmperorsThrone/Q10889_SaviorsPathFallenEmperorsThrone.java
@@ -55,7 +55,7 @@ public class Q10889_SaviorsPathFallenEmperorsThrone extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10890_SaviorsPathHallOfEtina/Q10890_SaviorsPathHallOfEtina.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10890_SaviorsPathHallOfEtina/Q10890_SaviorsPathHallOfEtina.java
index eb47347335..4f81fda2bc 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10890_SaviorsPathHallOfEtina/Q10890_SaviorsPathHallOfEtina.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10890_SaviorsPathHallOfEtina/Q10890_SaviorsPathHallOfEtina.java
@@ -63,7 +63,7 @@ public class Q10890_SaviorsPathHallOfEtina extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
index 1195ba5886..333e829267 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
@@ -86,7 +86,7 @@ public class Q11024_PathOfDestinyBeginning extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
index 0626200ce8..e4a91e8cf3 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
@@ -129,7 +129,7 @@ public class Q11025_PathOfDestinyProving extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
index 9e42f6e195..e195480183 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
@@ -106,7 +106,7 @@ public class Q11026_PathOfDestinyConviction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
index b378972dac..bf88ade348 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
@@ -133,7 +133,7 @@ public class Q11027_PathOfDestinyOvercome extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/ThirdClassTransferQuest.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
index b230b12a5b..e0ee0b931a 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
@@ -133,7 +133,7 @@ public abstract class ThirdClassTransferQuest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/vehicles/AirShipController.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/vehicles/AirShipController.java
index 97ebdc0308..e6167cddfe 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/vehicles/AirShipController.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/vehicles/AirShipController.java
@@ -117,7 +117,7 @@ public abstract class AirShipController extends AbstractNpcAI
 	private static final SystemMessage SM_NEED_MORE = new SystemMessage(SystemMessageId.AN_AIRSHIP_CANNOT_BE_SUMMONED_BECAUSE_YOU_DON_T_HAVE_ENOUGH_S1).addItemName(STARSTONE);
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("summon".equalsIgnoreCase(event))
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
index 577ccc1221..a6db0e075e 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
@@ -162,7 +162,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player.isTransformed())
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
index 7ff39fb0c0..8675a7ec2c 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
@@ -51,7 +51,7 @@ public class AllianceMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!"9001-01.htm".equals(event) && (player.getClan() == null))
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
index c6283aa1cb..5ba0115c27 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
@@ -95,7 +95,7 @@ public class ClanMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LEADER_REQUIRED.containsKey(event) && !player.isClanLeader())
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/quest/Quest.java
index e2e126b748..67fab88c81 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/quest/Quest.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/quest/Quest.java
@@ -257,7 +257,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -279,7 +279,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -570,7 +570,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 			{
 				player.setSimulatedTalking(false);
 			}
-			res = onAdvEvent(event, npc, player);
+			res = onEvent(event, npc, player);
 		}
 		catch (Exception e)
 		{
@@ -1048,12 +1048,11 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 */
 	public String onDeath(Creature killer, Creature victim, QuestState qs)
 	{
-		return onAdvEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
+		return onEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
 	}
 	
 	/**
 	 * This function is called whenever a player clicks on a link in a quest dialog and whenever a timer fires.<br>
-	 * If is not overridden by a subclass, then default to the returned value of the simpler (and older) {@link #onEvent(String, QuestState)} override.<br>
 	 * If the player has a quest state, use it as parameter in the next call, otherwise return null.
 	 * @param event this parameter contains a string identifier for the event.<br>
 	 *            Generally, this string is passed directly via the link.<br>
@@ -1072,35 +1071,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 *            This parameter may be {@code null} in certain circumstances.
 	 * @return the text returned by the event (may be {@code null}, a filename or just text)
 	 */
-	public String onAdvEvent(String event, Npc npc, Player player)
-	{
-		if (player != null)
-		{
-			final QuestState qs = player.getQuestState(getName());
-			if (qs != null)
-			{
-				return onEvent(event, qs);
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * This function is called in place of {@link #onAdvEvent(String, Npc, Player)} if the former is not implemented.<br>
-	 * If a script contains both {@link #onAdvEvent(String, Npc, Player)} and this implementation, then this method will never be called unless the script's {@link #onAdvEvent(String, Npc, Player)} explicitly calls this method.
-	 * @param event this parameter contains a string identifier for the event.<br>
-	 *            Generally, this string is passed directly via the link.<br>
-	 *            For example:<br>
-	 *            <code>
-	 *            &lt;a action="bypass -h Quest 626_ADarkTwilight 31517-01.htm"&gt;hello&lt;/a&gt;
-	 *            </code><br>
-	 *            The above link sets the event variable to "31517-01.htm" for the quest 626_ADarkTwilight.<br>
-	 *            In the case of timers, this will be the name of the timer.<br>
-	 *            This parameter serves as a sort of identifier.
-	 * @param qs this parameter contains a reference to the quest state of the player who used the link or started the timer.
-	 * @return the text returned by the event (may be {@code null}, a filename or just text)
-	 */
-	public String onEvent(String event, QuestState qs)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return null;
 	}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Aden/Gallias/Gallias.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Aden/Gallias/Gallias.java
index 1a694c4224..62a9cc69f1 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Aden/Gallias/Gallias.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Aden/Gallias/Gallias.java
@@ -66,7 +66,7 @@ public class Gallias extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String[] substrings = event.split(" ");
 		if (substrings.length < 1)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java
index 3246831bf4..62d6ebb211 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java
@@ -47,7 +47,7 @@ public class Herphah extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Aden/Joachim/Joachim.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Aden/Joachim/Joachim.java
index a1f5cd1655..c54f44664d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Aden/Joachim/Joachim.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Aden/Joachim/Joachim.java
@@ -89,7 +89,7 @@ public class Joachim extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Aden/Lulu/Lulu.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Aden/Lulu/Lulu.java
index da862c18d8..7d9b1c314b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Aden/Lulu/Lulu.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Aden/Lulu/Lulu.java
@@ -58,7 +58,7 @@ public class Lulu extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("LULU_BLESSING") && (npc != null) && (npc.getId() == LULU))
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java
index 235fd9d2a3..086f8aeab5 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java
@@ -47,7 +47,7 @@ public class Penny extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java
index 2ab35f83dc..6740fe6383 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java
@@ -46,7 +46,7 @@ public class Ruine extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
index 6d5cc1c6c3..d3a66dd924 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
@@ -68,7 +68,7 @@ public class AncientArcanCity extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CHANGE_STATE"))
 		{
@@ -102,7 +102,7 @@ public class AncientArcanCity extends AbstractNpcAI
 				cat.broadcastSocialAction(2);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
index d76c158f9e..d38ceb917e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
@@ -42,7 +42,7 @@ public class Lykus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
index 4fd3e87bb7..92979a713e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
@@ -39,7 +39,7 @@ public class Mumu extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
index 3b12c5b289..5cbb54afe6 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
@@ -329,7 +329,7 @@ public class AteliaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java
index c223f26d2d..0829a26403 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java
@@ -74,7 +74,7 @@ public class AteliaRefinery extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java
index 36666c5e39..0ec0d94d61 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java
@@ -49,7 +49,7 @@ public class Leona extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
@@ -115,7 +115,7 @@ public class Leona extends AbstractNpcAI
 		{
 			player.teleToLocation(REFINERY, true);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
index c87c4e9224..a2a2891b57 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
@@ -56,7 +56,7 @@ public class BabyPets extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("HEAL") && (player != null))
 		{
@@ -78,7 +78,7 @@ public class BabyPets extends AbstractNpcAI
 				cancelQuestTimer("HEAL", null, player);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGOUT)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
index b0153ef5da..f0f610c8b9 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
@@ -56,7 +56,7 @@ public class ImprovedBabyPets extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player != null)
 		{
@@ -108,7 +108,7 @@ public class ImprovedBabyPets extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
index 6b4a147550..301899a76f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
@@ -42,7 +42,7 @@ public class Tunatun extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Belas/Belas.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Belas/Belas.java
index 74c43a1a82..d4c3218289 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Belas/Belas.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Belas/Belas.java
@@ -44,7 +44,7 @@ public class Belas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/BlackbirdCampsite/SoulSummonStone/SoulSummonStone.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/BlackbirdCampsite/SoulSummonStone/SoulSummonStone.java
index a2cb1dca5d..396341ec1a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/BlackbirdCampsite/SoulSummonStone/SoulSummonStone.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/BlackbirdCampsite/SoulSummonStone/SoulSummonStone.java
@@ -47,7 +47,7 @@ public class SoulSummonStone extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class SoulSummonStone extends AbstractNpcAI
 				return "34434-05.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/BlackbirdCampsite/TeleportDevice/TeleportDevice.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/BlackbirdCampsite/TeleportDevice/TeleportDevice.java
index de306cfe8e..66cf9096f1 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/BlackbirdCampsite/TeleportDevice/TeleportDevice.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/BlackbirdCampsite/TeleportDevice/TeleportDevice.java
@@ -44,7 +44,7 @@ public class TeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Valleria/Valleria.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Valleria/Valleria.java
index 3f8f202032..2deec1346e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Valleria/Valleria.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Valleria/Valleria.java
@@ -46,7 +46,7 @@ public class Valleria extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
index a2b4810dfa..ad01bdba4a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
@@ -46,14 +46,14 @@ public class CrumaTower extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("MESSAGE") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_GO_TO_UNDERGROUND_LV_3_USING_THE_ELEVATOR_IN_THE_BACK);
 			startQuestTimer(event, 15000, npc, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
index fe838f52cf..ba359695c2 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
@@ -77,7 +77,7 @@ public class FrightenedRagnaOrc extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
index ee5d44d59e..db9d7838fc 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
@@ -53,7 +53,7 @@ public class DragonVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("Spawn".equals(event))
 		{
@@ -104,7 +104,7 @@ public class DragonVortex extends AbstractNpcAI
 		{
 			npc.setScriptValue(0);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
index e511676cc6..5c1dc0ce44 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
@@ -53,7 +53,7 @@ public class LairOfAntharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CHECK_HOME") && (npc != null) && !npc.isDead())
 		{
@@ -67,7 +67,7 @@ public class LairOfAntharas extends AbstractNpcAI
 				npc.broadcastPacket(new ValidateLocation(npc));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
index bf46d16542..c4e625c565 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
@@ -55,7 +55,7 @@ public class LeopardDragonHachling extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && event.equals("MOVE_TO_TRANSFORM"))
 		{
@@ -77,7 +77,7 @@ public class LeopardDragonHachling extends AbstractNpcAI
 				npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, nearestLocation(npc));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
index 04396d3683..6f794f4008 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
@@ -40,13 +40,13 @@ public class MercenaryCaptain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THE_EASTERN_PART_OF_DRAGON_VALLEY_IS_MUCH_MORE_DANGEROUS_THAN_THE_WEST_BE_CAREFUL));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
index 13dfbd313b..324120327b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
@@ -61,10 +61,10 @@ public class MercenaryTeleport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		player.teleToLocation(LOCATIONS.get(event), true);
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DragonValley/Namo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
index 99057c816c..f21c497157 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
@@ -40,13 +40,13 @@ public class Namo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THIS_PLACE_SWARMS_WITH_DRAGONS_BY_DAY_AND_UNDEAD_BY_NIGHT));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
index 32c7beb400..c02404f76a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
@@ -40,13 +40,13 @@ public class Rakun extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THIS_PLACE_SWARMS_WITH_DRAGONS_BY_DAY_AND_UNDEAD_BY_NIGHT));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
index 349976c56b..cc5487971c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
@@ -72,7 +72,7 @@ public class SeparatedSoul extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LOCATIONS.containsKey(event))
 		{
@@ -98,7 +98,7 @@ public class SeparatedSoul extends AbstractNpcAI
 				return "no-items.htm";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java
index 2125fca0d8..870b8a5820 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java
@@ -50,7 +50,7 @@ public class Celestiel extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
index 8ca5f0c7d4..a3b3d2da62 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
@@ -49,7 +49,7 @@ public class AltarOfSouls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -96,7 +96,7 @@ public class AltarOfSouls extends AbstractNpcAI
 				return "33920-9.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
index 47beace94a..c82e8969f1 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
@@ -41,7 +41,7 @@ public class RemembranceTower extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("action") && npc.isScriptValue(0))
 		{
@@ -54,7 +54,7 @@ public class RemembranceTower extends AbstractNpcAI
 			npc.setScriptValue(0);
 			npc.broadcastPacket(new OnEventTrigger(EMMITER_ID, false));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
index 70d2b3547f..10d0315383 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
@@ -57,7 +57,7 @@ public class LargeCocoon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -134,7 +134,7 @@ public class LargeCocoon extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
index d4a9137f8d..20aad104b0 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
@@ -41,7 +41,7 @@ public class KrateisCube extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
index 54f813c829..c1de7e5630 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
@@ -365,7 +365,7 @@ public class TalentShow extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((event == null) || event.isEmpty())
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
index 8029a17703..20dfae5ccf 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
@@ -88,7 +88,7 @@ public class ForgeOfTheGods extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
index ff380d4515..407b1fa132 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
@@ -84,7 +84,7 @@ public class Rooney extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport") && !npc.isDecayed())
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
index a3bc5828d9..40c8ad2e0d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
@@ -87,7 +87,7 @@ public class GainakSiege extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("GAINAK_WAR"))
 		{
@@ -129,7 +129,7 @@ public class GainakSiege extends AbstractNpcAI
 				ZoneManager.getInstance().getZoneById(GAINAK_TOWN_ZONE.getId(), PeaceZone.class).setEnabled(false);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
index 27e969e0c9..955c7ddd25 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
@@ -46,7 +46,7 @@ public class Lailly extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
index 35274b2de7..ca8919593a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
@@ -128,7 +128,7 @@ public class TavernEmployee extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
index c99c7cdf42..0ff79c4f5d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
@@ -76,7 +76,7 @@ public class Apherus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("buff"))
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
index 06a75493ac..d7944dd6f3 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
@@ -40,7 +40,7 @@ public class ApherusLookout extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		if (event.equals("open_bag"))
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
index e984558e2c..0d30623e93 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
@@ -48,7 +48,7 @@ public class GardenWatchman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -78,7 +78,7 @@ public class GardenWatchman extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
index 02b6a47091..42752aea0c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
@@ -42,7 +42,7 @@ public class GenesisVines extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CAST_SKILL") && npc.isScriptValue(1))
 		{
@@ -58,7 +58,7 @@ public class GenesisVines extends AbstractNpcAI
 			npc.setScriptValue(0);
 			npc.deleteMe();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
index 3216884d13..ab0d91e3cd 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
@@ -53,7 +53,7 @@ public class Statues extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("fight"))
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java
index 33a89a6336..d901db15b1 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java
@@ -39,7 +39,7 @@ public class Eubina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
index 29ccfb6308..64246fbb51 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
@@ -46,7 +46,7 @@ public class FuryKiku extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -76,7 +76,7 @@ public class FuryKiku extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
index 7c2b546530..203f873b61 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
@@ -50,7 +50,7 @@ public class Isabella extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAWN"))
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java
index 2f731a5d38..132a96baba 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java
@@ -39,7 +39,7 @@ public class Rotoeh extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
index 0772b2e4fc..6eca04c92a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
@@ -42,7 +42,7 @@ public class GiantsCave extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Giran/Grace/Grace.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Giran/Grace/Grace.java
index 88ec90ea8f..b238ecff84 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Giran/Grace/Grace.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Giran/Grace/Grace.java
@@ -56,7 +56,7 @@ public class Grace extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("GRACE_BLESSING") && (npc != null) && (npc.getId() == GRACE))
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
index 50c14b79bb..20f3adf32d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
@@ -57,7 +57,7 @@ public class Kekropus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
index d4c54fcddd..9e41be2b4a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
@@ -82,7 +82,7 @@ public class Spirit extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -102,7 +102,7 @@ public class Spirit extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java
index a62bbab9b4..5418e91c90 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java
@@ -62,7 +62,7 @@ public class LionelHunter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs1 = player.getQuestState(Q10811_ExaltedOneWhoFacesTheLimit.class.getSimpleName());
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Heine/WrapGate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
index d42bf072bd..5a438ac325 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
@@ -40,7 +40,7 @@ public class WrapGate extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("enter_hellbound".equals(event))
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
index e49050b695..c4486b2670 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
@@ -39,7 +39,7 @@ public class LeonaBlackbird extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
index 3b1cebc30c..bd44c3481d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
@@ -60,7 +60,7 @@ public class Theorn extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
index e026f3cd57..5ef95aed5e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
@@ -47,7 +47,7 @@ public class Merlot extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
index 6ea0a0760f..14c4560f16 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
@@ -43,7 +43,7 @@ public class Zenya extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
index 2b048463f8..99e8fa6078 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
@@ -63,7 +63,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -135,7 +135,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 				npc.reduceCurrentHp(500, npc, null); // poison kills Fafurion if he is not healed
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
index 2a0a8014f8..d4dc25aab8 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
@@ -47,7 +47,7 @@ public class Rignos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -90,7 +90,7 @@ public class Rignos extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
index 43e2c64226..af4b116516 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
@@ -57,7 +57,7 @@ public class HillsOfGold extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -75,7 +75,7 @@ public class HillsOfGold extends AbstractNpcAI
 			});
 			startQuestTimer("SPICULA_AGGRO", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
index edf9416113..efaf6d6bf8 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
@@ -61,7 +61,7 @@ public class AvantGarde extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
index 37f35f00f8..ac8772d975 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
@@ -108,7 +108,7 @@ public class KetraOrcSupport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
index 6c1085f7d0..f253eadcb6 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
@@ -38,13 +38,13 @@ public class El extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_USE_THE_JUMP_BOARD_TO_GET_STRAIGHT_TO_THE_2ND_FLOOR, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
index 92b4915758..085300cd9c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
@@ -47,7 +47,7 @@ public class Erda extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
@@ -113,7 +113,7 @@ public class Erda extends AbstractNpcAI
 		{
 			player.teleToLocation(CAMILLE_LOC, true);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
index 282d7a6326..debef79252 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
@@ -58,7 +58,7 @@ public class GeneralDilios extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("command_"))
 		{
@@ -87,7 +87,7 @@ public class GeneralDilios extends AbstractNpcAI
 				startQuestTimer("guard_animation_" + (value + 1), 1500, null, null);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
index 0a84cf47a0..b4dbbc74ae 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
@@ -47,7 +47,7 @@ public class Lekon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
index e4edb350d4..3cdddadb06 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
@@ -56,7 +56,7 @@ public class LindviorScene extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -109,7 +109,7 @@ public class LindviorScene extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public void scheduleNextLindviorVisit()
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
index eedcc75645..0b50c57b06 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
@@ -57,7 +57,7 @@ public class Nottingale extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
index 975e4a2614..b0ded82d61 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
@@ -38,13 +38,13 @@ public class Plenos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_BE_TELEPORTED_TO_EACH_SEED_IF_YOU_VOLUNTEER_WHY_NOT_TRY, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
index 18f2110178..7fc2284ccb 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
@@ -46,7 +46,7 @@ public class SeedTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -75,7 +75,7 @@ public class SeedTeleportDevice extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
index 23b5c50033..c8498cbee5 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
@@ -49,7 +49,7 @@ public class MithrilMinesTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int index = Integer.parseInt(event) - 1;
 		if (LOCS.length > index)
@@ -57,7 +57,7 @@ public class MithrilMinesTeleporter extends AbstractNpcAI
 			final Location loc = LOCS[index];
 			player.teleToLocation(loc, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
index 6f4192f837..e5abb08edb 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
@@ -84,7 +84,7 @@ public class MonasteryOfSilence extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -132,7 +132,7 @@ public class MonasteryOfSilence extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
index 9a2ee10f60..434807bd9e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
@@ -62,7 +62,7 @@ public class PaganTeleporters extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
index 7eed58ebec..1c6e6ba756 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
@@ -60,7 +60,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -90,7 +90,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI
 				instanceScript.notifyEvent(event, npc, player);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
index 9d4b3bde33..781bfa3af3 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
@@ -39,13 +39,13 @@ public class Fioren extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("startMovie"))
 		{
 			playMovie(player, Movie.SI_BARLOG_STORY);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
index 5ffc401682..6a166ec683 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
@@ -74,7 +74,7 @@ public class Kaysen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
index 619d9e57f4..ceb8d8a7b9 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
@@ -63,7 +63,7 @@ public class NervasTemporaryPrison extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
index b8b803e57f..43691cef06 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
@@ -38,14 +38,14 @@ public class RoAGuard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THIS_IS_RUINS_OF_AGONY_WHERE_KANILOV_IS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
index f3af67aba7..dd2a52bdc5 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
@@ -38,14 +38,14 @@ public class RoDGuard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THIS_IS_THE_RUINS_OF_AGONY_WHERE_POSLOF_IS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
index 5e57a9fb94..a19c1d4085 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
@@ -48,7 +48,7 @@ public class AltarOfSacrifice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("msg_text"))
 		{
@@ -68,7 +68,7 @@ public class AltarOfSacrifice extends AbstractNpcAI
 			startQuestTimer("msg_text", 135000, npc, null);
 			_jenas_guard.setScriptValue(0);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java
index e2a2dba97f..96e17ec39b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java
@@ -50,7 +50,7 @@ public class Roiental extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterGoldberg"))
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
index a025e62542..b50f530164 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
@@ -147,7 +147,7 @@ public class Venom extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Rune/SwampOfScreams/SwampOfScreamsSiege.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Rune/SwampOfScreams/SwampOfScreamsSiege.java
index 5eacdf1f03..d6cf38175b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Rune/SwampOfScreams/SwampOfScreamsSiege.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Rune/SwampOfScreams/SwampOfScreamsSiege.java
@@ -79,7 +79,7 @@ public class SwampOfScreamsSiege extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -116,7 +116,7 @@ public class SwampOfScreamsSiege extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
index ed4ce2d782..cd89ebcb9e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
@@ -43,7 +43,7 @@ public class Klemis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("portInside"))
 		{
@@ -56,7 +56,7 @@ public class Klemis extends AbstractNpcAI
 				return "32734-01.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
index d66782538a..c1db3c8180 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
@@ -80,7 +80,7 @@ public class Maguen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || (player == null))
 		{
@@ -163,7 +163,7 @@ public class Maguen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
index 344d65a44f..d5ab73ff74 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
@@ -48,7 +48,7 @@ public class Nemo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
index 251458ea98..ae26a6c701 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
@@ -297,7 +297,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("ChangeSeedsStatus"))
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
index d6f644fa86..765deb4a7d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
@@ -51,7 +51,7 @@ public class Seyo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (npc == null)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
index ebf70cc5ae..6ba58ffc8e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
@@ -197,7 +197,7 @@ public class StakatoNest extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || (player == null) || npc.isDead())
 		{
@@ -225,7 +225,7 @@ public class StakatoNest extends AbstractNpcAI
 			addAttackPlayerDesire(spawned, player);
 			npc.deleteMe();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private static Monster checkMinion(Npc npc)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
index 356608d0fc..49a25ec26b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
@@ -47,7 +47,7 @@ public class StakatoNestTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int index = Integer.parseInt(event) - 1;
 		if (LOCS.length > index)
@@ -65,7 +65,7 @@ public class StakatoNestTeleporter extends AbstractNpcAI
 			}
 			player.teleToLocation(loc, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
index 4a64afbd00..ba580c2dad 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
@@ -44,7 +44,7 @@ public class Apprentice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("rideKukuru"))
 		{
@@ -61,7 +61,7 @@ public class Apprentice extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TRY_RIDING_A_KUKURI, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
index 4a9603c4c4..40f728b4bc 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
@@ -95,7 +95,7 @@ public class AwakeningMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		if (qs == null)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
index cd6185a888..8ed7701c68 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
@@ -38,7 +38,7 @@ public class Banette extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
@@ -62,7 +62,7 @@ public class Banette extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
index 87e0629227..858331ae3e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
@@ -38,13 +38,13 @@ public class Bink extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TALKING_ISLAND_VILLAGE_IS_REALLY_BEAUTIFUL, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
index a8d2292f76..f37ea8e8b8 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
@@ -45,7 +45,7 @@ public class BoyAndGirl extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_CHANGEWEAP"))
 		{
@@ -66,7 +66,7 @@ public class BoyAndGirl extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, npc.getId() == BOY ? NpcStringId.WOW_2 : NpcStringId.BOYS_ARE_SO_ANNOYING);
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
index ff53080809..22d19b3496 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
@@ -41,7 +41,7 @@ public class Devno extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -74,7 +74,7 @@ public class Devno extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
index a4f08b8c99..18c04b2e7e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
@@ -42,7 +42,7 @@ public class DrillSergeant extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SOCIAL_SHOW"))
 		{
@@ -66,7 +66,7 @@ public class DrillSergeant extends AbstractNpcAI
 				npc.broadcastSocialAction(socialActionId);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
index 8e3f9e5943..83363ef157 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
@@ -41,7 +41,7 @@ public class Eleve extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Eleve extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
index b8863b9963..114728632b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
@@ -44,13 +44,13 @@ public class Gagabu extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, GAGABU_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
index 44dab7df42..d490504792 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
@@ -38,14 +38,14 @@ public class Galad extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSocialAction(3);
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.OCCASIONALLY_RARE_JEWELS_OF_GIANTS_ARE_DISCOVERED_IN_THE_BEACH, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
index a0c7f71816..3a56943e20 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
@@ -52,7 +52,7 @@ public class GiantSoldiers extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
index a703c40323..b94d2f9624 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
@@ -38,7 +38,7 @@ public class GuardSoldier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -49,7 +49,7 @@ public class GuardSoldier extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(2);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
index b26d9fd748..1b0dd65c82 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
@@ -43,7 +43,7 @@ public class Hadel extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
index bdb70d1f2d..d7ff70d9a0 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
@@ -38,7 +38,7 @@ public class Handermonkey extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE") && (npc != null))
 		{
@@ -54,7 +54,7 @@ public class Handermonkey extends AbstractNpcAI
 				npc.broadcastSocialAction(9);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
index 6874a606ec..f48b530d56 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
@@ -61,7 +61,7 @@ public class Hardin extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = getHtmlMessage(player);
 		if (htmltext != null)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
index a8bded51f1..536ee7f5cd 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
@@ -58,7 +58,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("HARNAK_SPAWN"))
 		{
@@ -70,7 +70,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
 				_templates.forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName), null));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private static class zoneInfo
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
index 3c2080e85a..03dca71bb5 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
@@ -55,13 +55,13 @@ public class HurnakMobMsg extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("ATTACK"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomEntry(ON_ATTACK_MSG));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
index 81f6617329..7055381eab 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
@@ -38,14 +38,14 @@ public class Hera extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomBoolean() ? NpcStringId.DOES_THE_GODDESS_SEE_WHAT_SHE_HAS_DONE : NpcStringId.WHY_HAVE_THE_HEROES_ABANDONED_US);
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
index 7003ad014d..2b6a1a1e51 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
@@ -38,7 +38,7 @@ public class Heymond extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
@@ -62,7 +62,7 @@ public class Heymond extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
index 52ce99be7f..8033f3c1ec 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
@@ -38,7 +38,7 @@ public class Holly extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -48,7 +48,7 @@ public class Holly extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(6);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
index 3f9141b931..e11490debc 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
@@ -41,7 +41,7 @@ public class Karonf extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Karonf extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
index 597cfd80f2..c102b0cc4c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
@@ -44,7 +44,7 @@ public class Luderic extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -54,7 +54,7 @@ public class Luderic extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(1);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
index 0c07720a0a..08de6143f0 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
@@ -45,13 +45,13 @@ public class Lumi extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, LUMI_SHOUT[getRandom(3)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
index 68b2789416..3bdb8de60b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
@@ -38,13 +38,13 @@ public class Mahram extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.ALCHEMY_IS_A_SCIENCE_AND_AN_ART, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
index e00fd6c98c..85117713a0 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
@@ -38,13 +38,13 @@ public class Mai extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EVERY_RACE_BUILT_A_PIECE_OF_THIS_VILLAGE, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
index dcd47a9822..2d44f1568a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
@@ -38,13 +38,13 @@ public class MarinSmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.HMM_IS_THIS_STILL_A_DECENT_WEAPON, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
index d5e5496e16..0d4e8f79e3 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
@@ -41,7 +41,7 @@ public class Marsha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Marsha extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
index aa9eb0eb87..81bc246742 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
@@ -43,7 +43,7 @@ public class Milia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("gludioAirship"))
 		{
@@ -53,7 +53,7 @@ public class Milia extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SPEAK_WITH_ME_ABOUT_TRAVELING_AROUND_ADEN, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
index b1e037eb5a..933c139b8c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
@@ -64,7 +64,7 @@ public class MonkOfChaos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
index f6cd83883a..0bedb09eb6 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
@@ -41,7 +41,7 @@ public class Morgan extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Morgan extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
index e7ce45a4e5..fd5e025cd2 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
@@ -40,7 +40,7 @@ public class Oris extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SOCIAL_ACTION_1"))
 		{
@@ -55,7 +55,7 @@ public class Oris extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_HAVEN_T_FELT_THIS_GOOD_IN_AGES, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
index 629e695955..bc23f8bd49 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
@@ -46,7 +46,7 @@ public class Pantheon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
index 8923f048b6..109864aff4 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
@@ -149,7 +149,7 @@ public class Raina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
index 4c8862c733..8d66a71766 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
@@ -41,7 +41,7 @@ public class Rubentis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Rubentis extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
index d5c86cee97..87e1df4a6b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
@@ -38,14 +38,14 @@ public class Ruks extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomBoolean() ? NpcStringId.THE_SEVEN_SIGNS_ENDED : NpcStringId.WE_NEED_TO_FIND_HER_WEAKNESS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
index cc9a63c666..880532e52c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
@@ -38,13 +38,13 @@ public class Sebion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TIS_A_SCRATCH, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
index fa3cc06633..4b05120bde 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
@@ -38,13 +38,13 @@ public class Shannon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.LOOK_AT_ALL_THE_NEWBIES_HA_HA_HA, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
index 219ac48515..7fd067c374 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
@@ -44,13 +44,13 @@ public class Sodian extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, SODIAN_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
index e11dfb9aaf..8413c93bc8 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
@@ -44,13 +44,13 @@ public class Stiller extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, STILLER_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
index b10f044196..d196091a8e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
@@ -38,13 +38,13 @@ public class Theodore extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.AND_NOW_YOUR_JOURNEY_BEGINS, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
index 4290aa8fc6..8e4f8ed738 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
@@ -38,7 +38,7 @@ public class TomaJunior extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -49,7 +49,7 @@ public class TomaJunior extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(6);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
index c3aa031317..78ce6f2c8c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
@@ -38,7 +38,7 @@ public class TrainningSoldier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -55,7 +55,7 @@ public class TrainningSoldier extends AbstractNpcAI
 			}
 			startQuestTimer("START_ATTACK", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
index 8dcdee6738..6e42cbe630 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
@@ -64,7 +64,7 @@ public class Trandon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String[] substrings = event.split(" ");
 		if (substrings.length < 1)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
index 8cd3cd965d..b65bd9a7ad 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
@@ -42,7 +42,7 @@ public class YeSagiraGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -56,7 +56,7 @@ public class YeSagiraGuards extends AbstractNpcAI
 			}
 			startQuestTimer("GUARD_AGGRO", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
index 5fb219dcef..77b212f1af 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
@@ -84,7 +84,7 @@ public class YeSegiraTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LOCATIONS.containsKey(event))
 		{
@@ -107,7 +107,7 @@ public class YeSegiraTeleportDevice extends AbstractNpcAI
 				// }
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_PLAYER_CREATE)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TowerOfInsolence/WatchmenBosses.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TowerOfInsolence/WatchmenBosses.java
index 96d9375763..b1feb81810 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TowerOfInsolence/WatchmenBosses.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TowerOfInsolence/WatchmenBosses.java
@@ -81,7 +81,7 @@ public class WatchmenBosses extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
index 2c8e967539..4bb6be2086 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
@@ -40,7 +40,7 @@ public class Acateo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("give_circlet"))
 		{
@@ -51,7 +51,7 @@ public class Acateo extends AbstractNpcAI
 			giveItems(player, ACADEMY_CIRCLET, 1);
 			return "33905-2.html";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
index 949fb8f279..48ca778074 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
@@ -108,7 +108,7 @@ public class VarkaSilenosSupport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
index b7fb571500..3a94d3d378 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
@@ -43,7 +43,7 @@ public class ElmoredenServantsGhost extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("teleport1") || event.equals("teleport2"))
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
index 427084ea7a..150fee7dfb 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
@@ -83,7 +83,7 @@ public class Wastelands extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || !npc.isSpawned())
 		{
@@ -184,7 +184,7 @@ public class Wastelands extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
index 61678a5cb2..5e24c8040c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
@@ -47,7 +47,7 @@ public class ZealotOfShilen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -75,7 +75,7 @@ public class ZealotOfShilen extends AbstractNpcAI
 			}
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
index 2da266ca0e..ab6a6ebc3e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
@@ -38,14 +38,14 @@ public class Commando extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.WE_RE_COLLECTING_SEEKER_OF_ADEN);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Anais/Anais.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Anais/Anais.java
index 74fe879672..823d08142f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Anais/Anais.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Anais/Anais.java
@@ -75,7 +75,7 @@ public class Anais extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -134,7 +134,7 @@ public class Anais extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
index 3be16633a2..91d8d0b84c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
@@ -114,7 +114,7 @@ public class Anakim extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -187,7 +187,7 @@ public class Anakim extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Anakim/AnakimBoss.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Anakim/AnakimBoss.java
index e082cf6354..d3b785f7e1 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Anakim/AnakimBoss.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Anakim/AnakimBoss.java
@@ -51,7 +51,7 @@ public class AnakimBoss extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -64,7 +64,7 @@ public class AnakimBoss extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Anakim/AnakimElitePriest.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Anakim/AnakimElitePriest.java
index 21f3ff12cb..8511577c7b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Anakim/AnakimElitePriest.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Anakim/AnakimElitePriest.java
@@ -46,7 +46,7 @@ public class AnakimElitePriest extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -59,7 +59,7 @@ public class AnakimElitePriest extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index 716ff9c974..cc85be84fd 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -111,7 +111,7 @@ public class Antharas extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 6aa670a2de..5fe20e9fa4 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -162,7 +162,7 @@ public class Baium extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -471,7 +471,7 @@ public class Baium extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
index 992eae3c7c..7bea095520 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
@@ -105,7 +105,7 @@ public class BalokWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -115,7 +115,7 @@ public class BalokWarzone extends AbstractInstance
 				takeItems(player, PRISON_KEY, -1);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
index a08ba5051e..e1763cf7ca 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
@@ -81,7 +81,7 @@ public class BaylorWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.contains("enterInstance"))
 		{
@@ -137,7 +137,7 @@ public class BaylorWarzone extends AbstractInstance
 				player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index b5a24845bb..3748875859 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -126,7 +126,7 @@ public class Beleth extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -536,7 +536,7 @@ public class Beleth extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
index e2770b5bec..b768e563e9 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
@@ -49,7 +49,7 @@ public class Wormhole extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Camille/Camille.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Camille/Camille.java
index 24757df47d..ee0ad1539f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Camille/Camille.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Camille/Camille.java
@@ -54,7 +54,7 @@ public class Camille extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class Camille extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Core/Core.java
index 344ad52a0a..34584c31c3 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -143,7 +143,7 @@ public class Core extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
@@ -162,7 +162,7 @@ public class Core extends AbstractNpcAI
 			_minions.forEach(Attackable::decayMe);
 			_minions.clear();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Cyrax/Cyrax.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Cyrax/Cyrax.java
index 3cf963c685..b5a3be172b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Cyrax/Cyrax.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Cyrax/Cyrax.java
@@ -48,7 +48,7 @@ public class Cyrax extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -61,7 +61,7 @@ public class Cyrax extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Cyrax/TempleEliteWizard.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Cyrax/TempleEliteWizard.java
index 1b68f87df9..33d0e6b941 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Cyrax/TempleEliteWizard.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Cyrax/TempleEliteWizard.java
@@ -44,7 +44,7 @@ public class TempleEliteWizard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleEliteWizard extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/ChoirOfDarkness.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/ChoirOfDarkness.java
index c07620df2f..22735a6228 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/ChoirOfDarkness.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/ChoirOfDarkness.java
@@ -44,7 +44,7 @@ public class ChoirOfDarkness extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class ChoirOfDarkness extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/Etina.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/Etina.java
index 21647bc333..3f20e07ce9 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/Etina.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/Etina.java
@@ -47,7 +47,7 @@ public class Etina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -60,7 +60,7 @@ public class Etina extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
index 3691975b20..8abe1df6cc 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
@@ -348,7 +348,7 @@ public class EtisVanEtina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -515,7 +515,7 @@ public class EtisVanEtina extends AbstractNpcAI
 			}
 			
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private void clean()
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleDarkJudge.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleDarkJudge.java
index 609abafe5c..c89586710f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleDarkJudge.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleDarkJudge.java
@@ -44,7 +44,7 @@ public class GreatTempleDarkJudge extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class GreatTempleDarkJudge extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleSoulGuide.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleSoulGuide.java
index 7ffe33d918..a08a1c79c2 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleSoulGuide.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleSoulGuide.java
@@ -44,7 +44,7 @@ public class GreatTempleSoulGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class GreatTempleSoulGuide extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/JudgeOfHeresy.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/JudgeOfHeresy.java
index acfba50e7d..a9e53959c5 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/JudgeOfHeresy.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/JudgeOfHeresy.java
@@ -44,7 +44,7 @@ public class JudgeOfHeresy extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class JudgeOfHeresy extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/Kain.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/Kain.java
index 8c81abebe3..7b910760fd 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/Kain.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/Kain.java
@@ -46,7 +46,7 @@ public class Kain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -59,7 +59,7 @@ public class Kain extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/LiberatorOfLust.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/LiberatorOfLust.java
index 081d00456a..628d8f4399 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/LiberatorOfLust.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/LiberatorOfLust.java
@@ -44,7 +44,7 @@ public class LiberatorOfLust extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class LiberatorOfLust extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/SeekerOfDespair.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/SeekerOfDespair.java
index 4cb190b064..b9fadc44ad 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/SeekerOfDespair.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/SeekerOfDespair.java
@@ -44,7 +44,7 @@ public class SeekerOfDespair extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class SeekerOfDespair extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/SoulDestroyer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/SoulDestroyer.java
index defafa1d95..7382c7e319 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/SoulDestroyer.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/SoulDestroyer.java
@@ -44,7 +44,7 @@ public class SoulDestroyer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class SoulDestroyer extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleArchon.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleArchon.java
index ba2d56ecf9..85dc410977 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleArchon.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleArchon.java
@@ -44,7 +44,7 @@ public class TempleArchon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleArchon extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleDarkWizard.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleDarkWizard.java
index c92187c67e..ff892ea50e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleDarkWizard.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleDarkWizard.java
@@ -44,7 +44,7 @@ public class TempleDarkWizard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleDarkWizard extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleFlameMaster.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleFlameMaster.java
index 57a930ddd5..341a3663b7 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleFlameMaster.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleFlameMaster.java
@@ -44,7 +44,7 @@ public class TempleFlameMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleFlameMaster extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleHighPriest.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleHighPriest.java
index df735b07c3..df68ee43c3 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleHighPriest.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleHighPriest.java
@@ -44,7 +44,7 @@ public class TempleHighPriest extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleHighPriest extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Fafurion/EliteWizard.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Fafurion/EliteWizard.java
index e776d5739f..2b85d8c0e0 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Fafurion/EliteWizard.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Fafurion/EliteWizard.java
@@ -44,7 +44,7 @@ public class EliteWizard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class EliteWizard extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
index 952cbab1be..fac0d6d7e7 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
@@ -104,7 +104,7 @@ public class Fafurion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Fafurion/FafurionBoss.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Fafurion/FafurionBoss.java
index d297cd7906..eb953be1a0 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Fafurion/FafurionBoss.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Fafurion/FafurionBoss.java
@@ -60,7 +60,7 @@ public class FafurionBoss extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -73,7 +73,7 @@ public class FafurionBoss extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
index 639cabcd8c..e7e800d352 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
@@ -63,7 +63,7 @@ public class IceQueensCastle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -113,7 +113,7 @@ public class IceQueensCastle extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
index 0f1883b1e5..4c73370ec5 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
@@ -157,7 +157,7 @@ public class IceQueensCastleBattle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterEasy"))
 		{
@@ -677,7 +677,7 @@ public class IceQueensCastleBattle extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
index 0e6e22d234..cd834bb356 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
@@ -43,7 +43,7 @@ public class Jinia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
index b35f206b93..ef19ab4287 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
@@ -165,7 +165,7 @@ public class LastImperialTomb extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
index 282b9f8fbc..254c891bc5 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
@@ -62,7 +62,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Helios/Helios.java
index d6de973ec6..8288e0626c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Helios/Helios.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Helios/Helios.java
@@ -320,7 +320,7 @@ public class Helios extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Helios/Helios1.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Helios/Helios1.java
index 7eb394719d..5d2364fbc0 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Helios/Helios1.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Helios/Helios1.java
@@ -45,7 +45,7 @@ public class Helios1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -58,7 +58,7 @@ public class Helios1 extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Helios/Helios2.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Helios/Helios2.java
index 2147bd52c0..abe0cc400e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Helios/Helios2.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Helios/Helios2.java
@@ -45,7 +45,7 @@ public class Helios2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -58,7 +58,7 @@ public class Helios2 extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Helios/Helios3.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Helios/Helios3.java
index 364dce85de..8e293ad2a4 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Helios/Helios3.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Helios/Helios3.java
@@ -46,7 +46,7 @@ public class Helios3 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -59,7 +59,7 @@ public class Helios3 extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java
index 404237e0fa..29b64fa20b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java
@@ -44,7 +44,7 @@ public class RoyalArchmageMinion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class RoyalArchmageMinion extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
index e4260628ce..d61884c91b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
@@ -92,7 +92,7 @@ public class IstinaCavern extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance instance = npc.getInstanceWorld();
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
index 27728f34c1..f1945e2def 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
@@ -40,7 +40,7 @@ public class Rumiese extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
index b94d17f47b..ae0e6aaef9 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
@@ -141,7 +141,7 @@ public class Kelbim extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -281,7 +281,7 @@ public class Kelbim extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
index 9f677053b2..c3e066a466 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
@@ -137,7 +137,7 @@ public class KimerianCommon extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance instance = npc.getInstanceWorld();
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
index 3f5ddf199c..57580cb51f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
@@ -113,7 +113,7 @@ public class Lilith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -187,7 +187,7 @@ public class Lilith extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lilith/LilithBoss.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lilith/LilithBoss.java
index e0d6b0f02c..9ce319723c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lilith/LilithBoss.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lilith/LilithBoss.java
@@ -51,7 +51,7 @@ public class LilithBoss extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -64,7 +64,7 @@ public class LilithBoss extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lilith/LilithEliteShaman.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lilith/LilithEliteShaman.java
index bfe6a2aff9..cdd63a05f9 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lilith/LilithEliteShaman.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lilith/LilithEliteShaman.java
@@ -47,7 +47,7 @@ public class LilithEliteShaman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -60,7 +60,7 @@ public class LilithEliteShaman extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/LimitBarrier.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/LimitBarrier.java
index c13b15094e..5810ab4b9b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/LimitBarrier.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/LimitBarrier.java
@@ -86,7 +86,7 @@ public class LimitBarrier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -115,7 +115,7 @@ public class LimitBarrier extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
index 5b16c333e2..ced833a889 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
@@ -49,7 +49,7 @@ public class KatoSicanus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
index 2bd8aeb2c6..7dacdd2c16 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
@@ -674,7 +674,7 @@ public class Lindvior extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
index 73d5d88407..f676f620a3 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
@@ -49,7 +49,7 @@ public class Vortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -110,7 +110,7 @@ public class Vortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
index 49a224c8bc..8c7d0eb77d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
@@ -122,7 +122,7 @@ public class OctavisWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -146,7 +146,7 @@ public class OctavisWarzone extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 9a58c9f1b7..6eda44726f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -145,7 +145,7 @@ public class Orfen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -201,7 +201,7 @@ public class Orfen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 3df78117dd..b2beaccdda 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -79,7 +79,7 @@ public class QueenAnt extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -106,7 +106,7 @@ public class QueenAnt extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
index 7a3322b68a..297948d172 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
@@ -53,7 +53,7 @@ public class QueenShyeed extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java
index 8304e07d78..80a048214d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java
@@ -149,7 +149,7 @@ public class Ramona extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -377,7 +377,7 @@ public class Ramona extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
index ad87d93fe0..20e1572d8a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
@@ -80,7 +80,7 @@ public class Sailren extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -249,7 +249,7 @@ public class Sailren extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
index 4eeb4da057..b11aa4de6a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
@@ -73,7 +73,7 @@ public class Cannon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
index f754206b22..45b4c89ee7 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
@@ -62,7 +62,7 @@ public class TautiWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -170,7 +170,7 @@ public class TautiWarzone extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
index 50da94c8b2..f973bf0e12 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
@@ -182,7 +182,7 @@ public class TeredorWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
index 7b07413999..63b2c0589a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
@@ -507,7 +507,7 @@ public class Stage1 extends AbstractInstance implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
index 70d36f9c61..d2abf63365 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
@@ -50,7 +50,7 @@ public class Daichir extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterEarthWyrnCave"))
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
index b771fa95a2..7d14857632 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
@@ -570,7 +570,7 @@ public class Trasken extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -694,7 +694,7 @@ public class Trasken extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index 74f7b64063..4eaf667f0a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -191,7 +191,7 @@ public class Valakas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -380,7 +380,7 @@ public class Valakas extends AbstractNpcAI
 		{
 			BOSS_ZONE.oustAllPlayers();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
index a211f7bfc0..bae4d63898 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
@@ -172,7 +172,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter60"))
 		{
@@ -254,7 +254,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/AdenReconstructorManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
index f4c79ad145..21cceee6c4 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
@@ -42,7 +42,7 @@ public class AdenReconstructorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -67,7 +67,7 @@ public class AdenReconstructorManager extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
index 290fc3312f..a45b4e6186 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
@@ -141,7 +141,7 @@ public class AdventureGuildsman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
index a94b0afda2..6350b8c74b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
@@ -74,7 +74,7 @@ public class AdventurersGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/AetherDrops.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/AetherDrops.java
index ba90e39768..175478eb17 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/AetherDrops.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/AetherDrops.java
@@ -86,7 +86,7 @@ public class AetherDrops extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) || (player != null))
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
index c5ed73b2c2..7d81da92e1 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
@@ -51,7 +51,7 @@ public class AlchemistManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index b939ece983..849ed827d3 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -63,7 +63,7 @@ public class ArenaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -128,7 +128,7 @@ public class ArenaManager extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
index 1c51b94358..352c31c8fc 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
@@ -38,7 +38,7 @@ public class BlackJudge extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("weakenBreath"))
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
index d35adf8706..e203aecd5e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
@@ -42,7 +42,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equals("31092-01.html"))
@@ -79,7 +79,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 			giveAdena(player, count, false);
 			return "31092-04.html";
 		}
-		return super.onAdvEvent(htmltext, npc, player);
+		return super.onEvent(htmltext, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
index 6a44d63e0b..81e90f2d67 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
@@ -56,7 +56,7 @@ public class CastleAmbassador extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
index b07792cd2d..11b8786523 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
@@ -57,7 +57,7 @@ public class CastleBlacksmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return (event.equalsIgnoreCase(npc.getId() + "-02.html") && hasRights(player, npc)) ? event : null;
 	}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
index fd579aeb9f..6e735dc2f4 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
@@ -393,7 +393,7 @@ public class CastleChamberlain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Castle castle = npc.getCastle();
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
index 8ca546336f..6b7b60f94c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
@@ -140,7 +140,7 @@ public class CastleCourtMagician extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player.getClan() == null) && (player.getClanId() != npc.getCastle().getOwnerId()))
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
index 4c85285e05..81b947b9e8 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
@@ -72,7 +72,7 @@ public class CastleDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
index bb32dde319..a319e3977f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
@@ -56,7 +56,7 @@ public class CastleMercenaryManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index ac71c1afad..0e8137bb1d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -78,7 +78,7 @@ public class CastleTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
@@ -168,7 +168,7 @@ public class CastleTeleporter extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
index bffed40bcc..ea1b40c41c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
@@ -52,7 +52,7 @@ public class CastleWarehouse extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final boolean isMyLord = player.isClanLeader() && (player.getClan().getCastleId() == (npc.getCastle() != null ? npc.getCastle().getResidenceId() : -1));
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index 8170db2b9d..d0603ecfe6 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -64,7 +64,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
index 7b5e9d8685..7c5d3ef4d6 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
@@ -57,7 +57,7 @@ public class ClanHallDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 34d06948d8..a65c7a478c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -103,7 +103,7 @@ public class ClanHallManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
index 995fb7eb4b..372b3f02f2 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
@@ -67,7 +67,7 @@ public class ClanTrader extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 3bd250def2..df5ae2c206 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -235,7 +235,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		if (!_isEnabled)
 		{
@@ -942,7 +942,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	{
 		if (event.getCommand().startsWith("Quest ClassMaster "))
 		{
-			final String html = onAdvEvent(event.getCommand().substring(18), null, event.getPlayer());
+			final String html = onEvent(event.getCommand().substring(18), null, event.getPlayer());
 			event.getPlayer().sendPacket(TutorialCloseHtml.STATIC_PACKET);
 			showResult(event.getPlayer(), html);
 		}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
index 21aafa7e87..7b61214c91 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
@@ -43,7 +43,7 @@ public class CrimsonHatuOtis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -69,7 +69,7 @@ public class CrimsonHatuOtis extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/DivineBeast.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/DivineBeast.java
index 1f247a7b35..3f3a076992 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/DivineBeast.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/DivineBeast.java
@@ -44,7 +44,7 @@ public class DivineBeast extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player == null) || !player.hasServitors())
 		{
@@ -55,7 +55,7 @@ public class DivineBeast extends AbstractNpcAI
 			cancelQuestTimer(event, npc, player);
 			player.getServitors().values().forEach(summon -> summon.unSummon(player));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/EinhasadStore/EinhasadStore.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/EinhasadStore/EinhasadStore.java
index 1a2343a7d4..0b8c9e9380 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/EinhasadStore/EinhasadStore.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/EinhasadStore/EinhasadStore.java
@@ -54,7 +54,7 @@ public class EinhasadStore extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/EnergySeeds.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/EnergySeeds.java
index 509c12bbeb..befbad7bff 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/EnergySeeds.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/EnergySeeds.java
@@ -196,7 +196,7 @@ public class EnergySeeds extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("StartSoDAi"))
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/FameManager/FameManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/FameManager/FameManager.java
index d4f16a9b96..b0a7bc0a20 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/FameManager/FameManager.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/FameManager/FameManager.java
@@ -49,7 +49,7 @@ public class FameManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
index 1bb90fa8af..91e07dd86d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
@@ -69,7 +69,7 @@ public class FortressSiegeManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
index b6bbe8745a..5fbba0148f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
@@ -91,7 +91,7 @@ public class GameAssistant extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
index 07bd61107e..c8c1d75664 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
@@ -67,7 +67,7 @@ public class HealerTrainer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
index 94b2f5f16d..2b2e0d3c40 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
@@ -89,7 +89,7 @@ public class HermuncusMinion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(eventValue, " ");
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/KastiaResearcher/KastiaResearcher.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/KastiaResearcher/KastiaResearcher.java
index 31c9abbc43..4e615f7c40 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/KastiaResearcher/KastiaResearcher.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/KastiaResearcher/KastiaResearcher.java
@@ -38,7 +38,7 @@ public class KastiaResearcher extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("exit"))
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
index 2928fbd023..abe98a50e5 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
@@ -47,7 +47,7 @@ public class LaVieEnRose extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
index 8d38a27541..6763b0367c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
@@ -71,7 +71,7 @@ public class ManorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
index 887ab23742..1e900c4722 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
@@ -143,7 +143,7 @@ public class MentorGuide extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("exchange"))
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/Minigame/Minigame.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/Minigame/Minigame.java
index 6e48943e76..936ed15436 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/Minigame/Minigame.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/Minigame/Minigame.java
@@ -68,7 +68,7 @@ public class Minigame extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final MinigameRoom room = getRoomByManager(npc);
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
index db5f85017a..23f4dd1ddf 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
@@ -96,7 +96,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
index 4ad7e0a2fc..d3576b9fff 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
@@ -48,14 +48,14 @@ public class NornilTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("teleport_"))
 		{
 			final int locId = Integer.parseInt(event.replace("teleport_", ""));
 			player.teleToLocation(LOCATIONS[locId - 1]);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
index 8fffe28bf3..e7942b1ac1 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
@@ -64,7 +64,7 @@ public class OlyBuffer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index c52679de22..bd5561fff0 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -88,7 +88,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/PrisonGuards.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/PrisonGuards.java
index 4084beddca..c79356a1f0 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/PrisonGuards.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/PrisonGuards.java
@@ -53,7 +53,7 @@ public class PrisonGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CLEAR_STATUS"))
 		{
@@ -67,7 +67,7 @@ public class PrisonGuards extends AbstractNpcAI
 			}
 			startQuestTimer("CHECK_HOME", 30000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
index 21d281c6c9..435f293345 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
@@ -84,7 +84,7 @@ public class Proclaimer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("giveBuff"))
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
index 8b3515e12b..83098c1eaf 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
@@ -79,7 +79,7 @@ public class ProvisionalHalls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/Servitors/SinEater.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/Servitors/SinEater.java
index 1ed8d645a5..d7536614e8 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/Servitors/SinEater.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/Servitors/SinEater.java
@@ -48,7 +48,7 @@ public class SinEater extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TALK") && (player != null) && (player.getPet() != null))
 		{
@@ -79,7 +79,7 @@ public class SinEater extends AbstractNpcAI
 			}
 			startQuestTimer("TALK", 60000, null, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_CREATURE_DEATH)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
index b491443c92..1d0a70326c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
@@ -128,7 +128,7 @@ public class SupportUnitCaptain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int fortOwner = npc.getFort().getOwnerClan() == null ? 0 : npc.getFort().getOwnerClan().getId();
 		if ((player.getClan() == null) || (player.getClanId() != fortOwner))
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
index f6d1e74529..a733b87dad 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
@@ -53,7 +53,7 @@ public class SymbolMaker extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
index f9cd32a0dd..82ec9274c2 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
@@ -94,7 +94,7 @@ public class TeleportToUndergroundColiseum extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.endsWith(".htm"))
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
index 602b1eaeaa..1c4fddee62 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
@@ -75,7 +75,7 @@ public class TersisHerald extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("giveBuff"))
 		{
@@ -87,7 +87,7 @@ public class TersisHerald extends AbstractNpcAI
 			npc.setTarget(player);
 			npc.doCast(DRAGON_BUFF.getSkill());
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
index 8e94950d76..520a057481 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
@@ -62,7 +62,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = "";
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
index 58d9b961f9..46b1f36ec8 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
@@ -87,7 +87,7 @@ public class ClassTransferTalk extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/WarriorFishingBlock.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
index 56b29fee5b..78e3d1c99e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
@@ -75,7 +75,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -104,7 +104,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java
index 1859ca1d3c..6644a0ae38 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java
@@ -66,7 +66,7 @@ public class WaterDragonEliteSupplyDrops extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) || (player != null))
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
index b9439eb0ec..a1878b037b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
@@ -156,7 +156,7 @@ public class WeaverOlf extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.contains("_grade_"))
 		{
@@ -185,7 +185,7 @@ public class WeaverOlf extends AbstractNpcAI
 			}
 			else
 			{
-				return super.onAdvEvent(event, npc, player);
+				return super.onEvent(event, npc, player);
 			}
 			
 			if (hasQuestItems(player, itemIds[0]))
@@ -225,7 +225,7 @@ public class WeaverOlf extends AbstractNpcAI
 			{
 				return npc.getId() + "-no.htm";
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		return event;
 	}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index 777998cde4..48bf41ab6d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -210,7 +210,7 @@ public class WyvernManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
index 0c2e7586c9..c49be5297b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
@@ -36,7 +36,7 @@ public class DelevelManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.DELEVEL_MANAGER_ENABLED)
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
index 5eaddb78ba..76b7f1e559 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
@@ -54,7 +54,7 @@ public class FactionSystem extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class FactionSystem extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
index 8b9c676ad5..771c8a9058 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
@@ -34,7 +34,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -77,7 +77,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 				npc.broadcastInfo(); // update flag status
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
index e26f1c10cb..9bcb5e7500 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
@@ -65,7 +65,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("AUTOBUFF") && (npc != null) && !npc.isDead())
 		{
@@ -93,7 +93,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
 			}
 			startQuestTimer("AUTOBUFF", 30000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
index f19aa0cb6f..447c512987 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
@@ -39,7 +39,7 @@ public class NoblessMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.NOBLESS_MASTER_ENABLED)
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java
index b0224852ae..bb87b3096a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java
@@ -49,7 +49,7 @@ public class ShadowWeapons extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
index ba8d24ed64..82bb289dd9 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
@@ -160,7 +160,7 @@ public class Deathmatch extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
index 1eb84eca93..b92bbe7f77 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
@@ -213,7 +213,7 @@ public class Rabbits extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/events/Race/Race.java
index ff9fc462f6..6ac325ca6f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/events/Race/Race.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/events/Race/Race.java
@@ -320,7 +320,7 @@ public class Race extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index f7f63590c3..06e5073b0d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -177,7 +177,7 @@ public class TvT extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/BalthusFestival/BalthusFestival.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/BalthusFestival/BalthusFestival.java
index a775515a71..a74a208f65 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/BalthusFestival/BalthusFestival.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/BalthusFestival/BalthusFestival.java
@@ -132,7 +132,7 @@ public class BalthusFestival extends LongTimeEvent implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!isEventPeriod())
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
index 77c055cc79..84a2d7763d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
@@ -45,7 +45,7 @@ public class BirthOfDraco extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
index 9bc0ff9c55..87ac868dc7 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
@@ -64,7 +64,7 @@ public class CharacterBirthday extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("despawn_npc"))
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/DragonSlayer/DragonSlayer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/DragonSlayer/DragonSlayer.java
index 63fd7d03f6..0cb767dde4 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/DragonSlayer/DragonSlayer.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/DragonSlayer/DragonSlayer.java
@@ -58,7 +58,7 @@ public class DragonSlayer extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equals("receive_reward"))
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/DreamMaker/DreamMaker.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/DreamMaker/DreamMaker.java
index 62f39d0166..254c91f9a8 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/DreamMaker/DreamMaker.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/DreamMaker/DreamMaker.java
@@ -54,7 +54,7 @@ public class DreamMaker extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index a966bdff3e..4648d78f95 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -56,7 +56,7 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
index a8f534ca97..76c5aa611f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
@@ -73,7 +73,7 @@ public class FreyaCelebration extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("give_potion"))
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
index b45e872a60..2570ef061a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
@@ -86,7 +86,7 @@ public class GiftOfVitality extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
index aa5419e179..76aaa4ab09 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
@@ -59,7 +59,7 @@ public class HeavyMedal extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		int level = checkLevel(player);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/HungryHorse/HungryHorse.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
index 49935a9758..18454313ac 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
@@ -56,7 +56,7 @@ public class HungryHorse extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
index 6107af7f71..502fce9a30 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
@@ -55,7 +55,7 @@ public class HuntForSanta extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/LegendsMark/LegendsMark.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/LegendsMark/LegendsMark.java
index 349cd56aff..30cdae0e69 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/LegendsMark/LegendsMark.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/LegendsMark/LegendsMark.java
@@ -216,7 +216,7 @@ public class LegendsMark extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/LetterCollector/LetterCollector.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
index 744b1f2ae4..d87bd82b02 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
@@ -123,7 +123,7 @@ public class LetterCollector extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
index b71176a555..a42e986ee4 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
@@ -49,7 +49,7 @@ public class LoveYourGatekeeper extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
index c868fad2b3..6460eb4ab0 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
@@ -61,7 +61,7 @@ public class LoversJubilee extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmtext = event;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
index a6666bb367..5e6d36bf89 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
@@ -68,7 +68,7 @@ public class MasterOfEnchanting extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("buy_staff"))
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java
index fe57b609d5..9b5c9b4432 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java
@@ -86,7 +86,7 @@ public class Eraton extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/RedLibra/RedLibra.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/RedLibra/RedLibra.java
index 69414f20c6..693f2efd18 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/RedLibra/RedLibra.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/RedLibra/RedLibra.java
@@ -42,7 +42,7 @@ public class RedLibra extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
index f6c714eddc..7d3462224b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
@@ -58,7 +58,7 @@ public class RudolphsBlessing extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("rudolph_eat") && (player != null) && player.isOnline())
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
index 3d20d7e973..d9a91a8e8b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
@@ -297,7 +297,7 @@ public class SavingSanta extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!isEventPeriod())
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/SmashItCompletely/SmashItCompletely.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/SmashItCompletely/SmashItCompletely.java
index 6feab380ee..118322c09b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/SmashItCompletely/SmashItCompletely.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/SmashItCompletely/SmashItCompletely.java
@@ -91,7 +91,7 @@ public class SmashItCompletely extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
index 5c00677d25..862a8df578 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
@@ -51,7 +51,7 @@ public class ThePowerOfLove extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java
index 4256e9042d..63d91c507d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java
@@ -45,7 +45,7 @@ public class TrainingWithDandy extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
index 48bfedc9ad..4858072b49 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
@@ -130,7 +130,7 @@ public class AltarOfShilen extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (event.equals("enterInstance"))
@@ -266,7 +266,7 @@ public class AltarOfShilen extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
index eb798bf5b8..2eef6be79b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
@@ -198,7 +198,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.contains("enterInstance"))
 		{
@@ -314,7 +314,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance
 			}
 			return null;
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
index 246a4528c4..1532a34e59 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
@@ -467,7 +467,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
index 86dfda29db..76cd0d9485 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
@@ -72,7 +72,7 @@ public class ChamberOfProphecies extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
index 15df82af50..46cd0a9b8e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
@@ -177,7 +177,7 @@ public class ChamberOfDelusion extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CommandPost/CommandPost.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CommandPost/CommandPost.java
index ccd790bea4..7d347b4948 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CommandPost/CommandPost.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CommandPost/CommandPost.java
@@ -105,7 +105,7 @@ public class CommandPost extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
index fd5e4f3ebf..792494f135 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
@@ -114,13 +114,13 @@ public class CrystalCavernsCoralGarden extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
index 6db8525e11..46f3d2fdf6 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
@@ -79,13 +79,13 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
index c51b5d7887..121e3a89f4 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
@@ -135,13 +135,13 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
index 72d2fe0f6f..58eec2329b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
@@ -122,7 +122,7 @@ public class DarkCloudMansion extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
index 9e06df3365..7cb1eb092a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
@@ -43,7 +43,7 @@ public class DimensionMakkum extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = getPlayerInstance(player);
 		switch (event)
@@ -67,7 +67,7 @@ public class DimensionMakkum extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
index 605b8ebdf8..981a91d4a7 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
@@ -53,13 +53,13 @@ public class DimensionalArchon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), getRandomEntry(ARCHON_MSG)));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
index 176ee5b803..9243451cde 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
@@ -53,7 +53,7 @@ public class DimensionalTrap extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || npc.isAlikeDead())
 		{
@@ -102,7 +102,7 @@ public class DimensionalTrap extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
index f9540acaa2..de51a3efbe 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
@@ -115,7 +115,7 @@ public class DimensionalWrap extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java
index 78b78bd309..f98564693f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java
@@ -128,7 +128,7 @@ public class EtisVanEtinaSolo extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -476,7 +476,7 @@ public class EtisVanEtinaSolo extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
index bca7be7a72..3f771a9755 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
@@ -44,7 +44,7 @@ public class EvasHiddenSpace extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
index 9d1e924426..eac1d141ed 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
@@ -189,12 +189,12 @@ public class EvilIncubator extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player);
 		if ((st == null) || !st.isStarted())
 		{
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/FallenEmperorsThrone/FallenEmperorsThrone.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/FallenEmperorsThrone/FallenEmperorsThrone.java
index 52bfd153a7..d532951274 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/FallenEmperorsThrone/FallenEmperorsThrone.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/FallenEmperorsThrone/FallenEmperorsThrone.java
@@ -78,7 +78,7 @@ public class FallenEmperorsThrone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -244,7 +244,7 @@ public class FallenEmperorsThrone extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
index 36d96d5c5f..05d3cdeec1 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
@@ -58,7 +58,7 @@ public class FortressOfTheDead extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/Fortuna/Fortuna.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/Fortuna/Fortuna.java
index 339328eea4..ef7b65659f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/Fortuna/Fortuna.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/Fortuna/Fortuna.java
@@ -51,7 +51,7 @@ public class Fortuna extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -472,7 +472,7 @@ public class Fortuna extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
index d3e585d339..c8f6ce36e2 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
@@ -642,7 +642,7 @@ public class Kamaloka extends AbstractInstance
 	 * Handles only player's enter, single parameter - integer kamaloka index
 	 */
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
index cccdf5d51f..4db13d5b98 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
@@ -195,7 +195,7 @@ public class KartiasLabyrinth extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -268,7 +268,7 @@ public class KartiasLabyrinth extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java
index 43f0560a19..2a40325c8d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java
@@ -57,7 +57,7 @@ public class KastiaExceptional extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -182,7 +182,7 @@ public class KastiaExceptional extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java
index fec3334290..9d8e36a352 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java
@@ -57,7 +57,7 @@ public class KastiaExtreme extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -182,7 +182,7 @@ public class KastiaExtreme extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java
index 08bb78f5a7..c045003593 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java
@@ -57,7 +57,7 @@ public class KastiaHard extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -182,7 +182,7 @@ public class KastiaHard extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java
index 43c43a7d24..52e53eeb4b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java
@@ -57,7 +57,7 @@ public class KastiaLow extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -182,7 +182,7 @@ public class KastiaLow extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java
index c0c87b85f8..3e2c01ac98 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java
@@ -57,7 +57,7 @@ public class KastiaMedium extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -182,7 +182,7 @@ public class KastiaMedium extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java
index 3876f168a7..c96b4b91f2 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java
@@ -148,7 +148,7 @@ public class KrofinNest extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.contains("enterInstance"))
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
index 896da5bd9b..5f0196d123 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
@@ -81,7 +81,7 @@ public class MysticTavern extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
index 48ee563ff5..56d62a42d1 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
@@ -81,7 +81,7 @@ public class StoryOfFreya extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance world = npc.getInstanceWorld();
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
index e21d937eb6..d1d82fe8d7 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
@@ -107,7 +107,7 @@ public class StoryOfTauti extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		switch (event)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
index 60c02a5734..a6461c6700 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
@@ -82,7 +82,7 @@ public class NightmareKamaloka extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.contains("enterInstance"))
 		{
@@ -146,7 +146,7 @@ public class NightmareKamaloka extends AbstractInstance
 				instance.spawnGroup("BOSSES");
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
index 68ff2fba1b..d91167b4bb 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
@@ -93,7 +93,7 @@ public class NornilsGarden extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (isInInstance(world))
@@ -157,7 +157,7 @@ public class NornilsGarden extends AbstractInstance
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/Nursery/Nursery.java
index 2e394a7446..9042632611 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/Nursery/Nursery.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/Nursery/Nursery.java
@@ -192,7 +192,7 @@ public class Nursery extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance instance = npc.getInstanceWorld();
 		if (isInInstance(instance))
@@ -269,7 +269,7 @@ public class Nursery extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
index 5f1d771719..64f2155310 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
@@ -105,7 +105,7 @@ public class PailakaRuneCastle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
index 3d6d27f8e1..070ecbc638 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
@@ -173,7 +173,7 @@ public class PrisonOfDarkness extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -313,7 +313,7 @@ public class PrisonOfDarkness extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/SpiritForest/SpiritForest.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/SpiritForest/SpiritForest.java
index 60871394ac..c31f29eccc 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/SpiritForest/SpiritForest.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/SpiritForest/SpiritForest.java
@@ -48,7 +48,7 @@ public class SpiritForest extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.contains("enterInstance"))
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java
index 820e07ec23..1a0a89d9d5 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java
@@ -63,7 +63,7 @@ public class ThroneOfHeroesGoldberg extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -173,7 +173,7 @@ public class ThroneOfHeroesGoldberg extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java
index d684727c09..d08f88b41d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java
@@ -64,7 +64,7 @@ public class ThroneOfHeroesMaryReed extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -184,7 +184,7 @@ public class ThroneOfHeroesMaryReed extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java
index 7a502df559..4413eec5e3 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java
@@ -61,7 +61,7 @@ public class ThroneOfHeroesTauti extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -161,7 +161,7 @@ public class ThroneOfHeroesTauti extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
index b3af63f941..9caa59d403 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
@@ -49,7 +49,7 @@ public class TimedHunting extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("ENTER"))
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
index 0bfb256a66..176b40ad56 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
@@ -69,7 +69,7 @@ public class Q00500_BrothersBoundInChains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
index 8facc4a8cd..6476fcc9c3 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
@@ -71,7 +71,7 @@ public class Q00511_AwlUnderFoot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
index eab4647ba2..31444f8866 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
@@ -58,7 +58,7 @@ public class Q00512_BladeUnderFoot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
index 0278e46ec2..17895d5c45 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
@@ -69,7 +69,7 @@ public class Q00726_LightWithinTheDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
index da19640964..bd744f7aaa 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
@@ -57,7 +57,7 @@ public class Q00727_HopeWithinTheDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
index 755ff509f8..42c14d342e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
@@ -65,7 +65,7 @@ public class Q00833_DevilsTreasureTauti extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
index 6448125f2f..d2db3dae19 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
@@ -61,7 +61,7 @@ public class Q00835_PitiableMelisa extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java
index da4e516f85..6c740463ba 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java
@@ -67,7 +67,7 @@ public class Q00933_TombRaiders extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java
index 784084e18f..3f3674f408 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java
@@ -79,7 +79,7 @@ public class Q00937_ToReviveTheFishingGuild extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java
index fcaea628f2..14766f9216 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java
@@ -73,7 +73,7 @@ public class Q00938_TheFishermansOtherHobby extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java
index b8823b8e7a..dc76dc4f94 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java
@@ -88,7 +88,7 @@ public class Q10423_EmbryoStrongholdRaid extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java
index 133390e3ed..b58a5b6e94 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java
@@ -49,7 +49,7 @@ public class Q10454_FinalEmbryoApostle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10507_ObtainingNewPower/Q10507_ObtainingNewPower.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10507_ObtainingNewPower/Q10507_ObtainingNewPower.java
index 167ffb6a2d..6b7e863edc 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10507_ObtainingNewPower/Q10507_ObtainingNewPower.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10507_ObtainingNewPower/Q10507_ObtainingNewPower.java
@@ -265,7 +265,7 @@ public class Q10507_ObtainingNewPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
index 86fea11e6d..4589339a10 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
@@ -55,7 +55,7 @@ public class Q10566_BestChoice extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java
index d47e535813..6ee4c52622 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java
@@ -74,7 +74,7 @@ public class Q10575_LetsGoFishing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java
index fbe765e74c..0e131f0668 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java
@@ -62,7 +62,7 @@ public class Q10576_GlitteringWeapons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java
index 1e62f333cb..546829376d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java
@@ -63,7 +63,7 @@ public class Q10577_TemperARustingBlade extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java
index 77b8eb101c..19bc9449dd 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java
@@ -63,7 +63,7 @@ public class Q10578_TheSoulOfASword extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java
index fc3a65c076..d7dbc2a6cb 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java
@@ -67,7 +67,7 @@ public class Q10579_ContainingTheAttributePower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/Q10589_WhereFatesIntersect.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/Q10589_WhereFatesIntersect.java
index 769fad70bd..4f6a0ec5a3 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/Q10589_WhereFatesIntersect.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/Q10589_WhereFatesIntersect.java
@@ -81,7 +81,7 @@ public class Q10589_WhereFatesIntersect extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10590_ReawakenedFate/Q10590_ReawakenedFate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10590_ReawakenedFate/Q10590_ReawakenedFate.java
index 897e519f49..0e3986594c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10590_ReawakenedFate/Q10590_ReawakenedFate.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10590_ReawakenedFate/Q10590_ReawakenedFate.java
@@ -78,7 +78,7 @@ public class Q10590_ReawakenedFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java
index 20a4fbf319..384943b8ec 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java
@@ -96,7 +96,7 @@ public class Q10591_NobleMaterial extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
index b1dca4d5b3..15fc371c1a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
@@ -55,7 +55,7 @@ public class Q10801_TheDimensionalWarpPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
index 1339720830..1b0c8d74d0 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
@@ -56,7 +56,7 @@ public class Q10802_TheDimensionalWarpPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
index 117f5cc53e..4cae513e93 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
@@ -57,7 +57,7 @@ public class Q10803_TheDimensionalWarpPart3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
index 124823783a..f16e276a8f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
@@ -57,7 +57,7 @@ public class Q10804_TheDimensionalWarpPart4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
index a6796e0c63..b80b2b6ae5 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
@@ -57,7 +57,7 @@ public class Q10805_TheDimensionalWarpPart5 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
index d6ecba6b8e..5a8d67d930 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
@@ -56,7 +56,7 @@ public class Q10806_TheDimensionalWarpPart6 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
index 12462309a1..393bbe074c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
@@ -56,7 +56,7 @@ public class Q10807_TheDimensionalWarpPart7 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
index 8741215b59..80744f3750 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
@@ -280,7 +280,7 @@ public class Q10811_ExaltedOneWhoFacesTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Race race = player.getRace();
 		final ClassId classId = player.getBaseTemplate().getClassId();
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
index 72475073d1..280642b277 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
@@ -271,7 +271,7 @@ public class Q10817_ExaltedOneWhoOvercomesTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Race race = player.getRace();
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
index d716acf60d..1047a52ed5 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
@@ -269,7 +269,7 @@ public class Q10823_ExaltedOneWhoShattersTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
index cf11012026..36da3fe2f0 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
@@ -263,7 +263,7 @@ public class Q10873_ExaltedReachingAnotherLevel extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java
index e41b4ef9b2..d7e67614f4 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java
@@ -263,7 +263,7 @@ public class Q10879_ExaltedGuideToPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java
index 75d384ed5e..8f22d049be 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java
@@ -48,7 +48,7 @@ public class Q10885_SaviorsPathDiscovery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/Q10886_SaviorsPathSearchTheRefinery.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/Q10886_SaviorsPathSearchTheRefinery.java
index 07321dc4f6..1d77571802 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/Q10886_SaviorsPathSearchTheRefinery.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/Q10886_SaviorsPathSearchTheRefinery.java
@@ -57,7 +57,7 @@ public class Q10886_SaviorsPathSearchTheRefinery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10887_SaviorsPathDemonsAndAtelia/Q10887_SaviorsPathDemonsAndAtelia.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10887_SaviorsPathDemonsAndAtelia/Q10887_SaviorsPathDemonsAndAtelia.java
index 3ef73b93e4..b11a6efc21 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10887_SaviorsPathDemonsAndAtelia/Q10887_SaviorsPathDemonsAndAtelia.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10887_SaviorsPathDemonsAndAtelia/Q10887_SaviorsPathDemonsAndAtelia.java
@@ -75,7 +75,7 @@ public class Q10887_SaviorsPathDemonsAndAtelia extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10888_SaviorsPathDefeatTheEmbryo/Q10888_SaviorsPathDefeatTheEmbryo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10888_SaviorsPathDefeatTheEmbryo/Q10888_SaviorsPathDefeatTheEmbryo.java
index 831a013f8a..060dcac85a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10888_SaviorsPathDefeatTheEmbryo/Q10888_SaviorsPathDefeatTheEmbryo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10888_SaviorsPathDefeatTheEmbryo/Q10888_SaviorsPathDefeatTheEmbryo.java
@@ -76,7 +76,7 @@ public class Q10888_SaviorsPathDefeatTheEmbryo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10889_SaviorsPathFallenEmperorsThrone/Q10889_SaviorsPathFallenEmperorsThrone.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10889_SaviorsPathFallenEmperorsThrone/Q10889_SaviorsPathFallenEmperorsThrone.java
index d9d80ab1e2..092ca9dfc3 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10889_SaviorsPathFallenEmperorsThrone/Q10889_SaviorsPathFallenEmperorsThrone.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10889_SaviorsPathFallenEmperorsThrone/Q10889_SaviorsPathFallenEmperorsThrone.java
@@ -55,7 +55,7 @@ public class Q10889_SaviorsPathFallenEmperorsThrone extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10890_SaviorsPathHallOfEtina/Q10890_SaviorsPathHallOfEtina.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10890_SaviorsPathHallOfEtina/Q10890_SaviorsPathHallOfEtina.java
index eb47347335..4f81fda2bc 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10890_SaviorsPathHallOfEtina/Q10890_SaviorsPathHallOfEtina.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10890_SaviorsPathHallOfEtina/Q10890_SaviorsPathHallOfEtina.java
@@ -63,7 +63,7 @@ public class Q10890_SaviorsPathHallOfEtina extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
index 1d393a166b..392e87a36c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
@@ -85,7 +85,7 @@ public class Q11024_PathOfDestinyBeginning extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
index 3adf10d05f..a30884ba9b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
@@ -125,7 +125,7 @@ public class Q11025_PathOfDestinyProving extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
index cd880b6095..7a5e251784 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
@@ -103,7 +103,7 @@ public class Q11026_PathOfDestinyConviction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
index 167116ad16..862c327076 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
@@ -131,7 +131,7 @@ public class Q11027_PathOfDestinyOvercome extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/ThirdClassTransferQuest.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
index b230b12a5b..e0ee0b931a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
@@ -133,7 +133,7 @@ public abstract class ThirdClassTransferQuest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/vehicles/AirShipController.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/vehicles/AirShipController.java
index 97ebdc0308..e6167cddfe 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/vehicles/AirShipController.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/vehicles/AirShipController.java
@@ -117,7 +117,7 @@ public abstract class AirShipController extends AbstractNpcAI
 	private static final SystemMessage SM_NEED_MORE = new SystemMessage(SystemMessageId.AN_AIRSHIP_CANNOT_BE_SUMMONED_BECAUSE_YOU_DON_T_HAVE_ENOUGH_S1).addItemName(STARSTONE);
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("summon".equalsIgnoreCase(event))
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
index 577ccc1221..a6db0e075e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
@@ -162,7 +162,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player.isTransformed())
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
index 7ff39fb0c0..8675a7ec2c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
@@ -51,7 +51,7 @@ public class AllianceMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!"9001-01.htm".equals(event) && (player.getClan() == null))
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
index c6283aa1cb..5ba0115c27 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
@@ -95,7 +95,7 @@ public class ClanMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LEADER_REQUIRED.containsKey(event) && !player.isClanLeader())
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/quest/Quest.java
index e2e126b748..67fab88c81 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/quest/Quest.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/quest/Quest.java
@@ -257,7 +257,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -279,7 +279,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -570,7 +570,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 			{
 				player.setSimulatedTalking(false);
 			}
-			res = onAdvEvent(event, npc, player);
+			res = onEvent(event, npc, player);
 		}
 		catch (Exception e)
 		{
@@ -1048,12 +1048,11 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 */
 	public String onDeath(Creature killer, Creature victim, QuestState qs)
 	{
-		return onAdvEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
+		return onEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
 	}
 	
 	/**
 	 * This function is called whenever a player clicks on a link in a quest dialog and whenever a timer fires.<br>
-	 * If is not overridden by a subclass, then default to the returned value of the simpler (and older) {@link #onEvent(String, QuestState)} override.<br>
 	 * If the player has a quest state, use it as parameter in the next call, otherwise return null.
 	 * @param event this parameter contains a string identifier for the event.<br>
 	 *            Generally, this string is passed directly via the link.<br>
@@ -1072,35 +1071,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 *            This parameter may be {@code null} in certain circumstances.
 	 * @return the text returned by the event (may be {@code null}, a filename or just text)
 	 */
-	public String onAdvEvent(String event, Npc npc, Player player)
-	{
-		if (player != null)
-		{
-			final QuestState qs = player.getQuestState(getName());
-			if (qs != null)
-			{
-				return onEvent(event, qs);
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * This function is called in place of {@link #onAdvEvent(String, Npc, Player)} if the former is not implemented.<br>
-	 * If a script contains both {@link #onAdvEvent(String, Npc, Player)} and this implementation, then this method will never be called unless the script's {@link #onAdvEvent(String, Npc, Player)} explicitly calls this method.
-	 * @param event this parameter contains a string identifier for the event.<br>
-	 *            Generally, this string is passed directly via the link.<br>
-	 *            For example:<br>
-	 *            <code>
-	 *            &lt;a action="bypass -h Quest 626_ADarkTwilight 31517-01.htm"&gt;hello&lt;/a&gt;
-	 *            </code><br>
-	 *            The above link sets the event variable to "31517-01.htm" for the quest 626_ADarkTwilight.<br>
-	 *            In the case of timers, this will be the name of the timer.<br>
-	 *            This parameter serves as a sort of identifier.
-	 * @param qs this parameter contains a reference to the quest state of the player who used the link or started the timer.
-	 * @return the text returned by the event (may be {@code null}, a filename or just text)
-	 */
-	public String onEvent(String event, QuestState qs)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return null;
 	}
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Aden/Gallias/Gallias.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Aden/Gallias/Gallias.java
index 1a694c4224..62a9cc69f1 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Aden/Gallias/Gallias.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Aden/Gallias/Gallias.java
@@ -66,7 +66,7 @@ public class Gallias extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String[] substrings = event.split(" ");
 		if (substrings.length < 1)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java
index 3246831bf4..62d6ebb211 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java
@@ -47,7 +47,7 @@ public class Herphah extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Aden/Joachim/Joachim.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Aden/Joachim/Joachim.java
index 2d671d6248..f632515d82 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Aden/Joachim/Joachim.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Aden/Joachim/Joachim.java
@@ -90,7 +90,7 @@ public class Joachim extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Aden/Lulu/Lulu.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Aden/Lulu/Lulu.java
index da862c18d8..7d9b1c314b 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Aden/Lulu/Lulu.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Aden/Lulu/Lulu.java
@@ -58,7 +58,7 @@ public class Lulu extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("LULU_BLESSING") && (npc != null) && (npc.getId() == LULU))
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java
index 235fd9d2a3..086f8aeab5 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java
@@ -47,7 +47,7 @@ public class Penny extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java
index 2ab35f83dc..6740fe6383 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java
@@ -46,7 +46,7 @@ public class Ruine extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
index 6d5cc1c6c3..d3a66dd924 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
@@ -68,7 +68,7 @@ public class AncientArcanCity extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CHANGE_STATE"))
 		{
@@ -102,7 +102,7 @@ public class AncientArcanCity extends AbstractNpcAI
 				cat.broadcastSocialAction(2);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
index d76c158f9e..d38ceb917e 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
@@ -42,7 +42,7 @@ public class Lykus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
index 4fd3e87bb7..92979a713e 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
@@ -39,7 +39,7 @@ public class Mumu extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
index 3b12c5b289..5cbb54afe6 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
@@ -329,7 +329,7 @@ public class AteliaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java
index c223f26d2d..0829a26403 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java
@@ -74,7 +74,7 @@ public class AteliaRefinery extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java
index 36666c5e39..0ec0d94d61 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java
@@ -49,7 +49,7 @@ public class Leona extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
@@ -115,7 +115,7 @@ public class Leona extends AbstractNpcAI
 		{
 			player.teleToLocation(REFINERY, true);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
index c87c4e9224..a2a2891b57 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
@@ -56,7 +56,7 @@ public class BabyPets extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("HEAL") && (player != null))
 		{
@@ -78,7 +78,7 @@ public class BabyPets extends AbstractNpcAI
 				cancelQuestTimer("HEAL", null, player);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGOUT)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
index b0153ef5da..f0f610c8b9 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
@@ -56,7 +56,7 @@ public class ImprovedBabyPets extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player != null)
 		{
@@ -108,7 +108,7 @@ public class ImprovedBabyPets extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Belas/Belas.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Belas/Belas.java
index 74c43a1a82..d4c3218289 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Belas/Belas.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Belas/Belas.java
@@ -44,7 +44,7 @@ public class Belas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/BlackbirdCampsite/SoulSummonStone/SoulSummonStone.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/BlackbirdCampsite/SoulSummonStone/SoulSummonStone.java
index a2cb1dca5d..396341ec1a 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/BlackbirdCampsite/SoulSummonStone/SoulSummonStone.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/BlackbirdCampsite/SoulSummonStone/SoulSummonStone.java
@@ -47,7 +47,7 @@ public class SoulSummonStone extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class SoulSummonStone extends AbstractNpcAI
 				return "34434-05.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/BlackbirdCampsite/TeleportDevice/TeleportDevice.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/BlackbirdCampsite/TeleportDevice/TeleportDevice.java
index de306cfe8e..66cf9096f1 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/BlackbirdCampsite/TeleportDevice/TeleportDevice.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/BlackbirdCampsite/TeleportDevice/TeleportDevice.java
@@ -44,7 +44,7 @@ public class TeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Valleria/Valleria.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Valleria/Valleria.java
index 3f8f202032..2deec1346e 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Valleria/Valleria.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Valleria/Valleria.java
@@ -46,7 +46,7 @@ public class Valleria extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Conquest/ConquestTeleportDevice/ConquestTeleportDevice.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Conquest/ConquestTeleportDevice/ConquestTeleportDevice.java
index d178ea1496..54a49a890c 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Conquest/ConquestTeleportDevice/ConquestTeleportDevice.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Conquest/ConquestTeleportDevice/ConquestTeleportDevice.java
@@ -49,7 +49,7 @@ public class ConquestTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
index a2b4810dfa..ad01bdba4a 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
@@ -46,14 +46,14 @@ public class CrumaTower extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("MESSAGE") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_GO_TO_UNDERGROUND_LV_3_USING_THE_ELEVATOR_IN_THE_BACK);
 			startQuestTimer(event, 15000, npc, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
index d4351fb749..2b7fe877ed 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
@@ -77,7 +77,7 @@ public class FrightenedRagnaOrc extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
index ee5d44d59e..db9d7838fc 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
@@ -53,7 +53,7 @@ public class DragonVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("Spawn".equals(event))
 		{
@@ -104,7 +104,7 @@ public class DragonVortex extends AbstractNpcAI
 		{
 			npc.setScriptValue(0);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
index e511676cc6..5c1dc0ce44 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
@@ -53,7 +53,7 @@ public class LairOfAntharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CHECK_HOME") && (npc != null) && !npc.isDead())
 		{
@@ -67,7 +67,7 @@ public class LairOfAntharas extends AbstractNpcAI
 				npc.broadcastPacket(new ValidateLocation(npc));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
index bf46d16542..c4e625c565 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
@@ -55,7 +55,7 @@ public class LeopardDragonHachling extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && event.equals("MOVE_TO_TRANSFORM"))
 		{
@@ -77,7 +77,7 @@ public class LeopardDragonHachling extends AbstractNpcAI
 				npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, nearestLocation(npc));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
index 323d0d2b8e..5e5fd0903c 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
@@ -40,13 +40,13 @@ public class MercenaryCaptain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THE_SOUTHERN_PART_OF_DRAGON_VALLEY_IS_MUCH_MORE_DANGEROUS_THAN_THE_NORTHERN_BE_CAREFUL));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
index 13dfbd313b..324120327b 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
@@ -61,10 +61,10 @@ public class MercenaryTeleport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		player.teleToLocation(LOCATIONS.get(event), true);
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DragonValley/Namo.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
index 99057c816c..f21c497157 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
@@ -40,13 +40,13 @@ public class Namo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THIS_PLACE_SWARMS_WITH_DRAGONS_BY_DAY_AND_UNDEAD_BY_NIGHT));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
index 32c7beb400..c02404f76a 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
@@ -40,13 +40,13 @@ public class Rakun extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THIS_PLACE_SWARMS_WITH_DRAGONS_BY_DAY_AND_UNDEAD_BY_NIGHT));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
index 349976c56b..cc5487971c 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
@@ -72,7 +72,7 @@ public class SeparatedSoul extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LOCATIONS.containsKey(event))
 		{
@@ -98,7 +98,7 @@ public class SeparatedSoul extends AbstractNpcAI
 				return "no-items.htm";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java
index 2125fca0d8..870b8a5820 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java
@@ -50,7 +50,7 @@ public class Celestiel extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
index 8ca5f0c7d4..a3b3d2da62 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
@@ -49,7 +49,7 @@ public class AltarOfSouls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -96,7 +96,7 @@ public class AltarOfSouls extends AbstractNpcAI
 				return "33920-9.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
index 47beace94a..c82e8969f1 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
@@ -41,7 +41,7 @@ public class RemembranceTower extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("action") && npc.isScriptValue(0))
 		{
@@ -54,7 +54,7 @@ public class RemembranceTower extends AbstractNpcAI
 			npc.setScriptValue(0);
 			npc.broadcastPacket(new OnEventTrigger(EMMITER_ID, false));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
index 70d2b3547f..10d0315383 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
@@ -57,7 +57,7 @@ public class LargeCocoon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -134,7 +134,7 @@ public class LargeCocoon extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
index d4a9137f8d..20aad104b0 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
@@ -41,7 +41,7 @@ public class KrateisCube extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
index 54f813c829..c1de7e5630 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
@@ -365,7 +365,7 @@ public class TalentShow extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((event == null) || event.isEmpty())
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
index 8029a17703..20dfae5ccf 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
@@ -88,7 +88,7 @@ public class ForgeOfTheGods extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
index ff380d4515..407b1fa132 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
@@ -84,7 +84,7 @@ public class Rooney extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport") && !npc.isDecayed())
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
index a3bc5828d9..40c8ad2e0d 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
@@ -87,7 +87,7 @@ public class GainakSiege extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("GAINAK_WAR"))
 		{
@@ -129,7 +129,7 @@ public class GainakSiege extends AbstractNpcAI
 				ZoneManager.getInstance().getZoneById(GAINAK_TOWN_ZONE.getId(), PeaceZone.class).setEnabled(false);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
index 27e969e0c9..955c7ddd25 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
@@ -46,7 +46,7 @@ public class Lailly extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
index 78c88e9d20..dcedb69905 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
@@ -128,7 +128,7 @@ public class TavernEmployee extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
index b61028cee0..80945feea7 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
@@ -76,7 +76,7 @@ public class Apherus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("buff"))
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
index 06a75493ac..d7944dd6f3 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
@@ -40,7 +40,7 @@ public class ApherusLookout extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		if (event.equals("open_bag"))
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
index e984558e2c..0d30623e93 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
@@ -48,7 +48,7 @@ public class GardenWatchman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -78,7 +78,7 @@ public class GardenWatchman extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
index 02b6a47091..42752aea0c 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
@@ -42,7 +42,7 @@ public class GenesisVines extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CAST_SKILL") && npc.isScriptValue(1))
 		{
@@ -58,7 +58,7 @@ public class GenesisVines extends AbstractNpcAI
 			npc.setScriptValue(0);
 			npc.deleteMe();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
index 3216884d13..ab0d91e3cd 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
@@ -53,7 +53,7 @@ public class Statues extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("fight"))
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java
index 33a89a6336..d901db15b1 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java
@@ -39,7 +39,7 @@ public class Eubina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
index 29ccfb6308..64246fbb51 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
@@ -46,7 +46,7 @@ public class FuryKiku extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -76,7 +76,7 @@ public class FuryKiku extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
index 7c2b546530..203f873b61 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
@@ -50,7 +50,7 @@ public class Isabella extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAWN"))
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java
index 2f731a5d38..132a96baba 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java
@@ -39,7 +39,7 @@ public class Rotoeh extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
index 0772b2e4fc..6eca04c92a 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
@@ -42,7 +42,7 @@ public class GiantsCave extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Giran/Grace/Grace.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Giran/Grace/Grace.java
index 88ec90ea8f..b238ecff84 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Giran/Grace/Grace.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Giran/Grace/Grace.java
@@ -56,7 +56,7 @@ public class Grace extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("GRACE_BLESSING") && (npc != null) && (npc.getId() == GRACE))
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
index 50c14b79bb..20f3adf32d 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
@@ -57,7 +57,7 @@ public class Kekropus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
index d4c54fcddd..9e41be2b4a 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
@@ -82,7 +82,7 @@ public class Spirit extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -102,7 +102,7 @@ public class Spirit extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java
index a62bbab9b4..5418e91c90 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java
@@ -62,7 +62,7 @@ public class LionelHunter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs1 = player.getQuestState(Q10811_ExaltedOneWhoFacesTheLimit.class.getSimpleName());
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Heine/WrapGate.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
index d42bf072bd..5a438ac325 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
@@ -40,7 +40,7 @@ public class WrapGate extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("enter_hellbound".equals(event))
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
index e49050b695..c4486b2670 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
@@ -39,7 +39,7 @@ public class LeonaBlackbird extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
index 3b1cebc30c..bd44c3481d 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
@@ -60,7 +60,7 @@ public class Theorn extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
index e026f3cd57..5ef95aed5e 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
@@ -47,7 +47,7 @@ public class Merlot extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
index 6ea0a0760f..14c4560f16 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
@@ -43,7 +43,7 @@ public class Zenya extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
index 2b048463f8..99e8fa6078 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
@@ -63,7 +63,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -135,7 +135,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 				npc.reduceCurrentHp(500, npc, null); // poison kills Fafurion if he is not healed
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
index 2a0a8014f8..d4dc25aab8 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
@@ -47,7 +47,7 @@ public class Rignos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -90,7 +90,7 @@ public class Rignos extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
index 43e2c64226..af4b116516 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
@@ -57,7 +57,7 @@ public class HillsOfGold extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -75,7 +75,7 @@ public class HillsOfGold extends AbstractNpcAI
 			});
 			startQuestTimer("SPICULA_AGGRO", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
index edf9416113..efaf6d6bf8 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
@@ -61,7 +61,7 @@ public class AvantGarde extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
index 37f35f00f8..ac8772d975 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
@@ -108,7 +108,7 @@ public class KetraOrcSupport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
index 6c1085f7d0..f253eadcb6 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
@@ -38,13 +38,13 @@ public class El extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_USE_THE_JUMP_BOARD_TO_GET_STRAIGHT_TO_THE_2ND_FLOOR, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
index 92b4915758..085300cd9c 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
@@ -47,7 +47,7 @@ public class Erda extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
@@ -113,7 +113,7 @@ public class Erda extends AbstractNpcAI
 		{
 			player.teleToLocation(CAMILLE_LOC, true);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
index 282d7a6326..debef79252 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
@@ -58,7 +58,7 @@ public class GeneralDilios extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("command_"))
 		{
@@ -87,7 +87,7 @@ public class GeneralDilios extends AbstractNpcAI
 				startQuestTimer("guard_animation_" + (value + 1), 1500, null, null);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
index 0a84cf47a0..b4dbbc74ae 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
@@ -47,7 +47,7 @@ public class Lekon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
index e4edb350d4..3cdddadb06 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
@@ -56,7 +56,7 @@ public class LindviorScene extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -109,7 +109,7 @@ public class LindviorScene extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public void scheduleNextLindviorVisit()
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
index eedcc75645..0b50c57b06 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
@@ -57,7 +57,7 @@ public class Nottingale extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
index 975e4a2614..b0ded82d61 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
@@ -38,13 +38,13 @@ public class Plenos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_BE_TELEPORTED_TO_EACH_SEED_IF_YOU_VOLUNTEER_WHY_NOT_TRY, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
index 18f2110178..7fc2284ccb 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
@@ -46,7 +46,7 @@ public class SeedTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -75,7 +75,7 @@ public class SeedTeleportDevice extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
index 23b5c50033..c8498cbee5 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
@@ -49,7 +49,7 @@ public class MithrilMinesTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int index = Integer.parseInt(event) - 1;
 		if (LOCS.length > index)
@@ -57,7 +57,7 @@ public class MithrilMinesTeleporter extends AbstractNpcAI
 			final Location loc = LOCS[index];
 			player.teleToLocation(loc, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
index 6f4192f837..e5abb08edb 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
@@ -84,7 +84,7 @@ public class MonasteryOfSilence extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -132,7 +132,7 @@ public class MonasteryOfSilence extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
index 9a2ee10f60..434807bd9e 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
@@ -62,7 +62,7 @@ public class PaganTeleporters extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
index 7eed58ebec..1c6e6ba756 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
@@ -60,7 +60,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -90,7 +90,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI
 				instanceScript.notifyEvent(event, npc, player);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
index 9d4b3bde33..781bfa3af3 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
@@ -39,13 +39,13 @@ public class Fioren extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("startMovie"))
 		{
 			playMovie(player, Movie.SI_BARLOG_STORY);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
index 5ffc401682..6a166ec683 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
@@ -74,7 +74,7 @@ public class Kaysen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
index 619d9e57f4..ceb8d8a7b9 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
@@ -63,7 +63,7 @@ public class NervasTemporaryPrison extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
index b8b803e57f..43691cef06 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
@@ -38,14 +38,14 @@ public class RoAGuard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THIS_IS_RUINS_OF_AGONY_WHERE_KANILOV_IS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
index f3af67aba7..dd2a52bdc5 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
@@ -38,14 +38,14 @@ public class RoDGuard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THIS_IS_THE_RUINS_OF_AGONY_WHERE_POSLOF_IS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
index 5e57a9fb94..a19c1d4085 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
@@ -48,7 +48,7 @@ public class AltarOfSacrifice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("msg_text"))
 		{
@@ -68,7 +68,7 @@ public class AltarOfSacrifice extends AbstractNpcAI
 			startQuestTimer("msg_text", 135000, npc, null);
 			_jenas_guard.setScriptValue(0);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java
index 94accd7155..1238d4fa78 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java
@@ -50,7 +50,7 @@ public class Roiental extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterGoldberg"))
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
index a025e62542..b50f530164 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
@@ -147,7 +147,7 @@ public class Venom extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Rune/SwampOfScreams/SwampOfScreamsSiege.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Rune/SwampOfScreams/SwampOfScreamsSiege.java
index beaa3f26da..5d5dbf51a1 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Rune/SwampOfScreams/SwampOfScreamsSiege.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Rune/SwampOfScreams/SwampOfScreamsSiege.java
@@ -79,7 +79,7 @@ public class SwampOfScreamsSiege extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -116,7 +116,7 @@ public class SwampOfScreamsSiege extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
index ed4ce2d782..cd89ebcb9e 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
@@ -43,7 +43,7 @@ public class Klemis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("portInside"))
 		{
@@ -56,7 +56,7 @@ public class Klemis extends AbstractNpcAI
 				return "32734-01.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
index 363f4791ef..f51135c140 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
@@ -80,7 +80,7 @@ public class Maguen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || (player == null))
 		{
@@ -163,7 +163,7 @@ public class Maguen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
index 7920796b3b..73d45190c7 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
@@ -48,7 +48,7 @@ public class Nemo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
index 251458ea98..ae26a6c701 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
@@ -297,7 +297,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("ChangeSeedsStatus"))
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
index c7e57be0dc..c2649c1f4f 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
@@ -51,7 +51,7 @@ public class Seyo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (npc == null)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
index ebf70cc5ae..6ba58ffc8e 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
@@ -197,7 +197,7 @@ public class StakatoNest extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || (player == null) || npc.isDead())
 		{
@@ -225,7 +225,7 @@ public class StakatoNest extends AbstractNpcAI
 			addAttackPlayerDesire(spawned, player);
 			npc.deleteMe();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private static Monster checkMinion(Npc npc)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
index 356608d0fc..49a25ec26b 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
@@ -47,7 +47,7 @@ public class StakatoNestTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int index = Integer.parseInt(event) - 1;
 		if (LOCS.length > index)
@@ -65,7 +65,7 @@ public class StakatoNestTeleporter extends AbstractNpcAI
 			}
 			player.teleToLocation(loc, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
index 85df8c5ecb..7ea86877bd 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
@@ -44,7 +44,7 @@ public class Apprentice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("rideKukuru"))
 		{
@@ -61,7 +61,7 @@ public class Apprentice extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TRY_RIDING_A_KUKURU, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
index 4f703220bb..e651b6d44d 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
@@ -95,7 +95,7 @@ public class AwakeningMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		if (qs == null)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
index cd6185a888..8ed7701c68 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
@@ -38,7 +38,7 @@ public class Banette extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
@@ -62,7 +62,7 @@ public class Banette extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
index 87e0629227..858331ae3e 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
@@ -38,13 +38,13 @@ public class Bink extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TALKING_ISLAND_VILLAGE_IS_REALLY_BEAUTIFUL, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
index a8d2292f76..f37ea8e8b8 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
@@ -45,7 +45,7 @@ public class BoyAndGirl extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_CHANGEWEAP"))
 		{
@@ -66,7 +66,7 @@ public class BoyAndGirl extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, npc.getId() == BOY ? NpcStringId.WOW_2 : NpcStringId.BOYS_ARE_SO_ANNOYING);
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
index ff53080809..22d19b3496 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
@@ -41,7 +41,7 @@ public class Devno extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -74,7 +74,7 @@ public class Devno extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
index a4f08b8c99..18c04b2e7e 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
@@ -42,7 +42,7 @@ public class DrillSergeant extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SOCIAL_SHOW"))
 		{
@@ -66,7 +66,7 @@ public class DrillSergeant extends AbstractNpcAI
 				npc.broadcastSocialAction(socialActionId);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
index 8e3f9e5943..83363ef157 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
@@ -41,7 +41,7 @@ public class Eleve extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Eleve extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
index b8863b9963..114728632b 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
@@ -44,13 +44,13 @@ public class Gagabu extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, GAGABU_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
index 44dab7df42..d490504792 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
@@ -38,14 +38,14 @@ public class Galad extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSocialAction(3);
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.OCCASIONALLY_RARE_JEWELS_OF_GIANTS_ARE_DISCOVERED_IN_THE_BEACH, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
index a0c7f71816..3a56943e20 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
@@ -52,7 +52,7 @@ public class GiantSoldiers extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
index a703c40323..b94d2f9624 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
@@ -38,7 +38,7 @@ public class GuardSoldier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -49,7 +49,7 @@ public class GuardSoldier extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(2);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
index b26d9fd748..1b0dd65c82 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
@@ -43,7 +43,7 @@ public class Hadel extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
index bdb70d1f2d..d7ff70d9a0 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
@@ -38,7 +38,7 @@ public class Handermonkey extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE") && (npc != null))
 		{
@@ -54,7 +54,7 @@ public class Handermonkey extends AbstractNpcAI
 				npc.broadcastSocialAction(9);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
index 6874a606ec..f48b530d56 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
@@ -61,7 +61,7 @@ public class Hardin extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = getHtmlMessage(player);
 		if (htmltext != null)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
index a8bded51f1..536ee7f5cd 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
@@ -58,7 +58,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("HARNAK_SPAWN"))
 		{
@@ -70,7 +70,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
 				_templates.forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName), null));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private static class zoneInfo
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
index 3c2080e85a..03dca71bb5 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
@@ -55,13 +55,13 @@ public class HurnakMobMsg extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("ATTACK"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomEntry(ON_ATTACK_MSG));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
index 81f6617329..7055381eab 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
@@ -38,14 +38,14 @@ public class Hera extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomBoolean() ? NpcStringId.DOES_THE_GODDESS_SEE_WHAT_SHE_HAS_DONE : NpcStringId.WHY_HAVE_THE_HEROES_ABANDONED_US);
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
index 7003ad014d..2b6a1a1e51 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
@@ -38,7 +38,7 @@ public class Heymond extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
@@ -62,7 +62,7 @@ public class Heymond extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
index 52ce99be7f..8033f3c1ec 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
@@ -38,7 +38,7 @@ public class Holly extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -48,7 +48,7 @@ public class Holly extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(6);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
index 3f9141b931..e11490debc 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
@@ -41,7 +41,7 @@ public class Karonf extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Karonf extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
index 597cfd80f2..c102b0cc4c 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
@@ -44,7 +44,7 @@ public class Luderic extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -54,7 +54,7 @@ public class Luderic extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(1);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
index 0c07720a0a..08de6143f0 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
@@ -45,13 +45,13 @@ public class Lumi extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, LUMI_SHOUT[getRandom(3)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
index 68b2789416..3bdb8de60b 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
@@ -38,13 +38,13 @@ public class Mahram extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.ALCHEMY_IS_A_SCIENCE_AND_AN_ART, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
index e00fd6c98c..85117713a0 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
@@ -38,13 +38,13 @@ public class Mai extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EVERY_RACE_BUILT_A_PIECE_OF_THIS_VILLAGE, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
index dcd47a9822..2d44f1568a 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
@@ -38,13 +38,13 @@ public class MarinSmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.HMM_IS_THIS_STILL_A_DECENT_WEAPON, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
index d5e5496e16..0d4e8f79e3 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
@@ -41,7 +41,7 @@ public class Marsha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Marsha extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
index aa9eb0eb87..81bc246742 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
@@ -43,7 +43,7 @@ public class Milia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("gludioAirship"))
 		{
@@ -53,7 +53,7 @@ public class Milia extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SPEAK_WITH_ME_ABOUT_TRAVELING_AROUND_ADEN, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
index b1e037eb5a..933c139b8c 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
@@ -64,7 +64,7 @@ public class MonkOfChaos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
index f6cd83883a..0bedb09eb6 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
@@ -41,7 +41,7 @@ public class Morgan extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Morgan extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
index e7ce45a4e5..fd5e025cd2 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
@@ -40,7 +40,7 @@ public class Oris extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SOCIAL_ACTION_1"))
 		{
@@ -55,7 +55,7 @@ public class Oris extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_HAVEN_T_FELT_THIS_GOOD_IN_AGES, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
index 629e695955..bc23f8bd49 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
@@ -46,7 +46,7 @@ public class Pantheon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
index 71412b5034..42fc5d88e2 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
@@ -149,7 +149,7 @@ public class Raina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
index 4c8862c733..8d66a71766 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
@@ -41,7 +41,7 @@ public class Rubentis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Rubentis extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
index d5c86cee97..87e1df4a6b 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
@@ -38,14 +38,14 @@ public class Ruks extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomBoolean() ? NpcStringId.THE_SEVEN_SIGNS_ENDED : NpcStringId.WE_NEED_TO_FIND_HER_WEAKNESS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
index cc9a63c666..880532e52c 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
@@ -38,13 +38,13 @@ public class Sebion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TIS_A_SCRATCH, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
index fa3cc06633..4b05120bde 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
@@ -38,13 +38,13 @@ public class Shannon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.LOOK_AT_ALL_THE_NEWBIES_HA_HA_HA, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
index 219ac48515..7fd067c374 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
@@ -44,13 +44,13 @@ public class Sodian extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, SODIAN_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
index e11dfb9aaf..8413c93bc8 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
@@ -44,13 +44,13 @@ public class Stiller extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, STILLER_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
index b10f044196..d196091a8e 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
@@ -38,13 +38,13 @@ public class Theodore extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.AND_NOW_YOUR_JOURNEY_BEGINS, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
index 4290aa8fc6..8e4f8ed738 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
@@ -38,7 +38,7 @@ public class TomaJunior extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -49,7 +49,7 @@ public class TomaJunior extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(6);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
index c3aa031317..78ce6f2c8c 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
@@ -38,7 +38,7 @@ public class TrainningSoldier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -55,7 +55,7 @@ public class TrainningSoldier extends AbstractNpcAI
 			}
 			startQuestTimer("START_ATTACK", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
index 8dcdee6738..6e42cbe630 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
@@ -64,7 +64,7 @@ public class Trandon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String[] substrings = event.split(" ");
 		if (substrings.length < 1)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
index 8cd3cd965d..b65bd9a7ad 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
@@ -42,7 +42,7 @@ public class YeSagiraGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -56,7 +56,7 @@ public class YeSagiraGuards extends AbstractNpcAI
 			}
 			startQuestTimer("GUARD_AGGRO", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
index 5fb219dcef..77b212f1af 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
@@ -84,7 +84,7 @@ public class YeSegiraTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LOCATIONS.containsKey(event))
 		{
@@ -107,7 +107,7 @@ public class YeSegiraTeleportDevice extends AbstractNpcAI
 				// }
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_PLAYER_CREATE)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
index 2c8e967539..4bb6be2086 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
@@ -40,7 +40,7 @@ public class Acateo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("give_circlet"))
 		{
@@ -51,7 +51,7 @@ public class Acateo extends AbstractNpcAI
 			giveItems(player, ACADEMY_CIRCLET, 1);
 			return "33905-2.html";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
index 949fb8f279..48ca778074 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
@@ -108,7 +108,7 @@ public class VarkaSilenosSupport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
index b7fb571500..3a94d3d378 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
@@ -43,7 +43,7 @@ public class ElmoredenServantsGhost extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("teleport1") || event.equals("teleport2"))
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
index 427084ea7a..150fee7dfb 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
@@ -83,7 +83,7 @@ public class Wastelands extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || !npc.isSpawned())
 		{
@@ -184,7 +184,7 @@ public class Wastelands extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
index 61678a5cb2..5e24c8040c 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
@@ -47,7 +47,7 @@ public class ZealotOfShilen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -75,7 +75,7 @@ public class ZealotOfShilen extends AbstractNpcAI
 			}
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
index d80239a8e6..e0fcd416e7 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
@@ -38,14 +38,14 @@ public class Commando extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.WE_RE_LOOKING_FOR_RANGERS_FROM_ADEN);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Anais/Anais.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Anais/Anais.java
index 74fe879672..823d08142f 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Anais/Anais.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Anais/Anais.java
@@ -75,7 +75,7 @@ public class Anais extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -134,7 +134,7 @@ public class Anais extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
index 3be16633a2..91d8d0b84c 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
@@ -114,7 +114,7 @@ public class Anakim extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -187,7 +187,7 @@ public class Anakim extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Anakim/AnakimBoss.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Anakim/AnakimBoss.java
index e082cf6354..d3b785f7e1 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Anakim/AnakimBoss.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Anakim/AnakimBoss.java
@@ -51,7 +51,7 @@ public class AnakimBoss extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -64,7 +64,7 @@ public class AnakimBoss extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Anakim/AnakimElitePriest.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Anakim/AnakimElitePriest.java
index 21f3ff12cb..8511577c7b 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Anakim/AnakimElitePriest.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Anakim/AnakimElitePriest.java
@@ -46,7 +46,7 @@ public class AnakimElitePriest extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -59,7 +59,7 @@ public class AnakimElitePriest extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index 7e611f554a..730ea96c9b 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -113,7 +113,7 @@ public class Antharas extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 6aa670a2de..5fe20e9fa4 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -162,7 +162,7 @@ public class Baium extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -471,7 +471,7 @@ public class Baium extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
index 14f812e335..1e590201d0 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
@@ -105,7 +105,7 @@ public class BalokWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -115,7 +115,7 @@ public class BalokWarzone extends AbstractInstance
 				takeItems(player, PRISON_KEY, -1);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
index 64d5737d55..d861d7391f 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
@@ -81,7 +81,7 @@ public class BaylorWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.contains("enterInstance"))
 		{
@@ -137,7 +137,7 @@ public class BaylorWarzone extends AbstractInstance
 				player.sendPacket(SystemMessageId.YOU_ARE_NOT_IN_A_PARTY_SO_YOU_CANNOT_ENTER);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index b5a24845bb..3748875859 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -126,7 +126,7 @@ public class Beleth extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -536,7 +536,7 @@ public class Beleth extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
index e2770b5bec..b768e563e9 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
@@ -49,7 +49,7 @@ public class Wormhole extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Camille/Camille.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Camille/Camille.java
index 24757df47d..ee0ad1539f 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Camille/Camille.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Camille/Camille.java
@@ -54,7 +54,7 @@ public class Camille extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class Camille extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Core/Core.java
index 344ad52a0a..34584c31c3 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -143,7 +143,7 @@ public class Core extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
@@ -162,7 +162,7 @@ public class Core extends AbstractNpcAI
 			_minions.forEach(Attackable::decayMe);
 			_minions.clear();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Cyrax/Cyrax.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Cyrax/Cyrax.java
index 3cf963c685..b5a3be172b 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Cyrax/Cyrax.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Cyrax/Cyrax.java
@@ -48,7 +48,7 @@ public class Cyrax extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -61,7 +61,7 @@ public class Cyrax extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Cyrax/TempleEliteWizard.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Cyrax/TempleEliteWizard.java
index 1b68f87df9..33d0e6b941 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Cyrax/TempleEliteWizard.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Cyrax/TempleEliteWizard.java
@@ -44,7 +44,7 @@ public class TempleEliteWizard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleEliteWizard extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/ChoirOfDarkness.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/ChoirOfDarkness.java
index c07620df2f..22735a6228 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/ChoirOfDarkness.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/ChoirOfDarkness.java
@@ -44,7 +44,7 @@ public class ChoirOfDarkness extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class ChoirOfDarkness extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/Etina.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/Etina.java
index 21647bc333..3f20e07ce9 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/Etina.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/Etina.java
@@ -47,7 +47,7 @@ public class Etina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -60,7 +60,7 @@ public class Etina extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
index 3691975b20..8abe1df6cc 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
@@ -348,7 +348,7 @@ public class EtisVanEtina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -515,7 +515,7 @@ public class EtisVanEtina extends AbstractNpcAI
 			}
 			
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private void clean()
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleDarkJudge.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleDarkJudge.java
index 609abafe5c..c89586710f 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleDarkJudge.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleDarkJudge.java
@@ -44,7 +44,7 @@ public class GreatTempleDarkJudge extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class GreatTempleDarkJudge extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleSoulGuide.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleSoulGuide.java
index 7ffe33d918..a08a1c79c2 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleSoulGuide.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleSoulGuide.java
@@ -44,7 +44,7 @@ public class GreatTempleSoulGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class GreatTempleSoulGuide extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/JudgeOfHeresy.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/JudgeOfHeresy.java
index acfba50e7d..a9e53959c5 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/JudgeOfHeresy.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/JudgeOfHeresy.java
@@ -44,7 +44,7 @@ public class JudgeOfHeresy extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class JudgeOfHeresy extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/Kain.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/Kain.java
index 8c81abebe3..7b910760fd 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/Kain.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/Kain.java
@@ -46,7 +46,7 @@ public class Kain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -59,7 +59,7 @@ public class Kain extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/LiberatorOfLust.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/LiberatorOfLust.java
index 081d00456a..628d8f4399 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/LiberatorOfLust.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/LiberatorOfLust.java
@@ -44,7 +44,7 @@ public class LiberatorOfLust extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class LiberatorOfLust extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/SeekerOfDespair.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/SeekerOfDespair.java
index 4cb190b064..b9fadc44ad 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/SeekerOfDespair.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/SeekerOfDespair.java
@@ -44,7 +44,7 @@ public class SeekerOfDespair extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class SeekerOfDespair extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/SoulDestroyer.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/SoulDestroyer.java
index defafa1d95..7382c7e319 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/SoulDestroyer.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/SoulDestroyer.java
@@ -44,7 +44,7 @@ public class SoulDestroyer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class SoulDestroyer extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleArchon.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleArchon.java
index ba2d56ecf9..85dc410977 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleArchon.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleArchon.java
@@ -44,7 +44,7 @@ public class TempleArchon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleArchon extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleDarkWizard.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleDarkWizard.java
index c92187c67e..ff892ea50e 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleDarkWizard.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleDarkWizard.java
@@ -44,7 +44,7 @@ public class TempleDarkWizard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleDarkWizard extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleFlameMaster.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleFlameMaster.java
index 57a930ddd5..341a3663b7 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleFlameMaster.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleFlameMaster.java
@@ -44,7 +44,7 @@ public class TempleFlameMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleFlameMaster extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleHighPriest.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleHighPriest.java
index df735b07c3..df68ee43c3 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleHighPriest.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleHighPriest.java
@@ -44,7 +44,7 @@ public class TempleHighPriest extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleHighPriest extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Fafurion/EliteWizard.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Fafurion/EliteWizard.java
index e776d5739f..2b85d8c0e0 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Fafurion/EliteWizard.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Fafurion/EliteWizard.java
@@ -44,7 +44,7 @@ public class EliteWizard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class EliteWizard extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
index 952cbab1be..fac0d6d7e7 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
@@ -104,7 +104,7 @@ public class Fafurion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Fafurion/FafurionBoss.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Fafurion/FafurionBoss.java
index d297cd7906..eb953be1a0 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Fafurion/FafurionBoss.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Fafurion/FafurionBoss.java
@@ -60,7 +60,7 @@ public class FafurionBoss extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -73,7 +73,7 @@ public class FafurionBoss extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
index 639cabcd8c..e7e800d352 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
@@ -63,7 +63,7 @@ public class IceQueensCastle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -113,7 +113,7 @@ public class IceQueensCastle extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
index 17a4c0b38f..a705743cbe 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
@@ -157,7 +157,7 @@ public class IceQueensCastleBattle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterEasy"))
 		{
@@ -677,7 +677,7 @@ public class IceQueensCastleBattle extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
index 0e6e22d234..cd834bb356 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
@@ -43,7 +43,7 @@ public class Jinia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
index 7e7b814e3c..6f3c7da182 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
@@ -165,7 +165,7 @@ public class LastImperialTomb extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
index 282b9f8fbc..254c891bc5 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
@@ -62,7 +62,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Helios/Helios.java
index d6de973ec6..8288e0626c 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Helios/Helios.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Helios/Helios.java
@@ -320,7 +320,7 @@ public class Helios extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Helios/Helios1.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Helios/Helios1.java
index 7eb394719d..5d2364fbc0 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Helios/Helios1.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Helios/Helios1.java
@@ -45,7 +45,7 @@ public class Helios1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -58,7 +58,7 @@ public class Helios1 extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Helios/Helios2.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Helios/Helios2.java
index 2147bd52c0..abe0cc400e 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Helios/Helios2.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Helios/Helios2.java
@@ -45,7 +45,7 @@ public class Helios2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -58,7 +58,7 @@ public class Helios2 extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Helios/Helios3.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Helios/Helios3.java
index 364dce85de..8e293ad2a4 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Helios/Helios3.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Helios/Helios3.java
@@ -46,7 +46,7 @@ public class Helios3 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -59,7 +59,7 @@ public class Helios3 extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java
index 404237e0fa..29b64fa20b 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java
@@ -44,7 +44,7 @@ public class RoyalArchmageMinion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class RoyalArchmageMinion extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
index afe3418882..5c69befc42 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
@@ -92,7 +92,7 @@ public class IstinaCavern extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance instance = npc.getInstanceWorld();
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
index 27728f34c1..f1945e2def 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
@@ -40,7 +40,7 @@ public class Rumiese extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
index b94d17f47b..ae0e6aaef9 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
@@ -141,7 +141,7 @@ public class Kelbim extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -281,7 +281,7 @@ public class Kelbim extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
index 822dc8768e..f1201d07f3 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
@@ -137,7 +137,7 @@ public class KimerianCommon extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance instance = npc.getInstanceWorld();
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
index 3f5ddf199c..57580cb51f 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
@@ -113,7 +113,7 @@ public class Lilith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -187,7 +187,7 @@ public class Lilith extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Lilith/LilithBoss.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Lilith/LilithBoss.java
index e0d6b0f02c..9ce319723c 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Lilith/LilithBoss.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Lilith/LilithBoss.java
@@ -51,7 +51,7 @@ public class LilithBoss extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -64,7 +64,7 @@ public class LilithBoss extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Lilith/LilithEliteShaman.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Lilith/LilithEliteShaman.java
index bfe6a2aff9..cdd63a05f9 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Lilith/LilithEliteShaman.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Lilith/LilithEliteShaman.java
@@ -47,7 +47,7 @@ public class LilithEliteShaman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -60,7 +60,7 @@ public class LilithEliteShaman extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/LimitBarrier.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/LimitBarrier.java
index 50fd6e31f8..1fd70c8656 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/LimitBarrier.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/LimitBarrier.java
@@ -86,7 +86,7 @@ public class LimitBarrier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -115,7 +115,7 @@ public class LimitBarrier extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
index 5b16c333e2..ced833a889 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
@@ -49,7 +49,7 @@ public class KatoSicanus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
index 2bd8aeb2c6..7dacdd2c16 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
@@ -674,7 +674,7 @@ public class Lindvior extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
index 73d5d88407..f676f620a3 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
@@ -49,7 +49,7 @@ public class Vortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -110,7 +110,7 @@ public class Vortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
index 49a224c8bc..8c7d0eb77d 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
@@ -122,7 +122,7 @@ public class OctavisWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -146,7 +146,7 @@ public class OctavisWarzone extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 0285771eb7..6e774eec6b 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -145,7 +145,7 @@ public class Orfen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -201,7 +201,7 @@ public class Orfen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 3df78117dd..b2beaccdda 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -79,7 +79,7 @@ public class QueenAnt extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -106,7 +106,7 @@ public class QueenAnt extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
index 7a3322b68a..297948d172 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
@@ -53,7 +53,7 @@ public class QueenShyeed extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java
index e81a33ac0a..5f678eff55 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java
@@ -148,7 +148,7 @@ public class Ramona extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -376,7 +376,7 @@ public class Ramona extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
index ad87d93fe0..20e1572d8a 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
@@ -80,7 +80,7 @@ public class Sailren extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -249,7 +249,7 @@ public class Sailren extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
index 4eeb4da057..b11aa4de6a 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
@@ -73,7 +73,7 @@ public class Cannon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
index f754206b22..45b4c89ee7 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
@@ -62,7 +62,7 @@ public class TautiWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -170,7 +170,7 @@ public class TautiWarzone extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
index 50da94c8b2..f973bf0e12 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
@@ -182,7 +182,7 @@ public class TeredorWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
index 7b07413999..63b2c0589a 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
@@ -507,7 +507,7 @@ public class Stage1 extends AbstractInstance implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
index 70d36f9c61..d2abf63365 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
@@ -50,7 +50,7 @@ public class Daichir extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterEarthWyrnCave"))
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
index b771fa95a2..7d14857632 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
@@ -570,7 +570,7 @@ public class Trasken extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -694,7 +694,7 @@ public class Trasken extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index 74f7b64063..4eaf667f0a 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -191,7 +191,7 @@ public class Valakas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -380,7 +380,7 @@ public class Valakas extends AbstractNpcAI
 		{
 			BOSS_ZONE.oustAllPlayers();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
index a211f7bfc0..bae4d63898 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
@@ -172,7 +172,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter60"))
 		{
@@ -254,7 +254,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/AdenReconstructorManager.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
index f4c79ad145..21cceee6c4 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
@@ -42,7 +42,7 @@ public class AdenReconstructorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -67,7 +67,7 @@ public class AdenReconstructorManager extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
index 223295235d..91c6dc8871 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
@@ -129,7 +129,7 @@ public class AdventureGuildsman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
index 0bcbcd9e3f..7c44fb4296 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
@@ -64,7 +64,7 @@ public class AdventurersGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/AetherDrops.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/AetherDrops.java
index 880882e0bd..10a24de0ee 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/AetherDrops.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/AetherDrops.java
@@ -243,7 +243,7 @@ public class AetherDrops extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) || (player != null))
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
index c5ed73b2c2..7d81da92e1 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
@@ -51,7 +51,7 @@ public class AlchemistManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index 8dd8d423fe..afa7763e75 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -63,7 +63,7 @@ public class ArenaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -128,7 +128,7 @@ public class ArenaManager extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
index 1c51b94358..352c31c8fc 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
@@ -38,7 +38,7 @@ public class BlackJudge extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("weakenBreath"))
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
index d35adf8706..e203aecd5e 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
@@ -42,7 +42,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equals("31092-01.html"))
@@ -79,7 +79,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 			giveAdena(player, count, false);
 			return "31092-04.html";
 		}
-		return super.onAdvEvent(htmltext, npc, player);
+		return super.onEvent(htmltext, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
index 6a44d63e0b..81e90f2d67 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
@@ -56,7 +56,7 @@ public class CastleAmbassador extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
index b07792cd2d..11b8786523 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
@@ -57,7 +57,7 @@ public class CastleBlacksmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return (event.equalsIgnoreCase(npc.getId() + "-02.html") && hasRights(player, npc)) ? event : null;
 	}
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
index ed15739ca7..5fede6f0ea 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
@@ -393,7 +393,7 @@ public class CastleChamberlain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Castle castle = npc.getCastle();
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
index 8ca546336f..6b7b60f94c 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
@@ -140,7 +140,7 @@ public class CastleCourtMagician extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player.getClan() == null) && (player.getClanId() != npc.getCastle().getOwnerId()))
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
index 4c85285e05..81b947b9e8 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
@@ -72,7 +72,7 @@ public class CastleDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
index bb32dde319..a319e3977f 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
@@ -56,7 +56,7 @@ public class CastleMercenaryManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index 4c9e071e50..efc62e1daa 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -78,7 +78,7 @@ public class CastleTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
@@ -168,7 +168,7 @@ public class CastleTeleporter extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
index bffed40bcc..ea1b40c41c 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
@@ -52,7 +52,7 @@ public class CastleWarehouse extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final boolean isMyLord = player.isClanLeader() && (player.getClan().getCastleId() == (npc.getCastle() != null ? npc.getCastle().getResidenceId() : -1));
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index 2fd3e63327..bf5923b374 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -64,7 +64,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
index 7b5e9d8685..7c5d3ef4d6 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
@@ -57,7 +57,7 @@ public class ClanHallDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 217d3dd1f9..4e3994a948 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -103,7 +103,7 @@ public class ClanHallManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
index 28d4fa2477..e1d979fb6b 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
@@ -67,7 +67,7 @@ public class ClanTrader extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 385e3932a6..8bf1c8df8a 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -237,7 +237,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		if (!_isEnabled)
 		{
@@ -962,7 +962,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	{
 		if (event.getCommand().startsWith("Quest ClassMaster "))
 		{
-			final String html = onAdvEvent(event.getCommand().substring(18), null, event.getPlayer());
+			final String html = onEvent(event.getCommand().substring(18), null, event.getPlayer());
 			event.getPlayer().sendPacket(TutorialCloseHtml.STATIC_PACKET);
 			showResult(event.getPlayer(), html);
 		}
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
index 21aafa7e87..7b61214c91 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
@@ -43,7 +43,7 @@ public class CrimsonHatuOtis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -69,7 +69,7 @@ public class CrimsonHatuOtis extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/DivineBeast.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/DivineBeast.java
index 1f247a7b35..3f3a076992 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/DivineBeast.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/DivineBeast.java
@@ -44,7 +44,7 @@ public class DivineBeast extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player == null) || !player.hasServitors())
 		{
@@ -55,7 +55,7 @@ public class DivineBeast extends AbstractNpcAI
 			cancelQuestTimer(event, npc, player);
 			player.getServitors().values().forEach(summon -> summon.unSummon(player));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/EinhasadStore/EinhasadStore.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/EinhasadStore/EinhasadStore.java
index 1a2343a7d4..0b8c9e9380 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/EinhasadStore/EinhasadStore.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/EinhasadStore/EinhasadStore.java
@@ -54,7 +54,7 @@ public class EinhasadStore extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/EnergySeeds.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/EnergySeeds.java
index ab2ace6675..9778c24b01 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/EnergySeeds.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/EnergySeeds.java
@@ -196,7 +196,7 @@ public class EnergySeeds extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("StartSoDAi"))
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/FameManager/FameManager.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/FameManager/FameManager.java
index 30275c2033..836ebc6584 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/FameManager/FameManager.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/FameManager/FameManager.java
@@ -49,7 +49,7 @@ public class FameManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
index 1bb90fa8af..91e07dd86d 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
@@ -69,7 +69,7 @@ public class FortressSiegeManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
index dc5ada5d1e..c748559813 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
@@ -85,7 +85,7 @@ public class GameAssistant extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
index 07bd61107e..c8c1d75664 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
@@ -67,7 +67,7 @@ public class HealerTrainer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
index 8f2f3a77de..9a1844c2f3 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
@@ -89,7 +89,7 @@ public class HermuncusMinion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(eventValue, " ");
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/KastiaResearcher/KastiaResearcher.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/KastiaResearcher/KastiaResearcher.java
index 31c9abbc43..4e615f7c40 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/KastiaResearcher/KastiaResearcher.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/KastiaResearcher/KastiaResearcher.java
@@ -38,7 +38,7 @@ public class KastiaResearcher extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("exit"))
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
index 293ef358c0..4f9f71bccd 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
@@ -49,7 +49,7 @@ public class LaVieEnRose extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
index 8d38a27541..6763b0367c 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
@@ -71,7 +71,7 @@ public class ManorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
index fd73ae395a..297d30b27d 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
@@ -138,7 +138,7 @@ public class MentorGuide extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("exchange"))
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/Minigame/Minigame.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/Minigame/Minigame.java
index 6e48943e76..936ed15436 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/Minigame/Minigame.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/Minigame/Minigame.java
@@ -68,7 +68,7 @@ public class Minigame extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final MinigameRoom room = getRoomByManager(npc);
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
index db5f85017a..23f4dd1ddf 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
@@ -96,7 +96,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
index 4ad7e0a2fc..d3576b9fff 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
@@ -48,14 +48,14 @@ public class NornilTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("teleport_"))
 		{
 			final int locId = Integer.parseInt(event.replace("teleport_", ""));
 			player.teleToLocation(LOCATIONS[locId - 1]);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
index 390ac6e195..31a6311374 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
@@ -61,7 +61,7 @@ public class OlyBuffer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index c3048edda1..5ef1cbf9ad 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -88,7 +88,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/PrisonGuards.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/PrisonGuards.java
index 4084beddca..c79356a1f0 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/PrisonGuards.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/PrisonGuards.java
@@ -53,7 +53,7 @@ public class PrisonGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CLEAR_STATUS"))
 		{
@@ -67,7 +67,7 @@ public class PrisonGuards extends AbstractNpcAI
 			}
 			startQuestTimer("CHECK_HOME", 30000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/PrisonManager/PrisonManager.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/PrisonManager/PrisonManager.java
index 2634f960ad..506ec45e74 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/PrisonManager/PrisonManager.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/PrisonManager/PrisonManager.java
@@ -65,7 +65,7 @@ public class PrisonManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
index 21d281c6c9..435f293345 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
@@ -84,7 +84,7 @@ public class Proclaimer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("giveBuff"))
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
index 8b3515e12b..83098c1eaf 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
@@ -79,7 +79,7 @@ public class ProvisionalHalls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/Servitors/SinEater.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/Servitors/SinEater.java
index 1425dfc6d0..6b9ae5aa23 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/Servitors/SinEater.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/Servitors/SinEater.java
@@ -48,7 +48,7 @@ public class SinEater extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TALK") && (player != null) && (player.getPet() != null))
 		{
@@ -79,7 +79,7 @@ public class SinEater extends AbstractNpcAI
 			}
 			startQuestTimer("TALK", 60000, null, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_CREATURE_DEATH)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
index b491443c92..1d0a70326c 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
@@ -128,7 +128,7 @@ public class SupportUnitCaptain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int fortOwner = npc.getFort().getOwnerClan() == null ? 0 : npc.getFort().getOwnerClan().getId();
 		if ((player.getClan() == null) || (player.getClanId() != fortOwner))
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
index f6d1e74529..a733b87dad 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
@@ -53,7 +53,7 @@ public class SymbolMaker extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
index f9cd32a0dd..82ec9274c2 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
@@ -94,7 +94,7 @@ public class TeleportToUndergroundColiseum extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.endsWith(".htm"))
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
index 602b1eaeaa..1c4fddee62 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
@@ -75,7 +75,7 @@ public class TersisHerald extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("giveBuff"))
 		{
@@ -87,7 +87,7 @@ public class TersisHerald extends AbstractNpcAI
 			npc.setTarget(player);
 			npc.doCast(DRAGON_BUFF.getSkill());
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
index 8e94950d76..520a057481 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
@@ -62,7 +62,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = "";
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
index 58d9b961f9..46b1f36ec8 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
@@ -87,7 +87,7 @@ public class ClassTransferTalk extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/WarriorFishingBlock.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
index 9e5be3441e..23f84be8d0 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
@@ -75,7 +75,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -104,7 +104,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java
index 1859ca1d3c..6644a0ae38 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java
@@ -66,7 +66,7 @@ public class WaterDragonEliteSupplyDrops extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) || (player != null))
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
index b9439eb0ec..a1878b037b 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
@@ -156,7 +156,7 @@ public class WeaverOlf extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.contains("_grade_"))
 		{
@@ -185,7 +185,7 @@ public class WeaverOlf extends AbstractNpcAI
 			}
 			else
 			{
-				return super.onAdvEvent(event, npc, player);
+				return super.onEvent(event, npc, player);
 			}
 			
 			if (hasQuestItems(player, itemIds[0]))
@@ -225,7 +225,7 @@ public class WeaverOlf extends AbstractNpcAI
 			{
 				return npc.getId() + "-no.htm";
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		return event;
 	}
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index 777998cde4..48bf41ab6d 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -210,7 +210,7 @@ public class WyvernManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
index 0c2e7586c9..c49be5297b 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
@@ -36,7 +36,7 @@ public class DelevelManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.DELEVEL_MANAGER_ENABLED)
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
index 5eaddb78ba..76b7f1e559 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
@@ -54,7 +54,7 @@ public class FactionSystem extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class FactionSystem extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
index 8b9c676ad5..771c8a9058 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
@@ -34,7 +34,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -77,7 +77,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 				npc.broadcastInfo(); // update flag status
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
index 0d0d6ab0a2..70ab5bb463 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
@@ -60,7 +60,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("AUTOBUFF") && (npc != null) && !npc.isDead())
 		{
@@ -88,7 +88,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
 			}
 			startQuestTimer("AUTOBUFF", 30000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
index f19aa0cb6f..447c512987 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
@@ -39,7 +39,7 @@ public class NoblessMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.NOBLESS_MASTER_ENABLED)
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java
index b0224852ae..bb87b3096a 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java
@@ -49,7 +49,7 @@ public class ShadowWeapons extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
index ba8d24ed64..82bb289dd9 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
@@ -160,7 +160,7 @@ public class Deathmatch extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
index 1eb84eca93..b92bbe7f77 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
@@ -213,7 +213,7 @@ public class Rabbits extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/events/Race/Race.java
index ff9fc462f6..6ac325ca6f 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/events/Race/Race.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/events/Race/Race.java
@@ -320,7 +320,7 @@ public class Race extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index f7f63590c3..06e5073b0d 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -177,7 +177,7 @@ public class TvT extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/BalthusFestival/BalthusFestival.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/BalthusFestival/BalthusFestival.java
index a775515a71..a74a208f65 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/BalthusFestival/BalthusFestival.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/BalthusFestival/BalthusFestival.java
@@ -132,7 +132,7 @@ public class BalthusFestival extends LongTimeEvent implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!isEventPeriod())
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
index 77c055cc79..84a2d7763d 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
@@ -45,7 +45,7 @@ public class BirthOfDraco extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
index 9bc0ff9c55..87ac868dc7 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
@@ -64,7 +64,7 @@ public class CharacterBirthday extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("despawn_npc"))
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/ChuseokHarvestFestival/ChuseokHarvestFestival.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/ChuseokHarvestFestival/ChuseokHarvestFestival.java
index b8a94f806f..c849144563 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/ChuseokHarvestFestival/ChuseokHarvestFestival.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/ChuseokHarvestFestival/ChuseokHarvestFestival.java
@@ -60,7 +60,7 @@ public class ChuseokHarvestFestival extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/DragonSlayer/DragonSlayer.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/DragonSlayer/DragonSlayer.java
index 63fd7d03f6..0cb767dde4 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/DragonSlayer/DragonSlayer.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/DragonSlayer/DragonSlayer.java
@@ -58,7 +58,7 @@ public class DragonSlayer extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equals("receive_reward"))
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/DreamMaker/DreamMaker.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/DreamMaker/DreamMaker.java
index 62f39d0166..254c91f9a8 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/DreamMaker/DreamMaker.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/DreamMaker/DreamMaker.java
@@ -54,7 +54,7 @@ public class DreamMaker extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index a966bdff3e..4648d78f95 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -56,7 +56,7 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
index 6f192db71e..b8f6a6f3de 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
@@ -73,7 +73,7 @@ public class FreyaCelebration extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("give_potion"))
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
index 2e928991d8..0819b4af78 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
@@ -86,7 +86,7 @@ public class GiftOfVitality extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
index aa5419e179..76aaa4ab09 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
@@ -59,7 +59,7 @@ public class HeavyMedal extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		int level = checkLevel(player);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/HungryHorse/HungryHorse.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
index 49935a9758..18454313ac 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
@@ -56,7 +56,7 @@ public class HungryHorse extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
index 6107af7f71..502fce9a30 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
@@ -55,7 +55,7 @@ public class HuntForSanta extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/LegendsMark/LegendsMark.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/LegendsMark/LegendsMark.java
index 349cd56aff..30cdae0e69 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/LegendsMark/LegendsMark.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/LegendsMark/LegendsMark.java
@@ -216,7 +216,7 @@ public class LegendsMark extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
index e5c62e710d..90491aeb5a 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
@@ -49,7 +49,7 @@ public class LoveYourGatekeeper extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
index c868fad2b3..6460eb4ab0 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
@@ -61,7 +61,7 @@ public class LoversJubilee extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmtext = event;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
index 8fa82b5c0f..465561e47f 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
@@ -68,7 +68,7 @@ public class MasterOfEnchanting extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("buy_staff"))
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java
index 42a614bc5b..e203e60de3 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java
@@ -86,7 +86,7 @@ public class Eraton extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/RedLibra/RedLibra.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/RedLibra/RedLibra.java
index 69414f20c6..693f2efd18 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/RedLibra/RedLibra.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/RedLibra/RedLibra.java
@@ -42,7 +42,7 @@ public class RedLibra extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
index f6c714eddc..7d3462224b 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
@@ -58,7 +58,7 @@ public class RudolphsBlessing extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("rudolph_eat") && (player != null) && player.isOnline())
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
index 6b1fa2792f..643d2706f9 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
@@ -297,7 +297,7 @@ public class SavingSanta extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!isEventPeriod())
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/SmashItCompletely/SmashItCompletely.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/SmashItCompletely/SmashItCompletely.java
index 3abc78f3d9..3d42508030 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/SmashItCompletely/SmashItCompletely.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/SmashItCompletely/SmashItCompletely.java
@@ -100,7 +100,7 @@ public class SmashItCompletely extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/SnowmanEnergy/SnowmanEnergy.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/SnowmanEnergy/SnowmanEnergy.java
index 2b31aa0d9e..8e99c14f46 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/SnowmanEnergy/SnowmanEnergy.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/SnowmanEnergy/SnowmanEnergy.java
@@ -235,7 +235,7 @@ public class SnowmanEnergy extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
index 5c00677d25..862a8df578 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
@@ -51,7 +51,7 @@ public class ThePowerOfLove extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java
index 4256e9042d..63d91c507d 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java
@@ -45,7 +45,7 @@ public class TrainingWithDandy extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
index e457aa928d..efe8f62aba 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
@@ -130,7 +130,7 @@ public class AltarOfShilen extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (event.equals("enterInstance"))
@@ -266,7 +266,7 @@ public class AltarOfShilen extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
index 80dcc9a48a..1b11df5d69 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
@@ -198,7 +198,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.contains("enterInstance"))
 		{
@@ -314,7 +314,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance
 			}
 			return null;
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
index d363236261..4b616c3866 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
@@ -467,7 +467,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
index c5f940ce45..7849495548 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
@@ -72,7 +72,7 @@ public class ChamberOfProphecies extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
index 15df82af50..46cd0a9b8e 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
@@ -177,7 +177,7 @@ public class ChamberOfDelusion extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/CommandPost/CommandPost.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/CommandPost/CommandPost.java
index ea065ff0bc..c19c5e965c 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/CommandPost/CommandPost.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/CommandPost/CommandPost.java
@@ -105,7 +105,7 @@ public class CommandPost extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
index fd5e4f3ebf..792494f135 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
@@ -114,13 +114,13 @@ public class CrystalCavernsCoralGarden extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
index 6db8525e11..46f3d2fdf6 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
@@ -79,13 +79,13 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
index c51b5d7887..121e3a89f4 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
@@ -135,13 +135,13 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
index 4c83903a85..9a74e4dcec 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
@@ -122,7 +122,7 @@ public class DarkCloudMansion extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
index 9e06df3365..7cb1eb092a 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
@@ -43,7 +43,7 @@ public class DimensionMakkum extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = getPlayerInstance(player);
 		switch (event)
@@ -67,7 +67,7 @@ public class DimensionMakkum extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
index 605b8ebdf8..981a91d4a7 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
@@ -53,13 +53,13 @@ public class DimensionalArchon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), getRandomEntry(ARCHON_MSG)));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
index 176ee5b803..9243451cde 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
@@ -53,7 +53,7 @@ public class DimensionalTrap extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || npc.isAlikeDead())
 		{
@@ -102,7 +102,7 @@ public class DimensionalTrap extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
index f9540acaa2..de51a3efbe 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
@@ -115,7 +115,7 @@ public class DimensionalWrap extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java
index 78b78bd309..f98564693f 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java
@@ -128,7 +128,7 @@ public class EtisVanEtinaSolo extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -476,7 +476,7 @@ public class EtisVanEtinaSolo extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
index bca7be7a72..3f771a9755 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
@@ -44,7 +44,7 @@ public class EvasHiddenSpace extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
index b31270a959..670ecda51b 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
@@ -189,12 +189,12 @@ public class EvilIncubator extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player);
 		if ((st == null) || !st.isStarted())
 		{
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/FallenEmperorsThrone/FallenEmperorsThrone.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/FallenEmperorsThrone/FallenEmperorsThrone.java
index 52bfd153a7..d532951274 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/FallenEmperorsThrone/FallenEmperorsThrone.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/FallenEmperorsThrone/FallenEmperorsThrone.java
@@ -78,7 +78,7 @@ public class FallenEmperorsThrone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -244,7 +244,7 @@ public class FallenEmperorsThrone extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
index 36d96d5c5f..05d3cdeec1 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
@@ -58,7 +58,7 @@ public class FortressOfTheDead extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/Fortuna/Fortuna.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/Fortuna/Fortuna.java
index c50326b52e..f2dc501ecc 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/Fortuna/Fortuna.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/Fortuna/Fortuna.java
@@ -51,7 +51,7 @@ public class Fortuna extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -472,7 +472,7 @@ public class Fortuna extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
index b31be445a7..7de1e3666f 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
@@ -642,7 +642,7 @@ public class Kamaloka extends AbstractInstance
 	 * Handles only player's enter, single parameter - integer kamaloka index
 	 */
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
index 15482face0..e4dc77f4be 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
@@ -195,7 +195,7 @@ public class KartiasLabyrinth extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -268,7 +268,7 @@ public class KartiasLabyrinth extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java
index 18f1c3b46e..86b33de34f 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java
@@ -57,7 +57,7 @@ public class KastiaExceptional extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -182,7 +182,7 @@ public class KastiaExceptional extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java
index 580fdf81a9..5ab08b0b64 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java
@@ -57,7 +57,7 @@ public class KastiaExtreme extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -182,7 +182,7 @@ public class KastiaExtreme extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java
index deaf00d219..3d27416f6b 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java
@@ -57,7 +57,7 @@ public class KastiaHard extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -182,7 +182,7 @@ public class KastiaHard extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/KastiaHugos/KastiaHugos.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/KastiaHugos/KastiaHugos.java
index 7728a9a289..21d8fe78f3 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/KastiaHugos/KastiaHugos.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/KastiaHugos/KastiaHugos.java
@@ -57,7 +57,7 @@ public class KastiaHugos extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -183,7 +183,7 @@ public class KastiaHugos extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java
index 6eeebb3001..5c395c5c1e 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java
@@ -57,7 +57,7 @@ public class KastiaLow extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -182,7 +182,7 @@ public class KastiaLow extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java
index 67f60c1410..dfc897b593 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java
@@ -57,7 +57,7 @@ public class KastiaMedium extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -182,7 +182,7 @@ public class KastiaMedium extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java
index 33e31cfc97..6cd7385202 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java
@@ -148,7 +148,7 @@ public class KrofinNest extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.contains("enterInstance"))
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
index 896da5bd9b..5f0196d123 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
@@ -81,7 +81,7 @@ public class MysticTavern extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
index 65c510479b..7cc1e75537 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
@@ -81,7 +81,7 @@ public class StoryOfFreya extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance world = npc.getInstanceWorld();
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
index e21d937eb6..d1d82fe8d7 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
@@ -107,7 +107,7 @@ public class StoryOfTauti extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		switch (event)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
index 3767eaff24..4dc0cb5266 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
@@ -82,7 +82,7 @@ public class NightmareKamaloka extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.contains("enterInstance"))
 		{
@@ -146,7 +146,7 @@ public class NightmareKamaloka extends AbstractInstance
 				instance.spawnGroup("BOSSES");
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
index 12fe96b1a8..931b04d4f3 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
@@ -93,7 +93,7 @@ public class NornilsGarden extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (isInInstance(world))
@@ -157,7 +157,7 @@ public class NornilsGarden extends AbstractInstance
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/Nursery/Nursery.java
index 368a5304f0..c2586dad39 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/Nursery/Nursery.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/Nursery/Nursery.java
@@ -192,7 +192,7 @@ public class Nursery extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance instance = npc.getInstanceWorld();
 		if (isInInstance(instance))
@@ -269,7 +269,7 @@ public class Nursery extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
index b872ceea2c..9a508f0d71 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
@@ -105,7 +105,7 @@ public class PailakaRuneCastle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
index 3d6d27f8e1..070ecbc638 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
@@ -173,7 +173,7 @@ public class PrisonOfDarkness extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -313,7 +313,7 @@ public class PrisonOfDarkness extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/SpiritForest/SpiritForest.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/SpiritForest/SpiritForest.java
index df4e056c5b..7a3479dfc7 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/SpiritForest/SpiritForest.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/SpiritForest/SpiritForest.java
@@ -48,7 +48,7 @@ public class SpiritForest extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.contains("enterInstance"))
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java
index 585b039067..24b9f5206b 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java
@@ -63,7 +63,7 @@ public class ThroneOfHeroesGoldberg extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -173,7 +173,7 @@ public class ThroneOfHeroesGoldberg extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java
index 26177ff12b..2dc74138ad 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java
@@ -64,7 +64,7 @@ public class ThroneOfHeroesMaryReed extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -184,7 +184,7 @@ public class ThroneOfHeroesMaryReed extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java
index 638007d55f..b7cd54597d 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java
@@ -61,7 +61,7 @@ public class ThroneOfHeroesTauti extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -161,7 +161,7 @@ public class ThroneOfHeroesTauti extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
index d200373835..588a4a68d8 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
@@ -53,7 +53,7 @@ public class TimedHunting extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("ENTER"))
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
index 0bfb256a66..176b40ad56 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
@@ -69,7 +69,7 @@ public class Q00500_BrothersBoundInChains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
index 8facc4a8cd..6476fcc9c3 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
@@ -71,7 +71,7 @@ public class Q00511_AwlUnderFoot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
index eab4647ba2..31444f8866 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
@@ -58,7 +58,7 @@ public class Q00512_BladeUnderFoot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
index 0278e46ec2..17895d5c45 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
@@ -69,7 +69,7 @@ public class Q00726_LightWithinTheDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
index da19640964..bd744f7aaa 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
@@ -57,7 +57,7 @@ public class Q00727_HopeWithinTheDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
index c061efe91f..f207fc5be9 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
@@ -65,7 +65,7 @@ public class Q00833_DevilsTreasureTauti extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
index 292e7f1afa..61990eab1e 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
@@ -61,7 +61,7 @@ public class Q00835_PitiableMelisa extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java
index 29426b05de..09ddc5f58a 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java
@@ -67,7 +67,7 @@ public class Q00933_TombRaiders extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java
index 784084e18f..3f3674f408 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java
@@ -79,7 +79,7 @@ public class Q00937_ToReviveTheFishingGuild extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java
index fcaea628f2..14766f9216 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java
@@ -73,7 +73,7 @@ public class Q00938_TheFishermansOtherHobby extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java
index 817ee68ba9..021cbbfcc0 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java
@@ -88,7 +88,7 @@ public class Q10423_EmbryoStrongholdRaid extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java
index 761797518b..d6537e90c9 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java
@@ -49,7 +49,7 @@ public class Q10454_FinalEmbryoApostle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10507_ObtainingNewPower/Q10507_ObtainingNewPower.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10507_ObtainingNewPower/Q10507_ObtainingNewPower.java
index 8ae4e5fe2b..1a92b95ad1 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10507_ObtainingNewPower/Q10507_ObtainingNewPower.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10507_ObtainingNewPower/Q10507_ObtainingNewPower.java
@@ -291,7 +291,7 @@ public class Q10507_ObtainingNewPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10510_PowerHarmony/Q10510_PowerHarmony.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10510_PowerHarmony/Q10510_PowerHarmony.java
index f61c3a6c6a..54ee1af2dc 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10510_PowerHarmony/Q10510_PowerHarmony.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10510_PowerHarmony/Q10510_PowerHarmony.java
@@ -294,7 +294,7 @@ public class Q10510_PowerHarmony extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
index 86fea11e6d..4589339a10 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
@@ -55,7 +55,7 @@ public class Q10566_BestChoice extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java
index 56409f0451..c3f4674441 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java
@@ -74,7 +74,7 @@ public class Q10575_LetsGoFishing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java
index a79439b88b..49dcc809cc 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java
@@ -62,7 +62,7 @@ public class Q10576_GlitteringWeapons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java
index b7a645d684..b4bb16e3f6 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java
@@ -63,7 +63,7 @@ public class Q10577_TemperARustingBlade extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java
index 1860df40d1..26af860404 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java
@@ -63,7 +63,7 @@ public class Q10578_TheSoulOfASword extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java
index 644c574b0d..4537723324 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java
@@ -67,7 +67,7 @@ public class Q10579_ContainingTheAttributePower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/Q10589_WhereFatesIntersect.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/Q10589_WhereFatesIntersect.java
index 0ecc4c35cd..8407b19d77 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/Q10589_WhereFatesIntersect.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/Q10589_WhereFatesIntersect.java
@@ -81,7 +81,7 @@ public class Q10589_WhereFatesIntersect extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10590_ReawakenedFate/Q10590_ReawakenedFate.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10590_ReawakenedFate/Q10590_ReawakenedFate.java
index 354d99a2dd..ee6added48 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10590_ReawakenedFate/Q10590_ReawakenedFate.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10590_ReawakenedFate/Q10590_ReawakenedFate.java
@@ -78,7 +78,7 @@ public class Q10590_ReawakenedFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java
index b296c99fa4..2e42c135aa 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java
@@ -120,7 +120,7 @@ public class Q10591_NobleMaterial extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
index fed9180de0..92cd315bde 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
@@ -55,7 +55,7 @@ public class Q10801_TheDimensionalWarpPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
index bd46cfb897..95777295ab 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
@@ -56,7 +56,7 @@ public class Q10802_TheDimensionalWarpPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
index 9560eb688d..7b3b969cf2 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
@@ -57,7 +57,7 @@ public class Q10803_TheDimensionalWarpPart3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
index fb872fbfdb..d8ee64274a 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
@@ -57,7 +57,7 @@ public class Q10804_TheDimensionalWarpPart4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
index 6cc0e28bdb..62a8439bff 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
@@ -57,7 +57,7 @@ public class Q10805_TheDimensionalWarpPart5 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
index e23193349f..e521f1755b 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
@@ -56,7 +56,7 @@ public class Q10806_TheDimensionalWarpPart6 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
index 5b5bdeac13..0ce2015b41 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
@@ -56,7 +56,7 @@ public class Q10807_TheDimensionalWarpPart7 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
index 4b4b117818..6092282d6a 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
@@ -284,7 +284,7 @@ public class Q10811_ExaltedOneWhoFacesTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
index 57dc065bda..8a368f06a3 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
@@ -289,7 +289,7 @@ public class Q10817_ExaltedOneWhoOvercomesTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
index b28781305c..7b0e746352 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
@@ -296,7 +296,7 @@ public class Q10823_ExaltedOneWhoShattersTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
index b57069606f..87c31089c3 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
@@ -288,7 +288,7 @@ public class Q10873_ExaltedReachingAnotherLevel extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java
index 01b386a2ef..273476a753 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java
@@ -288,7 +288,7 @@ public class Q10879_ExaltedGuideToPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java
index 9a054202bc..d583771308 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java
@@ -48,7 +48,7 @@ public class Q10885_SaviorsPathDiscovery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/Q10886_SaviorsPathSearchTheRefinery.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/Q10886_SaviorsPathSearchTheRefinery.java
index b62ea06541..7e37940ea1 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/Q10886_SaviorsPathSearchTheRefinery.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/Q10886_SaviorsPathSearchTheRefinery.java
@@ -57,7 +57,7 @@ public class Q10886_SaviorsPathSearchTheRefinery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10887_SaviorsPathDemonsAndAtelia/Q10887_SaviorsPathDemonsAndAtelia.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10887_SaviorsPathDemonsAndAtelia/Q10887_SaviorsPathDemonsAndAtelia.java
index 193ff9a85f..a97eda0fad 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10887_SaviorsPathDemonsAndAtelia/Q10887_SaviorsPathDemonsAndAtelia.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10887_SaviorsPathDemonsAndAtelia/Q10887_SaviorsPathDemonsAndAtelia.java
@@ -75,7 +75,7 @@ public class Q10887_SaviorsPathDemonsAndAtelia extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10888_SaviorsPathDefeatTheEmbryo/Q10888_SaviorsPathDefeatTheEmbryo.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10888_SaviorsPathDefeatTheEmbryo/Q10888_SaviorsPathDefeatTheEmbryo.java
index 13bc8b7f5d..0b327f1214 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10888_SaviorsPathDefeatTheEmbryo/Q10888_SaviorsPathDefeatTheEmbryo.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10888_SaviorsPathDefeatTheEmbryo/Q10888_SaviorsPathDefeatTheEmbryo.java
@@ -76,7 +76,7 @@ public class Q10888_SaviorsPathDefeatTheEmbryo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10889_SaviorsPathFallenEmperorsThrone/Q10889_SaviorsPathFallenEmperorsThrone.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10889_SaviorsPathFallenEmperorsThrone/Q10889_SaviorsPathFallenEmperorsThrone.java
index 7433394636..b07febb37d 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10889_SaviorsPathFallenEmperorsThrone/Q10889_SaviorsPathFallenEmperorsThrone.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10889_SaviorsPathFallenEmperorsThrone/Q10889_SaviorsPathFallenEmperorsThrone.java
@@ -55,7 +55,7 @@ public class Q10889_SaviorsPathFallenEmperorsThrone extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10890_SaviorsPathHallOfEtina/Q10890_SaviorsPathHallOfEtina.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10890_SaviorsPathHallOfEtina/Q10890_SaviorsPathHallOfEtina.java
index 3ffd458ca5..e018b92b03 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10890_SaviorsPathHallOfEtina/Q10890_SaviorsPathHallOfEtina.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10890_SaviorsPathHallOfEtina/Q10890_SaviorsPathHallOfEtina.java
@@ -63,7 +63,7 @@ public class Q10890_SaviorsPathHallOfEtina extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/Q10904_JourneyToTheConquestWorld.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/Q10904_JourneyToTheConquestWorld.java
index a720ce3330..840105d886 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/Q10904_JourneyToTheConquestWorld.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/Q10904_JourneyToTheConquestWorld.java
@@ -46,7 +46,7 @@ public class Q10904_JourneyToTheConquestWorld extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10905_HuntingTime/Q10905_HuntingTime.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10905_HuntingTime/Q10905_HuntingTime.java
index dbaa7de9ce..d5f958353e 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10905_HuntingTime/Q10905_HuntingTime.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10905_HuntingTime/Q10905_HuntingTime.java
@@ -165,7 +165,7 @@ public class Q10905_HuntingTime extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10906_ChasingTheLight/Q10906_ChasingTheLight.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10906_ChasingTheLight/Q10906_ChasingTheLight.java
index 8fa1226328..ae9310f49b 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10906_ChasingTheLight/Q10906_ChasingTheLight.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10906_ChasingTheLight/Q10906_ChasingTheLight.java
@@ -58,7 +58,7 @@ public class Q10906_ChasingTheLight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/Q10907_WhereFlowersBlossom.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/Q10907_WhereFlowersBlossom.java
index bf7448011d..1965b35647 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/Q10907_WhereFlowersBlossom.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/Q10907_WhereFlowersBlossom.java
@@ -66,7 +66,7 @@ public class Q10907_WhereFlowersBlossom extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
index 27700a3f25..4d469eb387 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
@@ -85,7 +85,7 @@ public class Q11024_PathOfDestinyBeginning extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
index d5d956a12f..34f6b7c54f 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
@@ -125,7 +125,7 @@ public class Q11025_PathOfDestinyProving extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
index 1154f7ab9a..0d97f2491d 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
@@ -103,7 +103,7 @@ public class Q11026_PathOfDestinyConviction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
index 1b4823b77f..0506931469 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
@@ -131,7 +131,7 @@ public class Q11027_PathOfDestinyOvercome extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/ThirdClassTransferQuest.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
index 01e2aa4e07..37204abcf7 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
@@ -133,7 +133,7 @@ public abstract class ThirdClassTransferQuest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/vehicles/AirShipController.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/vehicles/AirShipController.java
index 7a4d275f38..8aa778cc9d 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/vehicles/AirShipController.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/vehicles/AirShipController.java
@@ -117,7 +117,7 @@ public abstract class AirShipController extends AbstractNpcAI
 	private static final SystemMessage SM_NEED_MORE = new SystemMessage(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_S1_TO_SUMMON_THE_AIRSHIP).addItemName(STARSTONE);
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("summon".equalsIgnoreCase(event))
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
index 577ccc1221..a6db0e075e 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
@@ -162,7 +162,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player.isTransformed())
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
index 7ff39fb0c0..8675a7ec2c 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
@@ -51,7 +51,7 @@ public class AllianceMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!"9001-01.htm".equals(event) && (player.getClan() == null))
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
index c6283aa1cb..5ba0115c27 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
@@ -95,7 +95,7 @@ public class ClanMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LEADER_REQUIRED.containsKey(event) && !player.isClanLeader())
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/quest/Quest.java
index 1fd7b05825..d20c81ca02 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/quest/Quest.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/quest/Quest.java
@@ -252,7 +252,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -274,7 +274,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -565,7 +565,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 			{
 				player.setSimulatedTalking(false);
 			}
-			res = onAdvEvent(event, npc, player);
+			res = onEvent(event, npc, player);
 		}
 		catch (Exception e)
 		{
@@ -1043,12 +1043,11 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 */
 	public String onDeath(Creature killer, Creature victim, QuestState qs)
 	{
-		return onAdvEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
+		return onEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
 	}
 	
 	/**
 	 * This function is called whenever a player clicks on a link in a quest dialog and whenever a timer fires.<br>
-	 * If is not overridden by a subclass, then default to the returned value of the simpler (and older) {@link #onEvent(String, QuestState)} override.<br>
 	 * If the player has a quest state, use it as parameter in the next call, otherwise return null.
 	 * @param event this parameter contains a string identifier for the event.<br>
 	 *            Generally, this string is passed directly via the link.<br>
@@ -1067,35 +1066,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 *            This parameter may be {@code null} in certain circumstances.
 	 * @return the text returned by the event (may be {@code null}, a filename or just text)
 	 */
-	public String onAdvEvent(String event, Npc npc, Player player)
-	{
-		if (player != null)
-		{
-			final QuestState qs = player.getQuestState(getName());
-			if (qs != null)
-			{
-				return onEvent(event, qs);
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * This function is called in place of {@link #onAdvEvent(String, Npc, Player)} if the former is not implemented.<br>
-	 * If a script contains both {@link #onAdvEvent(String, Npc, Player)} and this implementation, then this method will never be called unless the script's {@link #onAdvEvent(String, Npc, Player)} explicitly calls this method.
-	 * @param event this parameter contains a string identifier for the event.<br>
-	 *            Generally, this string is passed directly via the link.<br>
-	 *            For example:<br>
-	 *            <code>
-	 *            &lt;a action="bypass -h Quest 626_ADarkTwilight 31517-01.htm"&gt;hello&lt;/a&gt;
-	 *            </code><br>
-	 *            The above link sets the event variable to "31517-01.htm" for the quest 626_ADarkTwilight.<br>
-	 *            In the case of timers, this will be the name of the timer.<br>
-	 *            This parameter serves as a sort of identifier.
-	 * @param qs this parameter contains a reference to the quest state of the player who used the link or started the timer.
-	 * @return the text returned by the event (may be {@code null}, a filename or just text)
-	 */
-	public String onEvent(String event, QuestState qs)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return null;
 	}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Aden/Gallias/Gallias.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Aden/Gallias/Gallias.java
index ae5ee1c2c9..d7d66442a2 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Aden/Gallias/Gallias.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Aden/Gallias/Gallias.java
@@ -66,7 +66,7 @@ public class Gallias extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String[] substrings = event.split(" ");
 		if (substrings.length < 1)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java
index 823e8ad3d0..8777766020 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java
@@ -47,7 +47,7 @@ public class Herphah extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Aden/Joachim/Joachim.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Aden/Joachim/Joachim.java
index bb0ec03afc..6eb0fa0b37 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Aden/Joachim/Joachim.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Aden/Joachim/Joachim.java
@@ -90,7 +90,7 @@ public class Joachim extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Aden/Lulu/Lulu.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Aden/Lulu/Lulu.java
index 262c1dd098..5a3283459b 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Aden/Lulu/Lulu.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Aden/Lulu/Lulu.java
@@ -58,7 +58,7 @@ public class Lulu extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("LULU_BLESSING") && (npc != null) && (npc.getId() == LULU))
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java
index 50c6589614..cc7376cb68 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java
@@ -47,7 +47,7 @@ public class Penny extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java
index aa798606e3..0112d3ab9c 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java
@@ -46,7 +46,7 @@ public class Ruine extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
index 2e2fb2c8ac..2de7c0cc27 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
@@ -68,7 +68,7 @@ public class AncientArcanCity extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CHANGE_STATE"))
 		{
@@ -102,7 +102,7 @@ public class AncientArcanCity extends AbstractNpcAI
 				cat.broadcastSocialAction(2);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
index 488f213820..9b0cc67a24 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
@@ -42,7 +42,7 @@ public class Lykus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
index b794fb595b..852a7b9086 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
@@ -39,7 +39,7 @@ public class Mumu extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
index a30526fee5..4c625e3e07 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
@@ -329,7 +329,7 @@ public class AteliaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java
index 17ce64d654..95b253e31e 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java
@@ -75,7 +75,7 @@ public class AteliaRefinery extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java
index 3e37d72e7c..eab023a641 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java
@@ -49,7 +49,7 @@ public class Leona extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
@@ -115,7 +115,7 @@ public class Leona extends AbstractNpcAI
 		{
 			player.teleToLocation(REFINERY, true);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
index e39b64dcbf..0a5bc49ff4 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
@@ -56,7 +56,7 @@ public class BabyPets extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("HEAL") && (player != null))
 		{
@@ -78,7 +78,7 @@ public class BabyPets extends AbstractNpcAI
 				cancelQuestTimer("HEAL", null, player);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGOUT)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
index b28130726f..58b96be423 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
@@ -56,7 +56,7 @@ public class ImprovedBabyPets extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player != null)
 		{
@@ -108,7 +108,7 @@ public class ImprovedBabyPets extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Belas/Belas.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Belas/Belas.java
index da40a976bc..c932119b84 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Belas/Belas.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Belas/Belas.java
@@ -44,7 +44,7 @@ public class Belas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/BlackbirdCampsite/SoulSummonStone/SoulSummonStone.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/BlackbirdCampsite/SoulSummonStone/SoulSummonStone.java
index bc2bf34ac6..96d63c4e03 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/BlackbirdCampsite/SoulSummonStone/SoulSummonStone.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/BlackbirdCampsite/SoulSummonStone/SoulSummonStone.java
@@ -47,7 +47,7 @@ public class SoulSummonStone extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class SoulSummonStone extends AbstractNpcAI
 				return "34434-05.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/BlackbirdCampsite/TeleportDevice/TeleportDevice.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/BlackbirdCampsite/TeleportDevice/TeleportDevice.java
index bfafb8ec79..675ee1ff2e 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/BlackbirdCampsite/TeleportDevice/TeleportDevice.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/BlackbirdCampsite/TeleportDevice/TeleportDevice.java
@@ -44,7 +44,7 @@ public class TeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Valleria/Valleria.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Valleria/Valleria.java
index e7d88bcaef..6371e314fb 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Valleria/Valleria.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Valleria/Valleria.java
@@ -46,7 +46,7 @@ public class Valleria extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/ConquestTeleportDevice/ConquestTeleportDevice.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/ConquestTeleportDevice/ConquestTeleportDevice.java
index c2a22fa9b9..af4c7a4b5c 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/ConquestTeleportDevice/ConquestTeleportDevice.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/ConquestTeleportDevice/ConquestTeleportDevice.java
@@ -71,7 +71,7 @@ public class ConquestTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/Flowers/Flowers.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/Flowers/Flowers.java
index 06e13196ef..e916dc97e0 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/Flowers/Flowers.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/Flowers/Flowers.java
@@ -66,7 +66,7 @@ public class Flowers extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/SacredFire/SacredFire.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/SacredFire/SacredFire.java
index 057a50c280..c77aa6d92f 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/SacredFire/SacredFire.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/SacredFire/SacredFire.java
@@ -111,7 +111,7 @@ public class SacredFire extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final long personalConquestPoints = player.getVariables().getLong(PlayerVariables.CONQUEST_PERSONAL_POINTS, 0);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
index f4cdad9ea7..4cd76e8871 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
@@ -46,14 +46,14 @@ public class CrumaTower extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("MESSAGE") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_GO_TO_UNDERGROUND_LV_3_USING_THE_ELEVATOR_IN_THE_BACK);
 			startQuestTimer(event, 15000, npc, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
index ed9e78dba6..577e1cb8f9 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
@@ -77,7 +77,7 @@ public class FrightenedRagnaOrc extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
index 637a0cb100..df0cbfae1d 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
@@ -53,7 +53,7 @@ public class DragonVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("Spawn".equals(event))
 		{
@@ -104,7 +104,7 @@ public class DragonVortex extends AbstractNpcAI
 		{
 			npc.setScriptValue(0);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
index d2aaa1686f..a71dea5ac3 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
@@ -53,7 +53,7 @@ public class LairOfAntharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CHECK_HOME") && (npc != null) && !npc.isDead())
 		{
@@ -67,7 +67,7 @@ public class LairOfAntharas extends AbstractNpcAI
 				npc.broadcastPacket(new ValidateLocation(npc));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
index 34f9a042b7..573e147009 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
@@ -55,7 +55,7 @@ public class LeopardDragonHachling extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && event.equals("MOVE_TO_TRANSFORM"))
 		{
@@ -77,7 +77,7 @@ public class LeopardDragonHachling extends AbstractNpcAI
 				npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, nearestLocation(npc));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
index f6333cf6fa..d1c9801807 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
@@ -40,13 +40,13 @@ public class MercenaryCaptain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THE_SOUTHERN_PART_OF_DRAGON_VALLEY_IS_MUCH_MORE_DANGEROUS_THAN_THE_NORTHERN_BE_CAREFUL));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
index 1db1f78ddf..9f52d63860 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
@@ -61,10 +61,10 @@ public class MercenaryTeleport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		player.teleToLocation(LOCATIONS.get(event), true);
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DragonValley/Namo.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
index 3aebefab98..d94ae48017 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
@@ -40,13 +40,13 @@ public class Namo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THIS_PLACE_SWARMS_WITH_DRAGONS_BY_DAY_AND_UNDEAD_BY_NIGHT));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
index 3b0bea96c3..c7d4f89089 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
@@ -40,13 +40,13 @@ public class Rakun extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THIS_PLACE_SWARMS_WITH_DRAGONS_BY_DAY_AND_UNDEAD_BY_NIGHT));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
index 9c43f65c14..7126be9541 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
@@ -72,7 +72,7 @@ public class SeparatedSoul extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LOCATIONS.containsKey(event))
 		{
@@ -98,7 +98,7 @@ public class SeparatedSoul extends AbstractNpcAI
 				return "no-items.htm";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java
index c0e846b2a9..6f4e5076b1 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java
@@ -50,7 +50,7 @@ public class Celestiel extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
index 51845e016e..b68fc842c7 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
@@ -49,7 +49,7 @@ public class AltarOfSouls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -96,7 +96,7 @@ public class AltarOfSouls extends AbstractNpcAI
 				return "33920-9.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
index 213ee3aba8..b8ceddde88 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
@@ -41,7 +41,7 @@ public class RemembranceTower extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("action") && npc.isScriptValue(0))
 		{
@@ -54,7 +54,7 @@ public class RemembranceTower extends AbstractNpcAI
 			npc.setScriptValue(0);
 			npc.broadcastPacket(new OnEventTrigger(EMMITER_ID, false));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
index 58df471290..aed0ea41aa 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
@@ -57,7 +57,7 @@ public class LargeCocoon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -134,7 +134,7 @@ public class LargeCocoon extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
index b8f295b4f4..07dcd68131 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
@@ -41,7 +41,7 @@ public class KrateisCube extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
index 4fbe395a2e..d29e5f30b0 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
@@ -365,7 +365,7 @@ public class TalentShow extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((event == null) || event.isEmpty())
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
index 643e2d0967..a09f8441a9 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
@@ -88,7 +88,7 @@ public class ForgeOfTheGods extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
index a1f80dbbba..a29a7e7422 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
@@ -84,7 +84,7 @@ public class Rooney extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport") && !npc.isDecayed())
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
index bfc9c04cce..3060491458 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
@@ -87,7 +87,7 @@ public class GainakSiege extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("GAINAK_WAR"))
 		{
@@ -129,7 +129,7 @@ public class GainakSiege extends AbstractNpcAI
 				ZoneManager.getInstance().getZoneById(GAINAK_TOWN_ZONE.getId(), PeaceZone.class).setEnabled(false);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
index b547082d2b..7d004b2c28 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
@@ -46,7 +46,7 @@ public class Lailly extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
index b2085cc4ee..be2415b3da 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
@@ -128,7 +128,7 @@ public class TavernEmployee extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
index 93a6441862..07f870be45 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
@@ -76,7 +76,7 @@ public class Apherus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("buff"))
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
index ee3c0e5a60..cace789b79 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
@@ -40,7 +40,7 @@ public class ApherusLookout extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		if (event.equals("open_bag"))
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
index abc2c90fc3..329befe8e2 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
@@ -48,7 +48,7 @@ public class GardenWatchman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -78,7 +78,7 @@ public class GardenWatchman extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
index be6928ac05..24017298e3 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
@@ -42,7 +42,7 @@ public class GenesisVines extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CAST_SKILL") && npc.isScriptValue(1))
 		{
@@ -58,7 +58,7 @@ public class GenesisVines extends AbstractNpcAI
 			npc.setScriptValue(0);
 			npc.deleteMe();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
index 7aa5b51852..601f3e78d4 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
@@ -53,7 +53,7 @@ public class Statues extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("fight"))
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java
index df86411501..4d6c8438a2 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java
@@ -39,7 +39,7 @@ public class Eubina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
index 30427be574..4a8e582e91 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
@@ -46,7 +46,7 @@ public class FuryKiku extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -76,7 +76,7 @@ public class FuryKiku extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
index c7289ad785..568c93f824 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
@@ -50,7 +50,7 @@ public class Isabella extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAWN"))
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java
index 022fba7be5..7f45a854eb 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java
@@ -39,7 +39,7 @@ public class Rotoeh extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
index aa9b15ee4a..7680e80f26 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
@@ -42,7 +42,7 @@ public class GiantsCave extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Giran/Grace/Grace.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Giran/Grace/Grace.java
index 9a5094c18b..4f965135c1 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Giran/Grace/Grace.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Giran/Grace/Grace.java
@@ -56,7 +56,7 @@ public class Grace extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("GRACE_BLESSING") && (npc != null) && (npc.getId() == GRACE))
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
index 6ddf8e1215..65a5c9028c 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
@@ -57,7 +57,7 @@ public class Kekropus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
index 49b51acd25..368323be75 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
@@ -82,7 +82,7 @@ public class Spirit extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -102,7 +102,7 @@ public class Spirit extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java
index 03bc679ddc..b0fae412e1 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java
@@ -71,7 +71,7 @@ public class LionelHunter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs1 = player.getQuestState(Q10811_ExaltedOneWhoFacesTheLimit.class.getSimpleName());
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Heine/WrapGate.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
index 6d5ff6d966..38a8d4ce85 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
@@ -40,7 +40,7 @@ public class WrapGate extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("enter_hellbound".equals(event))
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
index 5c959687d4..a97e52f0ee 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
@@ -39,7 +39,7 @@ public class LeonaBlackbird extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
index a76b250789..e069360325 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
@@ -60,7 +60,7 @@ public class Theorn extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
index 7895170eb3..be5ad1cff4 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
@@ -47,7 +47,7 @@ public class Merlot extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
index c0e3d5750a..5d7cd1d452 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
@@ -43,7 +43,7 @@ public class Zenya extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
index 4cddc8a640..237fc39d2b 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
@@ -63,7 +63,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -135,7 +135,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 				npc.reduceCurrentHp(500, npc, null); // poison kills Fafurion if he is not healed
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
index 62786ffb44..c25971b411 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
@@ -47,7 +47,7 @@ public class Rignos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -90,7 +90,7 @@ public class Rignos extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
index 509ed2062c..ea36e46b7d 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
@@ -57,7 +57,7 @@ public class HillsOfGold extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -75,7 +75,7 @@ public class HillsOfGold extends AbstractNpcAI
 			});
 			startQuestTimer("SPICULA_AGGRO", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
index 7e605d0f40..4cc089deff 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
@@ -61,7 +61,7 @@ public class AvantGarde extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
index 260c075eac..22ad98e51b 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
@@ -108,7 +108,7 @@ public class KetraOrcSupport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
index 3c84026d69..329e309d21 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
@@ -38,13 +38,13 @@ public class El extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_USE_THE_JUMP_BOARD_TO_GET_STRAIGHT_TO_THE_2ND_FLOOR, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
index 2b4e01ea0c..f51a78d8db 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
@@ -47,7 +47,7 @@ public class Erda extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
@@ -113,7 +113,7 @@ public class Erda extends AbstractNpcAI
 		{
 			player.teleToLocation(CAMILLE_LOC, true);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
index e7bf2864a8..faad0ae478 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
@@ -58,7 +58,7 @@ public class GeneralDilios extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("command_"))
 		{
@@ -87,7 +87,7 @@ public class GeneralDilios extends AbstractNpcAI
 				startQuestTimer("guard_animation_" + (value + 1), 1500, null, null);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
index 4661ad169e..4444e44e1f 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
@@ -47,7 +47,7 @@ public class Lekon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
index eb893d6cc3..b503f9e24f 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
@@ -56,7 +56,7 @@ public class LindviorScene extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -109,7 +109,7 @@ public class LindviorScene extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public void scheduleNextLindviorVisit()
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
index 2b891dc72b..200d1b8f01 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
@@ -57,7 +57,7 @@ public class Nottingale extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
index aa54d49073..98e0ba51bf 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
@@ -38,13 +38,13 @@ public class Plenos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_BE_TELEPORTED_TO_EACH_SEED_IF_YOU_VOLUNTEER_WHY_NOT_TRY, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
index 68d82ede48..72023a54b0 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
@@ -46,7 +46,7 @@ public class SeedTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -75,7 +75,7 @@ public class SeedTeleportDevice extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
index ab72fd9af0..61b3db3729 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
@@ -49,7 +49,7 @@ public class MithrilMinesTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int index = Integer.parseInt(event) - 1;
 		if (LOCS.length > index)
@@ -57,7 +57,7 @@ public class MithrilMinesTeleporter extends AbstractNpcAI
 			final Location loc = LOCS[index];
 			player.teleToLocation(loc, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
index 70892b69c1..fadc27f776 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
@@ -84,7 +84,7 @@ public class MonasteryOfSilence extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -132,7 +132,7 @@ public class MonasteryOfSilence extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
index 9a62fc8f94..593dcfba1a 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
@@ -62,7 +62,7 @@ public class PaganTeleporters extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
index 00c9950d3e..bc84758c24 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
@@ -60,7 +60,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -90,7 +90,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI
 				instanceScript.notifyEvent(event, npc, player);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
index 6a7269166d..d680a521ee 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
@@ -39,13 +39,13 @@ public class Fioren extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("startMovie"))
 		{
 			playMovie(player, Movie.SI_BARLOG_STORY);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
index ae5950b460..a547adab25 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
@@ -74,7 +74,7 @@ public class Kaysen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
index 036d5cc4cf..b6e99ed14e 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
@@ -63,7 +63,7 @@ public class NervasTemporaryPrison extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
index e6fa87bc37..2d05d6bc5d 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
@@ -38,14 +38,14 @@ public class RoAGuard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THIS_IS_RUINS_OF_AGONY_WHERE_KANILOV_IS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
index e4b5bcb8ca..b4fe636d73 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
@@ -38,14 +38,14 @@ public class RoDGuard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THIS_IS_THE_RUINS_OF_AGONY_WHERE_POSLOF_IS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
index 89b70890d5..6f9caa1ec7 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
@@ -48,7 +48,7 @@ public class AltarOfSacrifice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("msg_text"))
 		{
@@ -68,7 +68,7 @@ public class AltarOfSacrifice extends AbstractNpcAI
 			startQuestTimer("msg_text", 135000, npc, null);
 			_jenas_guard.setScriptValue(0);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java
index f1605b2373..91042a31e8 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java
@@ -50,7 +50,7 @@ public class Roiental extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterGoldberg"))
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
index f531a781a4..79afa82cb1 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
@@ -147,7 +147,7 @@ public class Venom extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Rune/SwampOfScreams/SwampOfScreamsSiege.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Rune/SwampOfScreams/SwampOfScreamsSiege.java
index beaa3f26da..5d5dbf51a1 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Rune/SwampOfScreams/SwampOfScreamsSiege.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Rune/SwampOfScreams/SwampOfScreamsSiege.java
@@ -79,7 +79,7 @@ public class SwampOfScreamsSiege extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -116,7 +116,7 @@ public class SwampOfScreamsSiege extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
index deb303b021..c5fc651c81 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
@@ -43,7 +43,7 @@ public class Klemis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("portInside"))
 		{
@@ -56,7 +56,7 @@ public class Klemis extends AbstractNpcAI
 				return "32734-01.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
index e7fe7a30db..a76b2970cf 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
@@ -80,7 +80,7 @@ public class Maguen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || (player == null))
 		{
@@ -163,7 +163,7 @@ public class Maguen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
index 101b3642cb..1b94d82ec4 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
@@ -48,7 +48,7 @@ public class Nemo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
index 80fd68cdf2..6f6d527c45 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
@@ -297,7 +297,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("ChangeSeedsStatus"))
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
index 9a411ffb88..be452d8872 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
@@ -51,7 +51,7 @@ public class Seyo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (npc == null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
index 9a37241c55..bd971c500c 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
@@ -197,7 +197,7 @@ public class StakatoNest extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || (player == null) || npc.isDead())
 		{
@@ -225,7 +225,7 @@ public class StakatoNest extends AbstractNpcAI
 			addAttackPlayerDesire(spawned, player);
 			npc.deleteMe();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private static Monster checkMinion(Npc npc)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
index 40b2a86832..42395b5413 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
@@ -47,7 +47,7 @@ public class StakatoNestTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int index = Integer.parseInt(event) - 1;
 		if (LOCS.length > index)
@@ -65,7 +65,7 @@ public class StakatoNestTeleporter extends AbstractNpcAI
 			}
 			player.teleToLocation(loc, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
index 41dbcbf216..5eefc5da6a 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
@@ -44,7 +44,7 @@ public class Apprentice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("rideKukuru"))
 		{
@@ -61,7 +61,7 @@ public class Apprentice extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TRY_RIDING_A_KUKURU, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
index f8e38b7f27..db1544c70c 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
@@ -95,7 +95,7 @@ public class AwakeningMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		if (qs == null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
index 33ef1e75ef..d67ccaf42d 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
@@ -38,7 +38,7 @@ public class Banette extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
@@ -62,7 +62,7 @@ public class Banette extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
index c946859d49..56f1da9739 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
@@ -38,13 +38,13 @@ public class Bink extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TALKING_ISLAND_VILLAGE_IS_REALLY_BEAUTIFUL, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
index 1610f7ea63..efd750bcec 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
@@ -45,7 +45,7 @@ public class BoyAndGirl extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_CHANGEWEAP"))
 		{
@@ -66,7 +66,7 @@ public class BoyAndGirl extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, npc.getId() == BOY ? NpcStringId.WOW_2 : NpcStringId.BOYS_ARE_SO_ANNOYING);
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
index b304102d06..8e7fc027f8 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
@@ -41,7 +41,7 @@ public class Devno extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -74,7 +74,7 @@ public class Devno extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
index 5be095aaed..947279b8a9 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
@@ -42,7 +42,7 @@ public class DrillSergeant extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SOCIAL_SHOW"))
 		{
@@ -66,7 +66,7 @@ public class DrillSergeant extends AbstractNpcAI
 				npc.broadcastSocialAction(socialActionId);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
index 7aa097632b..79ea40ee9a 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
@@ -41,7 +41,7 @@ public class Eleve extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Eleve extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
index e299fd28cb..8e72bdbe20 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
@@ -44,13 +44,13 @@ public class Gagabu extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, GAGABU_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
index 054059086b..ddbfca41f3 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
@@ -38,14 +38,14 @@ public class Galad extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSocialAction(3);
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.OCCASIONALLY_RARE_JEWELS_OF_GIANTS_ARE_DISCOVERED_IN_THE_BEACH, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
index af8aa802e5..339e3d6644 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
@@ -52,7 +52,7 @@ public class GiantSoldiers extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
index 3d3f55d424..023cc6fad3 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
@@ -38,7 +38,7 @@ public class GuardSoldier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -49,7 +49,7 @@ public class GuardSoldier extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(2);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
index 647fc28403..b84fd4aaf9 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
@@ -43,7 +43,7 @@ public class Hadel extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
index a253456338..0804a6ba56 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
@@ -38,7 +38,7 @@ public class Handermonkey extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE") && (npc != null))
 		{
@@ -54,7 +54,7 @@ public class Handermonkey extends AbstractNpcAI
 				npc.broadcastSocialAction(9);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
index b35872373d..cbc7a7867d 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
@@ -61,7 +61,7 @@ public class Hardin extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = getHtmlMessage(player);
 		if (htmltext != null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
index 890656d708..3ef0a0020c 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
@@ -58,7 +58,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("HARNAK_SPAWN"))
 		{
@@ -70,7 +70,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
 				_templates.forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName), null));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private static class zoneInfo
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
index 28136c096d..631295d712 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
@@ -55,13 +55,13 @@ public class HurnakMobMsg extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("ATTACK"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomEntry(ON_ATTACK_MSG));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
index ce0b1e46dc..acf09d8fb9 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
@@ -38,14 +38,14 @@ public class Hera extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomBoolean() ? NpcStringId.DOES_THE_GODDESS_SEE_WHAT_SHE_HAS_DONE : NpcStringId.WHY_HAVE_THE_HEROES_ABANDONED_US);
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
index b1dc850162..01ba5d5cb2 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
@@ -38,7 +38,7 @@ public class Heymond extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
@@ -62,7 +62,7 @@ public class Heymond extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
index 40fa7b4819..51556e3197 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
@@ -38,7 +38,7 @@ public class Holly extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -48,7 +48,7 @@ public class Holly extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(6);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
index c1813c1c1c..6f1bfebbd2 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
@@ -41,7 +41,7 @@ public class Karonf extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Karonf extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
index 3b87cbc466..57d3fe6b7b 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
@@ -44,7 +44,7 @@ public class Luderic extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -54,7 +54,7 @@ public class Luderic extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(1);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
index 5e0fc069f7..ddf9468552 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
@@ -45,13 +45,13 @@ public class Lumi extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, LUMI_SHOUT[getRandom(3)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
index a78def82a7..3e10474ed3 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
@@ -38,13 +38,13 @@ public class Mahram extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.ALCHEMY_IS_A_SCIENCE_AND_AN_ART, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
index 6508884987..d6c1703c4b 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
@@ -38,13 +38,13 @@ public class Mai extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EVERY_RACE_BUILT_A_PIECE_OF_THIS_VILLAGE, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
index b300cd0261..7044e42058 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
@@ -38,13 +38,13 @@ public class MarinSmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.HMM_IS_THIS_STILL_A_DECENT_WEAPON, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
index 37dcf61a59..32fb35afd7 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
@@ -41,7 +41,7 @@ public class Marsha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Marsha extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
index 898a85df76..abcd7a4036 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
@@ -43,7 +43,7 @@ public class Milia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("gludioAirship"))
 		{
@@ -53,7 +53,7 @@ public class Milia extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SPEAK_WITH_ME_ABOUT_TRAVELING_AROUND_ADEN, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
index d7ca380c56..37d028e543 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
@@ -64,7 +64,7 @@ public class MonkOfChaos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
index d3ee0146c3..e61836e286 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
@@ -41,7 +41,7 @@ public class Morgan extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Morgan extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
index 00e7e2cbd6..4aa6e216bb 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
@@ -40,7 +40,7 @@ public class Oris extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SOCIAL_ACTION_1"))
 		{
@@ -55,7 +55,7 @@ public class Oris extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_HAVEN_T_FELT_THIS_GOOD_IN_AGES, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
index 86e0479877..d793e5c2f5 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
@@ -46,7 +46,7 @@ public class Pantheon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
index f40f5ed6f9..a7cd27e9d6 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
@@ -136,7 +136,7 @@ public class Raina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
index 0f60c6161c..001fc241a7 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
@@ -41,7 +41,7 @@ public class Rubentis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Rubentis extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
index 3607f3c4a6..bef019dd59 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
@@ -38,14 +38,14 @@ public class Ruks extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomBoolean() ? NpcStringId.THE_SEVEN_SIGNS_ENDED : NpcStringId.WE_NEED_TO_FIND_HER_WEAKNESS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
index 2a2be8706c..9aa784606f 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
@@ -38,13 +38,13 @@ public class Sebion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TIS_A_SCRATCH, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
index 45369ed246..d7cd855dfc 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
@@ -38,13 +38,13 @@ public class Shannon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.LOOK_AT_ALL_THE_NEWBIES_HA_HA_HA, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
index 69b1f0bbf8..81cacf7b00 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
@@ -44,13 +44,13 @@ public class Sodian extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, SODIAN_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
index b99a7a455f..5743af34d9 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
@@ -44,13 +44,13 @@ public class Stiller extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, STILLER_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
index 805a45e636..199152855a 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
@@ -38,13 +38,13 @@ public class Theodore extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.AND_NOW_YOUR_JOURNEY_BEGINS, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
index caaded5fd2..98278f97f9 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
@@ -38,7 +38,7 @@ public class TomaJunior extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -49,7 +49,7 @@ public class TomaJunior extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(6);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
index b445494095..b5b4d3e364 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
@@ -38,7 +38,7 @@ public class TrainningSoldier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -55,7 +55,7 @@ public class TrainningSoldier extends AbstractNpcAI
 			}
 			startQuestTimer("START_ATTACK", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
index ce046511ec..121db3a9d5 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
@@ -64,7 +64,7 @@ public class Trandon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String[] substrings = event.split(" ");
 		if (substrings.length < 1)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
index e5d6fae1fe..084913f48a 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
@@ -42,7 +42,7 @@ public class YeSagiraGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -56,7 +56,7 @@ public class YeSagiraGuards extends AbstractNpcAI
 			}
 			startQuestTimer("GUARD_AGGRO", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
index bd28187ab5..17ba0fa150 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
@@ -84,7 +84,7 @@ public class YeSegiraTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LOCATIONS.containsKey(event))
 		{
@@ -107,7 +107,7 @@ public class YeSegiraTeleportDevice extends AbstractNpcAI
 				// }
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_PLAYER_CREATE)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
index 6705c96a6a..28fb149e2d 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
@@ -40,7 +40,7 @@ public class Acateo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("give_circlet"))
 		{
@@ -51,7 +51,7 @@ public class Acateo extends AbstractNpcAI
 			giveItems(player, ACADEMY_CIRCLET, 1);
 			return "33905-2.html";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
index 2234d1cd5c..b1d272464c 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
@@ -108,7 +108,7 @@ public class VarkaSilenosSupport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
index 317c878bda..0d20929b02 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
@@ -43,7 +43,7 @@ public class ElmoredenServantsGhost extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("teleport1") || event.equals("teleport2"))
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
index a468f50eb6..a86acca571 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
@@ -83,7 +83,7 @@ public class Wastelands extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || !npc.isSpawned())
 		{
@@ -184,7 +184,7 @@ public class Wastelands extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
index 6757c37107..6c9bbff476 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
@@ -47,7 +47,7 @@ public class ZealotOfShilen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -75,7 +75,7 @@ public class ZealotOfShilen extends AbstractNpcAI
 			}
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
index a91e9af3ac..df31ade535 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
@@ -38,14 +38,14 @@ public class Commando extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.WE_RE_LOOKING_FOR_RANGERS_FROM_ADEN);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Anais/Anais.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Anais/Anais.java
index 1ef3225aff..d6cedb0002 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Anais/Anais.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Anais/Anais.java
@@ -75,7 +75,7 @@ public class Anais extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -134,7 +134,7 @@ public class Anais extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
index 30bcbe6e8f..a31e9c50a5 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
@@ -114,7 +114,7 @@ public class Anakim extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -187,7 +187,7 @@ public class Anakim extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Anakim/AnakimBoss.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Anakim/AnakimBoss.java
index 4d2efc8950..d1eb6a6595 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Anakim/AnakimBoss.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Anakim/AnakimBoss.java
@@ -51,7 +51,7 @@ public class AnakimBoss extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -64,7 +64,7 @@ public class AnakimBoss extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Anakim/AnakimElitePriest.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Anakim/AnakimElitePriest.java
index 830edb0595..92121f98f0 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Anakim/AnakimElitePriest.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Anakim/AnakimElitePriest.java
@@ -46,7 +46,7 @@ public class AnakimElitePriest extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -59,7 +59,7 @@ public class AnakimElitePriest extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index 7a4d70c1a1..9bf351bcc2 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -113,7 +113,7 @@ public class Antharas extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 4d763cfbc2..4f21286ea4 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -162,7 +162,7 @@ public class Baium extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -471,7 +471,7 @@ public class Baium extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
index 38ab8ddc7a..cbfcdaab5c 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
@@ -105,7 +105,7 @@ public class BalokWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -115,7 +115,7 @@ public class BalokWarzone extends AbstractInstance
 				takeItems(player, PRISON_KEY, -1);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
index 41dd776257..07181cf1e3 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java
@@ -81,7 +81,7 @@ public class BaylorWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.contains("enterInstance"))
 		{
@@ -137,7 +137,7 @@ public class BaylorWarzone extends AbstractInstance
 				player.sendPacket(SystemMessageId.YOU_ARE_NOT_IN_A_PARTY_SO_YOU_CANNOT_ENTER);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index 50e09a37f4..ab97ef6856 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -126,7 +126,7 @@ public class Beleth extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -536,7 +536,7 @@ public class Beleth extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
index e209566fa6..fd2ef530f0 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
@@ -49,7 +49,7 @@ public class Wormhole extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Camille/Camille.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Camille/Camille.java
index 2a0a61dd1b..dd233d7417 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Camille/Camille.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Camille/Camille.java
@@ -54,7 +54,7 @@ public class Camille extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class Camille extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Core/Core.java
index 22ecb6163b..33ac1770ac 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -143,7 +143,7 @@ public class Core extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
@@ -162,7 +162,7 @@ public class Core extends AbstractNpcAI
 			_minions.forEach(Attackable::decayMe);
 			_minions.clear();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Cyrax/Cyrax.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Cyrax/Cyrax.java
index 2db6e9aba4..74a0988a6d 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Cyrax/Cyrax.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Cyrax/Cyrax.java
@@ -48,7 +48,7 @@ public class Cyrax extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -61,7 +61,7 @@ public class Cyrax extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Cyrax/TempleEliteWizard.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Cyrax/TempleEliteWizard.java
index 952b95b114..10ba8c3692 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Cyrax/TempleEliteWizard.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Cyrax/TempleEliteWizard.java
@@ -44,7 +44,7 @@ public class TempleEliteWizard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleEliteWizard extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/ChoirOfDarkness.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/ChoirOfDarkness.java
index a751dddda1..6b580a021c 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/ChoirOfDarkness.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/ChoirOfDarkness.java
@@ -44,7 +44,7 @@ public class ChoirOfDarkness extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class ChoirOfDarkness extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/Etina.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/Etina.java
index 4d4a0f502c..af378c3b5c 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/Etina.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/Etina.java
@@ -47,7 +47,7 @@ public class Etina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -60,7 +60,7 @@ public class Etina extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
index c50e6f27bf..d37a600158 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
@@ -348,7 +348,7 @@ public class EtisVanEtina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -515,7 +515,7 @@ public class EtisVanEtina extends AbstractNpcAI
 			}
 			
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private void clean()
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleDarkJudge.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleDarkJudge.java
index b81c3e3326..c87468b0c0 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleDarkJudge.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleDarkJudge.java
@@ -44,7 +44,7 @@ public class GreatTempleDarkJudge extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class GreatTempleDarkJudge extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleSoulGuide.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleSoulGuide.java
index f9b2910521..e2826b2d6a 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleSoulGuide.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleSoulGuide.java
@@ -44,7 +44,7 @@ public class GreatTempleSoulGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class GreatTempleSoulGuide extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/JudgeOfHeresy.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/JudgeOfHeresy.java
index cc97dae023..2d259843ea 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/JudgeOfHeresy.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/JudgeOfHeresy.java
@@ -44,7 +44,7 @@ public class JudgeOfHeresy extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class JudgeOfHeresy extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/Kain.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/Kain.java
index 3e91ed595b..d0b7796a2a 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/Kain.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/Kain.java
@@ -46,7 +46,7 @@ public class Kain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -59,7 +59,7 @@ public class Kain extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/LiberatorOfLust.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/LiberatorOfLust.java
index bc8754e0d1..0fa794a681 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/LiberatorOfLust.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/LiberatorOfLust.java
@@ -44,7 +44,7 @@ public class LiberatorOfLust extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class LiberatorOfLust extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/SeekerOfDespair.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/SeekerOfDespair.java
index 238bb9059d..ba2104ca4a 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/SeekerOfDespair.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/SeekerOfDespair.java
@@ -44,7 +44,7 @@ public class SeekerOfDespair extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class SeekerOfDespair extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/SoulDestroyer.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/SoulDestroyer.java
index b367b6bf57..e0a62f245f 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/SoulDestroyer.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/SoulDestroyer.java
@@ -44,7 +44,7 @@ public class SoulDestroyer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class SoulDestroyer extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleArchon.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleArchon.java
index 1c64cfa42a..44912b9640 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleArchon.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleArchon.java
@@ -44,7 +44,7 @@ public class TempleArchon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleArchon extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleDarkWizard.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleDarkWizard.java
index 3ec81dfc15..b6f7bc9ec0 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleDarkWizard.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleDarkWizard.java
@@ -44,7 +44,7 @@ public class TempleDarkWizard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleDarkWizard extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleFlameMaster.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleFlameMaster.java
index 05fb61b56e..ed88451b14 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleFlameMaster.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleFlameMaster.java
@@ -44,7 +44,7 @@ public class TempleFlameMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleFlameMaster extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleHighPriest.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleHighPriest.java
index a8beab98b5..e6e8f47074 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleHighPriest.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleHighPriest.java
@@ -44,7 +44,7 @@ public class TempleHighPriest extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleHighPriest extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Fafurion/EliteWizard.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Fafurion/EliteWizard.java
index 79e7dda2bb..228eb89e38 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Fafurion/EliteWizard.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Fafurion/EliteWizard.java
@@ -44,7 +44,7 @@ public class EliteWizard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class EliteWizard extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
index f073ce5023..6490646183 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
@@ -104,7 +104,7 @@ public class Fafurion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Fafurion/FafurionBoss.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Fafurion/FafurionBoss.java
index bef5e76a5a..2df7a11464 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Fafurion/FafurionBoss.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Fafurion/FafurionBoss.java
@@ -60,7 +60,7 @@ public class FafurionBoss extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -73,7 +73,7 @@ public class FafurionBoss extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
index 051aa92133..c334e6bcba 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
@@ -63,7 +63,7 @@ public class IceQueensCastle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -113,7 +113,7 @@ public class IceQueensCastle extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
index e8f1807991..fbcb761d20 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
@@ -157,7 +157,7 @@ public class IceQueensCastleBattle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterEasy"))
 		{
@@ -677,7 +677,7 @@ public class IceQueensCastleBattle extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
index c3af699f0a..7987a7ad61 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
@@ -43,7 +43,7 @@ public class Jinia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
index 104e22e3e1..fab0d156d4 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
@@ -165,7 +165,7 @@ public class LastImperialTomb extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
index e210922a52..51cae3cce4 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
@@ -62,7 +62,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Helios/Helios.java
index 639cd6fc22..57afd2efbd 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Helios/Helios.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Helios/Helios.java
@@ -320,7 +320,7 @@ public class Helios extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Helios/Helios1.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Helios/Helios1.java
index fa6ce1207c..acc6b01710 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Helios/Helios1.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Helios/Helios1.java
@@ -45,7 +45,7 @@ public class Helios1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -58,7 +58,7 @@ public class Helios1 extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Helios/Helios2.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Helios/Helios2.java
index 29c7011d9d..1f509d028b 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Helios/Helios2.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Helios/Helios2.java
@@ -45,7 +45,7 @@ public class Helios2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -58,7 +58,7 @@ public class Helios2 extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Helios/Helios3.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Helios/Helios3.java
index e22751d69a..5b486c4776 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Helios/Helios3.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Helios/Helios3.java
@@ -46,7 +46,7 @@ public class Helios3 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -59,7 +59,7 @@ public class Helios3 extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java
index 3d84797981..3ffd2d2d04 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java
@@ -44,7 +44,7 @@ public class RoyalArchmageMinion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class RoyalArchmageMinion extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
index 71911f3b10..38f4ad20f9 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
@@ -92,7 +92,7 @@ public class IstinaCavern extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance instance = npc.getInstanceWorld();
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
index d691b47e99..5dc3034643 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
@@ -40,7 +40,7 @@ public class Rumiese extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
index 23616d549c..40706c5ba2 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
@@ -141,7 +141,7 @@ public class Kelbim extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -281,7 +281,7 @@ public class Kelbim extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
index 3f7474ca75..669f1c6a12 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
@@ -137,7 +137,7 @@ public class KimerianCommon extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance instance = npc.getInstanceWorld();
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
index 1b80edf3d0..0e1c106dd7 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
@@ -113,7 +113,7 @@ public class Lilith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -187,7 +187,7 @@ public class Lilith extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Lilith/LilithBoss.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Lilith/LilithBoss.java
index 88a4754d9b..017f4401c4 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Lilith/LilithBoss.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Lilith/LilithBoss.java
@@ -51,7 +51,7 @@ public class LilithBoss extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -64,7 +64,7 @@ public class LilithBoss extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Lilith/LilithEliteShaman.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Lilith/LilithEliteShaman.java
index fc07c02971..f3cdcab778 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Lilith/LilithEliteShaman.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Lilith/LilithEliteShaman.java
@@ -47,7 +47,7 @@ public class LilithEliteShaman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -60,7 +60,7 @@ public class LilithEliteShaman extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/LimitBarrier.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/LimitBarrier.java
index 2307b7d54a..8465df89d4 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/LimitBarrier.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/LimitBarrier.java
@@ -86,7 +86,7 @@ public class LimitBarrier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -115,7 +115,7 @@ public class LimitBarrier extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
index 2ab4321819..79e2bf0615 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
@@ -49,7 +49,7 @@ public class KatoSicanus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
index 725d1c82a4..1b9da09d48 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
@@ -674,7 +674,7 @@ public class Lindvior extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
index a0143d1006..0642797ceb 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
@@ -49,7 +49,7 @@ public class Vortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -110,7 +110,7 @@ public class Vortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
index ea8fe5012c..43f89210d5 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
@@ -122,7 +122,7 @@ public class OctavisWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -146,7 +146,7 @@ public class OctavisWarzone extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index a1280f613e..993f37de77 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -145,7 +145,7 @@ public class Orfen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -201,7 +201,7 @@ public class Orfen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 749b0837ce..f265014db1 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -79,7 +79,7 @@ public class QueenAnt extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -106,7 +106,7 @@ public class QueenAnt extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
index 3932e219b1..14dc584626 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
@@ -53,7 +53,7 @@ public class QueenShyeed extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java
index cc2d991eed..c797aa26c6 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java
@@ -148,7 +148,7 @@ public class Ramona extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -376,7 +376,7 @@ public class Ramona extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
index d153e1b97e..1ad24e96d2 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
@@ -80,7 +80,7 @@ public class Sailren extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -249,7 +249,7 @@ public class Sailren extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
index 734fba70f4..242c263e46 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
@@ -73,7 +73,7 @@ public class Cannon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
index e489452acb..0ced3aa48d 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
@@ -62,7 +62,7 @@ public class TautiWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -170,7 +170,7 @@ public class TautiWarzone extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
index d5cb93e801..bbe2ae15fa 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
@@ -182,7 +182,7 @@ public class TeredorWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
index 354bd02dfb..5e5ac4e39e 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
@@ -507,7 +507,7 @@ public class Stage1 extends AbstractInstance implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
index 3a2fb5317e..0fbcc084f2 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
@@ -50,7 +50,7 @@ public class Daichir extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterEarthWyrnCave"))
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
index 9d86a999d5..38845fd4c2 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
@@ -570,7 +570,7 @@ public class Trasken extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -694,7 +694,7 @@ public class Trasken extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index ad8dcc0131..ea1b1e89a1 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -191,7 +191,7 @@ public class Valakas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -380,7 +380,7 @@ public class Valakas extends AbstractNpcAI
 		{
 			BOSS_ZONE.oustAllPlayers();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
index 74b234330b..eff9745cb2 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
@@ -172,7 +172,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter60"))
 		{
@@ -254,7 +254,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/AdenReconstructorManager.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
index ee8e2039c8..bb1b3366c1 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
@@ -42,7 +42,7 @@ public class AdenReconstructorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -51,7 +51,7 @@ public class AdenReconstructorManager extends AbstractNpcAI
 				npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THE_LAND_OF_ADEN_IS_IN_NEED_OF_MATERIALS_TO_REBUILD_FROM_SHILLIEN_S_DESTRUCTION);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
index 1d5b61b320..6f90d5ffaf 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
@@ -129,7 +129,7 @@ public class AdventureGuildsman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
index 2766cd07c2..ce1306bea5 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
@@ -64,7 +64,7 @@ public class AdventurersGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/AetherDrops.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/AetherDrops.java
index e7cff46397..7b03584d4c 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/AetherDrops.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/AetherDrops.java
@@ -277,7 +277,7 @@ public class AetherDrops extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) || (player != null))
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
index 146846b28c..41f93ebccf 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
@@ -51,7 +51,7 @@ public class AlchemistManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index ba4c89ccb2..05cd50f4a0 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -63,7 +63,7 @@ public class ArenaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -128,7 +128,7 @@ public class ArenaManager extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
index ec5bcaaa7e..b0ceb24045 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
@@ -38,7 +38,7 @@ public class BlackJudge extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("weakenBreath"))
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
index 5d6ce2dce4..2fe4df94b3 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
@@ -42,7 +42,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equals("31092-01.html"))
@@ -79,7 +79,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 			giveAdena(player, count, false);
 			return "31092-04.html";
 		}
-		return super.onAdvEvent(htmltext, npc, player);
+		return super.onEvent(htmltext, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
index c2cef598e4..9871e6d7cc 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
@@ -56,7 +56,7 @@ public class CastleAmbassador extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
index 21fcb4813a..7bbc678cca 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
@@ -57,7 +57,7 @@ public class CastleBlacksmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return (event.equalsIgnoreCase(npc.getId() + "-02.html") && hasRights(player, npc)) ? event : null;
 	}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
index fc004a82da..483b74139c 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
@@ -393,7 +393,7 @@ public class CastleChamberlain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Castle castle = npc.getCastle();
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
index 9be1866509..ce4104d552 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
@@ -140,7 +140,7 @@ public class CastleCourtMagician extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player.getClan() == null) && (player.getClanId() != npc.getCastle().getOwnerId()))
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
index 71e6de5cfb..4b12db517e 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
@@ -72,7 +72,7 @@ public class CastleDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
index a1466e4501..7f24c7c794 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
@@ -56,7 +56,7 @@ public class CastleMercenaryManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index 859383ede7..34a00e8407 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -78,7 +78,7 @@ public class CastleTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
@@ -168,7 +168,7 @@ public class CastleTeleporter extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
index 2fd32d136c..d222e07095 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
@@ -52,7 +52,7 @@ public class CastleWarehouse extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final boolean isMyLord = player.isClanLeader() && (player.getClan().getCastleId() == (npc.getCastle() != null ? npc.getCastle().getResidenceId() : -1));
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index f2bb40c15c..a6e9f3fc69 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -64,7 +64,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
index a328f1f1c6..b673f2cd8c 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
@@ -57,7 +57,7 @@ public class ClanHallDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 9b7af1eb13..53494639e0 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -103,7 +103,7 @@ public class ClanHallManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
index cb41bb0802..1b7f8fa43b 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
@@ -67,7 +67,7 @@ public class ClanTrader extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 39859c438c..8ffe92dad6 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -237,7 +237,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		if (!_isEnabled)
 		{
@@ -962,7 +962,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	{
 		if (event.getCommand().startsWith("Quest ClassMaster "))
 		{
-			final String html = onAdvEvent(event.getCommand().substring(18), null, event.getPlayer());
+			final String html = onEvent(event.getCommand().substring(18), null, event.getPlayer());
 			event.getPlayer().sendPacket(TutorialCloseHtml.STATIC_PACKET);
 			showResult(event.getPlayer(), html);
 		}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
index d17ae8ecf1..d32004d14c 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
@@ -43,7 +43,7 @@ public class CrimsonHatuOtis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -69,7 +69,7 @@ public class CrimsonHatuOtis extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/DivineBeast.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/DivineBeast.java
index 7ba428a4ac..ace7bc05e4 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/DivineBeast.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/DivineBeast.java
@@ -44,7 +44,7 @@ public class DivineBeast extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player == null) || !player.hasServitors())
 		{
@@ -55,7 +55,7 @@ public class DivineBeast extends AbstractNpcAI
 			cancelQuestTimer(event, npc, player);
 			player.getServitors().values().forEach(summon -> summon.unSummon(player));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/EinhasadStore/EinhasadStore.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/EinhasadStore/EinhasadStore.java
index 0b94653f7d..f71a6c7dd6 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/EinhasadStore/EinhasadStore.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/EinhasadStore/EinhasadStore.java
@@ -54,7 +54,7 @@ public class EinhasadStore extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/EnergySeeds.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/EnergySeeds.java
index 3f5d8b4335..742a23ebb6 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/EnergySeeds.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/EnergySeeds.java
@@ -196,7 +196,7 @@ public class EnergySeeds extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("StartSoDAi"))
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/FameManager/FameManager.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/FameManager/FameManager.java
index 6703456c6e..d7935ea7b4 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/FameManager/FameManager.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/FameManager/FameManager.java
@@ -49,7 +49,7 @@ public class FameManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
index 96707cb209..9e6e75fefc 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
@@ -69,7 +69,7 @@ public class FortressSiegeManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
index 24e8352d82..24122df4f3 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
@@ -85,7 +85,7 @@ public class GameAssistant extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
index a9bacb24e5..a2b3fde3fe 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
@@ -67,7 +67,7 @@ public class HealerTrainer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
index e9cd75460c..b4560d67ab 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
@@ -89,7 +89,7 @@ public class HermuncusMinion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(eventValue, " ");
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/KastiaResearcher/KastiaResearcher.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/KastiaResearcher/KastiaResearcher.java
index 74a31f924d..95a22f53a9 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/KastiaResearcher/KastiaResearcher.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/KastiaResearcher/KastiaResearcher.java
@@ -38,7 +38,7 @@ public class KastiaResearcher extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("exit"))
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
index 82f99b0aad..319f3e7c6e 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
@@ -49,7 +49,7 @@ public class LaVieEnRose extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
index f632a22e48..374ba61a4e 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
@@ -71,7 +71,7 @@ public class ManorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
index 2e1cec1f7f..180966229a 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
@@ -138,7 +138,7 @@ public class MentorGuide extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("exchange"))
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/Minigame/Minigame.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/Minigame/Minigame.java
index d024a66eea..692745957e 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/Minigame/Minigame.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/Minigame/Minigame.java
@@ -68,7 +68,7 @@ public class Minigame extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final MinigameRoom room = getRoomByManager(npc);
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
index f4c0ada4da..c1171a6a41 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
@@ -96,7 +96,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
index 9b25bd70e7..d05d3b25d5 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
@@ -48,14 +48,14 @@ public class NornilTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("teleport_"))
 		{
 			final int locId = Integer.parseInt(event.replace("teleport_", ""));
 			player.teleToLocation(LOCATIONS[locId - 1]);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
index 8999e979f5..abb2c728fc 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
@@ -61,7 +61,7 @@ public class OlyBuffer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index 7215006f36..399a2a13bd 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -88,7 +88,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/PrisonGuards.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/PrisonGuards.java
index 56e657f2cf..89f41510f7 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/PrisonGuards.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/PrisonGuards.java
@@ -53,7 +53,7 @@ public class PrisonGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CLEAR_STATUS"))
 		{
@@ -67,7 +67,7 @@ public class PrisonGuards extends AbstractNpcAI
 			}
 			startQuestTimer("CHECK_HOME", 30000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/PrisonManager/PrisonManager.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/PrisonManager/PrisonManager.java
index 2634f960ad..506ec45e74 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/PrisonManager/PrisonManager.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/PrisonManager/PrisonManager.java
@@ -65,7 +65,7 @@ public class PrisonManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
index 2de491b72f..b69386a3bc 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
@@ -84,7 +84,7 @@ public class Proclaimer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("giveBuff"))
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
index 89ccfeeb31..da0ee6163b 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
@@ -79,7 +79,7 @@ public class ProvisionalHalls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/Servitors/SinEater.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/Servitors/SinEater.java
index f3eef350a6..58c1e1b5fc 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/Servitors/SinEater.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/Servitors/SinEater.java
@@ -48,7 +48,7 @@ public class SinEater extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TALK") && (player != null) && (player.getPet() != null))
 		{
@@ -79,7 +79,7 @@ public class SinEater extends AbstractNpcAI
 			}
 			startQuestTimer("TALK", 60000, null, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_CREATURE_DEATH)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
index 73fc7bbe45..f9f194e984 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
@@ -128,7 +128,7 @@ public class SupportUnitCaptain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int fortOwner = npc.getFort().getOwnerClan() == null ? 0 : npc.getFort().getOwnerClan().getId();
 		if ((player.getClan() == null) || (player.getClanId() != fortOwner))
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
index 2811ce1124..fb74013816 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
@@ -53,7 +53,7 @@ public class SymbolMaker extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
index 5b6352fd25..a0ffaf71f0 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
@@ -94,7 +94,7 @@ public class TeleportToUndergroundColiseum extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.endsWith(".htm"))
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
index 365d552517..e242f3669b 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
@@ -75,7 +75,7 @@ public class TersisHerald extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("giveBuff"))
 		{
@@ -87,7 +87,7 @@ public class TersisHerald extends AbstractNpcAI
 			npc.setTarget(player);
 			npc.doCast(DRAGON_BUFF.getSkill());
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
index 096e76d29c..50a958e759 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
@@ -62,7 +62,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = "";
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
index 62b88383df..cff61e3c05 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
@@ -87,7 +87,7 @@ public class ClassTransferTalk extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/WarriorFishingBlock.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
index 3e99a52646..4c17068d6b 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
@@ -75,7 +75,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -104,7 +104,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java
index 5ea3c6dee4..f271d6a414 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java
@@ -66,7 +66,7 @@ public class WaterDragonEliteSupplyDrops extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) || (player != null))
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
index feb8fdc6f3..41c94c0448 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
@@ -156,7 +156,7 @@ public class WeaverOlf extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.contains("_grade_"))
 		{
@@ -185,7 +185,7 @@ public class WeaverOlf extends AbstractNpcAI
 			}
 			else
 			{
-				return super.onAdvEvent(event, npc, player);
+				return super.onEvent(event, npc, player);
 			}
 			
 			if (hasQuestItems(player, itemIds[0]))
@@ -225,7 +225,7 @@ public class WeaverOlf extends AbstractNpcAI
 			{
 				return npc.getId() + "-no.htm";
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		return event;
 	}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index 0426c4320b..b0e0f70475 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -210,7 +210,7 @@ public class WyvernManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
index b27ac2f278..fb877bb630 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
@@ -36,7 +36,7 @@ public class DelevelManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.DELEVEL_MANAGER_ENABLED)
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
index 3d24e2bd67..84a6dadc7b 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
@@ -54,7 +54,7 @@ public class FactionSystem extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class FactionSystem extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
index 8a1940f5b4..32a1337dc4 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
@@ -34,7 +34,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -77,7 +77,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 				npc.broadcastInfo(); // update flag status
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
index dd92204d87..8d51dd3c2f 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
@@ -60,7 +60,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("AUTOBUFF") && (npc != null) && !npc.isDead())
 		{
@@ -88,7 +88,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
 			}
 			startQuestTimer("AUTOBUFF", 30000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
index bb9c9c2a07..5e4391d17c 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
@@ -39,7 +39,7 @@ public class NoblessMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.NOBLESS_MASTER_ENABLED)
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java
index 8969a03789..a166acce78 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java
@@ -49,7 +49,7 @@ public class ShadowWeapons extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
index ba8d24ed64..82bb289dd9 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
@@ -160,7 +160,7 @@ public class Deathmatch extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
index d65c2ef5a8..2541fd449f 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
@@ -213,7 +213,7 @@ public class Rabbits extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/events/Race/Race.java
index bbf9371324..5bd0aadf97 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/events/Race/Race.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/events/Race/Race.java
@@ -320,7 +320,7 @@ public class Race extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 5bef3710ae..32876f2350 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -177,7 +177,7 @@ public class TvT extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/BalthusFestival/BalthusFestival.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/BalthusFestival/BalthusFestival.java
index 14707d2013..6310750de3 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/BalthusFestival/BalthusFestival.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/BalthusFestival/BalthusFestival.java
@@ -132,7 +132,7 @@ public class BalthusFestival extends LongTimeEvent implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!isEventPeriod())
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
index dd0cf1e2e1..825d5f20eb 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
@@ -45,7 +45,7 @@ public class BirthOfDraco extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
index 0e3e99cb93..97f02c400f 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
@@ -64,7 +64,7 @@ public class CharacterBirthday extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("despawn_npc"))
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/ChuseokHarvestFestival/ChuseokHarvestFestival.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/ChuseokHarvestFestival/ChuseokHarvestFestival.java
index fa4448a978..beea297e1d 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/ChuseokHarvestFestival/ChuseokHarvestFestival.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/ChuseokHarvestFestival/ChuseokHarvestFestival.java
@@ -60,7 +60,7 @@ public class ChuseokHarvestFestival extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/DragonSlayer/DragonSlayer.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/DragonSlayer/DragonSlayer.java
index 6028b2495a..7b325445c2 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/DragonSlayer/DragonSlayer.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/DragonSlayer/DragonSlayer.java
@@ -58,7 +58,7 @@ public class DragonSlayer extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equals("receive_reward"))
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/DreamMaker/DreamMaker.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/DreamMaker/DreamMaker.java
index 2c8168dc14..e313a87db7 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/DreamMaker/DreamMaker.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/DreamMaker/DreamMaker.java
@@ -54,7 +54,7 @@ public class DreamMaker extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index cdd7a3706b..8813e11b05 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -56,7 +56,7 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
index dfc1c6ce43..61a81853da 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
@@ -73,7 +73,7 @@ public class FreyaCelebration extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("give_potion"))
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
index 1913a4c22b..cf05b43301 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
@@ -86,7 +86,7 @@ public class GiftOfVitality extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
index 09fb6ae1a1..b241956f2e 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
@@ -59,7 +59,7 @@ public class HeavyMedal extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		int level = checkLevel(player);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/HungryHorse/HungryHorse.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
index dc51633c85..e2edada6f9 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
@@ -56,7 +56,7 @@ public class HungryHorse extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
index bed65b3783..704b36f005 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
@@ -55,7 +55,7 @@ public class HuntForSanta extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/LegendsMark/LegendsMark.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/LegendsMark/LegendsMark.java
index 957c80c9b7..1f3c44d672 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/LegendsMark/LegendsMark.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/LegendsMark/LegendsMark.java
@@ -216,7 +216,7 @@ public class LegendsMark extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
index 5f00ed589f..2c2ff61b76 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
@@ -49,7 +49,7 @@ public class LoveYourGatekeeper extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
index 86d9b42242..8237a3a59d 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
@@ -61,7 +61,7 @@ public class LoversJubilee extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmtext = event;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
index e4275b525e..d0ce19ca1c 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
@@ -68,7 +68,7 @@ public class MasterOfEnchanting extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("buy_staff"))
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java
index a47e168d14..c8f8fdd631 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java
@@ -76,7 +76,7 @@ public class Eraton extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/RedLibra/RedLibra.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/RedLibra/RedLibra.java
index a0e27dcee8..c5834be45b 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/RedLibra/RedLibra.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/RedLibra/RedLibra.java
@@ -42,7 +42,7 @@ public class RedLibra extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
index 15ce00cf72..c8f1b3032e 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
@@ -58,7 +58,7 @@ public class RudolphsBlessing extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("rudolph_eat") && (player != null) && player.isOnline())
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
index 58f787eeb5..393bf983cc 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
@@ -297,7 +297,7 @@ public class SavingSanta extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!isEventPeriod())
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/SmashItCompletely/SmashItCompletely.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/SmashItCompletely/SmashItCompletely.java
index f6561b0854..5dfe37755f 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/SmashItCompletely/SmashItCompletely.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/SmashItCompletely/SmashItCompletely.java
@@ -100,7 +100,7 @@ public class SmashItCompletely extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/SnowmanEnergy/SnowmanEnergy.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/SnowmanEnergy/SnowmanEnergy.java
index 3e321d0c30..134be45110 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/SnowmanEnergy/SnowmanEnergy.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/SnowmanEnergy/SnowmanEnergy.java
@@ -235,7 +235,7 @@ public class SnowmanEnergy extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
index b5c375c3f4..6435393d96 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
@@ -51,7 +51,7 @@ public class ThePowerOfLove extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java
index 8e90fc10db..67ba1cc555 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java
@@ -45,7 +45,7 @@ public class TrainingWithDandy extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
index 75d9710029..9f1cabf05f 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
@@ -130,7 +130,7 @@ public class AltarOfShilen extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (event.equals("enterInstance"))
@@ -266,7 +266,7 @@ public class AltarOfShilen extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
index 94803658aa..3eb3386e9b 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
@@ -198,7 +198,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.contains("enterInstance"))
 		{
@@ -314,7 +314,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance
 			}
 			return null;
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
index 5a447c59d2..5e355d7494 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
@@ -467,7 +467,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
index 1dd487a5d4..9a50c73199 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
@@ -72,7 +72,7 @@ public class ChamberOfProphecies extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
index d28b4ac526..2893aadafa 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
@@ -177,7 +177,7 @@ public class ChamberOfDelusion extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/CommandPost/CommandPost.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/CommandPost/CommandPost.java
index 3a13a0f95b..301faf7b88 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/CommandPost/CommandPost.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/CommandPost/CommandPost.java
@@ -105,7 +105,7 @@ public class CommandPost extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
index 9982fdd612..d3ec315e68 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
@@ -114,13 +114,13 @@ public class CrystalCavernsCoralGarden extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
index d637bef30e..ea651a8573 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
@@ -79,13 +79,13 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
index 3d35ef1e68..052add4b91 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
@@ -135,13 +135,13 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
index bcdfefa43e..2894965800 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
@@ -122,7 +122,7 @@ public class DarkCloudMansion extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
index a19382a228..9554b30092 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
@@ -43,7 +43,7 @@ public class DimensionMakkum extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = getPlayerInstance(player);
 		switch (event)
@@ -67,7 +67,7 @@ public class DimensionMakkum extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
index 982831b518..0f1aaf54b7 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
@@ -53,13 +53,13 @@ public class DimensionalArchon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), getRandomEntry(ARCHON_MSG)));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
index a0b3f39979..85503329da 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
@@ -53,7 +53,7 @@ public class DimensionalTrap extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || npc.isAlikeDead())
 		{
@@ -102,7 +102,7 @@ public class DimensionalTrap extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
index 61d767d0a3..b796403f1f 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
@@ -115,7 +115,7 @@ public class DimensionalWrap extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java
index 59c1f783c2..cf8b9e2097 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java
@@ -128,7 +128,7 @@ public class EtisVanEtinaSolo extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -476,7 +476,7 @@ public class EtisVanEtinaSolo extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
index 6dcc329c54..c1b34e22c4 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
@@ -44,7 +44,7 @@ public class EvasHiddenSpace extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
index 5f1829d4a8..764871d303 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
@@ -189,12 +189,12 @@ public class EvilIncubator extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player);
 		if ((st == null) || !st.isStarted())
 		{
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/FallenEmperorsThrone/FallenEmperorsThrone.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/FallenEmperorsThrone/FallenEmperorsThrone.java
index 7d2d91104c..bfa6c0c5e7 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/FallenEmperorsThrone/FallenEmperorsThrone.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/FallenEmperorsThrone/FallenEmperorsThrone.java
@@ -78,7 +78,7 @@ public class FallenEmperorsThrone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -244,7 +244,7 @@ public class FallenEmperorsThrone extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
index f84132d869..9e440419b9 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
@@ -58,7 +58,7 @@ public class FortressOfTheDead extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/Fortuna/Fortuna.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/Fortuna/Fortuna.java
index 71258c0e44..970da3bbc7 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/Fortuna/Fortuna.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/Fortuna/Fortuna.java
@@ -51,7 +51,7 @@ public class Fortuna extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -472,7 +472,7 @@ public class Fortuna extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/IceQueensCastle/Freya.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/IceQueensCastle/Freya.java
index 4558870c36..4a4be4bdc9 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/IceQueensCastle/Freya.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/IceQueensCastle/Freya.java
@@ -91,7 +91,7 @@ public class Freya extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -591,7 +591,7 @@ public class Freya extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
index c4c8d9dec9..ec4971adde 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
@@ -642,7 +642,7 @@ public class Kamaloka extends AbstractInstance
 	 * Handles only player's enter, single parameter - integer kamaloka index
 	 */
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
index 71df1bc0c7..67ba405323 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
@@ -195,7 +195,7 @@ public class KartiasLabyrinth extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -268,7 +268,7 @@ public class KartiasLabyrinth extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java
index d4b990007a..9c207ee0d6 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java
@@ -57,7 +57,7 @@ public class KastiaExceptional extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -182,7 +182,7 @@ public class KastiaExceptional extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java
index 2fdb2f6545..1e69a3c2e3 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java
@@ -57,7 +57,7 @@ public class KastiaExtreme extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -182,7 +182,7 @@ public class KastiaExtreme extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java
index e6f8ff1edb..da5ab0837f 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java
@@ -57,7 +57,7 @@ public class KastiaHard extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -182,7 +182,7 @@ public class KastiaHard extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KastiaHugos/KastiaHugos.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KastiaHugos/KastiaHugos.java
index 7728a9a289..21d8fe78f3 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KastiaHugos/KastiaHugos.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KastiaHugos/KastiaHugos.java
@@ -57,7 +57,7 @@ public class KastiaHugos extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -183,7 +183,7 @@ public class KastiaHugos extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java
index faf0bb0115..fe73fb6000 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java
@@ -57,7 +57,7 @@ public class KastiaLow extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -182,7 +182,7 @@ public class KastiaLow extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java
index a8dfce91af..d76c0cf802 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java
@@ -57,7 +57,7 @@ public class KastiaMedium extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -182,7 +182,7 @@ public class KastiaMedium extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java
index bde333c743..bea15bfe21 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java
@@ -207,7 +207,7 @@ public class KrofinNest extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
index 04ef9907cc..38f17b9a10 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
@@ -81,7 +81,7 @@ public class MysticTavern extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
index 792beada18..60c3e76ef3 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
@@ -81,7 +81,7 @@ public class StoryOfFreya extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance world = npc.getInstanceWorld();
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
index dc1f01c993..a432a3061c 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
@@ -107,7 +107,7 @@ public class StoryOfTauti extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		switch (event)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
index e4e6b29aa8..519c3bed01 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
@@ -82,7 +82,7 @@ public class NightmareKamaloka extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.contains("enterInstance"))
 		{
@@ -146,7 +146,7 @@ public class NightmareKamaloka extends AbstractInstance
 				instance.spawnGroup("BOSSES");
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
index 057ad35d11..9f4624da06 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
@@ -93,7 +93,7 @@ public class NornilsGarden extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (isInInstance(world))
@@ -157,7 +157,7 @@ public class NornilsGarden extends AbstractInstance
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/Nursery/Nursery.java
index 537f5b9bd6..5cdc8792e0 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/Nursery/Nursery.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/Nursery/Nursery.java
@@ -192,7 +192,7 @@ public class Nursery extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance instance = npc.getInstanceWorld();
 		if (isInInstance(instance))
@@ -269,7 +269,7 @@ public class Nursery extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
index 05d17c0eba..b02db6b8a2 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
@@ -105,7 +105,7 @@ public class PailakaRuneCastle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
index a775c55a75..2a53eb1b8e 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
@@ -173,7 +173,7 @@ public class PrisonOfDarkness extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -313,7 +313,7 @@ public class PrisonOfDarkness extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/SpiritForest/SpiritForest.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/SpiritForest/SpiritForest.java
index 70fa0de297..a0f4fce659 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/SpiritForest/SpiritForest.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/SpiritForest/SpiritForest.java
@@ -48,7 +48,7 @@ public class SpiritForest extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.contains("enterInstance"))
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java
index 4821d385e9..36da965160 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java
@@ -63,7 +63,7 @@ public class ThroneOfHeroesGoldberg extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -173,7 +173,7 @@ public class ThroneOfHeroesGoldberg extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java
index 64e50fc2d4..85713877b4 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java
@@ -64,7 +64,7 @@ public class ThroneOfHeroesMaryReed extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -184,7 +184,7 @@ public class ThroneOfHeroesMaryReed extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java
index 6d2183e820..2934005d7d 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java
@@ -61,7 +61,7 @@ public class ThroneOfHeroesTauti extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -161,7 +161,7 @@ public class ThroneOfHeroesTauti extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
index 7d83f48064..2e70fd6afc 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
@@ -130,7 +130,7 @@ public class TimedHunting extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("ENTER"))
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
index deb3853b15..590c663ad9 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
@@ -69,7 +69,7 @@ public class Q00500_BrothersBoundInChains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
index 423c6e803e..c864667da8 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
@@ -71,7 +71,7 @@ public class Q00511_AwlUnderFoot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
index a1a53739b6..ddf6e99c97 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
@@ -58,7 +58,7 @@ public class Q00512_BladeUnderFoot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
index 6774e7a4bd..617f21fea8 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
@@ -69,7 +69,7 @@ public class Q00726_LightWithinTheDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
index abfa40101d..4b4817d4d3 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
@@ -57,7 +57,7 @@ public class Q00727_HopeWithinTheDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
index 630aa1cda7..a0ebe33ec3 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
@@ -65,7 +65,7 @@ public class Q00833_DevilsTreasureTauti extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
index c769ce3645..2acf8dfdce 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
@@ -61,7 +61,7 @@ public class Q00835_PitiableMelisa extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java
index 7616d4bbf0..de81d4aaec 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java
@@ -67,7 +67,7 @@ public class Q00933_TombRaiders extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java
index 843fde9426..72231b7c25 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java
@@ -79,7 +79,7 @@ public class Q00937_ToReviveTheFishingGuild extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java
index 99f3fcc930..fe8d92a02b 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java
@@ -73,7 +73,7 @@ public class Q00938_TheFishermansOtherHobby extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java
index b8a48fb7c0..b7adae47eb 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java
@@ -88,7 +88,7 @@ public class Q10423_EmbryoStrongholdRaid extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java
index 0ae20fa900..cc47b45280 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java
@@ -49,7 +49,7 @@ public class Q10454_FinalEmbryoApostle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10507_ObtainingNewPower/Q10507_ObtainingNewPower.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10507_ObtainingNewPower/Q10507_ObtainingNewPower.java
index 549dcdca8b..53a5d44964 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10507_ObtainingNewPower/Q10507_ObtainingNewPower.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10507_ObtainingNewPower/Q10507_ObtainingNewPower.java
@@ -324,7 +324,7 @@ public class Q10507_ObtainingNewPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10510_PowerHarmony/Q10510_PowerHarmony.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10510_PowerHarmony/Q10510_PowerHarmony.java
index 5df473a147..57806eafb8 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10510_PowerHarmony/Q10510_PowerHarmony.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10510_PowerHarmony/Q10510_PowerHarmony.java
@@ -327,7 +327,7 @@ public class Q10510_PowerHarmony extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
index 1f16a04162..700f0cd179 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
@@ -55,7 +55,7 @@ public class Q10566_BestChoice extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java
index 7e752c8f51..7d8d1708e6 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java
@@ -74,7 +74,7 @@ public class Q10575_LetsGoFishing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java
index cce92a68e0..0b2f1f104f 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java
@@ -62,7 +62,7 @@ public class Q10576_GlitteringWeapons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java
index 4ee7e52e23..47341cc412 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java
@@ -63,7 +63,7 @@ public class Q10577_TemperARustingBlade extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java
index e3726f1cbc..4c8311d430 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java
@@ -63,7 +63,7 @@ public class Q10578_TheSoulOfASword extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java
index 6e858af38c..552c974380 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java
@@ -67,7 +67,7 @@ public class Q10579_ContainingTheAttributePower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/Q10589_WhereFatesIntersect.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/Q10589_WhereFatesIntersect.java
index 8b4da55fc2..74101e9544 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/Q10589_WhereFatesIntersect.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/Q10589_WhereFatesIntersect.java
@@ -81,7 +81,7 @@ public class Q10589_WhereFatesIntersect extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10590_ReawakenedFate/Q10590_ReawakenedFate.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10590_ReawakenedFate/Q10590_ReawakenedFate.java
index e59de9802e..6fc05897a4 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10590_ReawakenedFate/Q10590_ReawakenedFate.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10590_ReawakenedFate/Q10590_ReawakenedFate.java
@@ -78,7 +78,7 @@ public class Q10590_ReawakenedFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java
index 7b4c393fd0..a1e02d3b94 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java
@@ -120,7 +120,7 @@ public class Q10591_NobleMaterial extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
index 37095951fa..55a5aaefa4 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
@@ -55,7 +55,7 @@ public class Q10801_TheDimensionalWarpPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
index b5befed756..9c4627c016 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
@@ -56,7 +56,7 @@ public class Q10802_TheDimensionalWarpPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
index 65695c5a8c..2565dec6f1 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
@@ -57,7 +57,7 @@ public class Q10803_TheDimensionalWarpPart3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
index 205ca9acf8..d627be1c7b 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
@@ -57,7 +57,7 @@ public class Q10804_TheDimensionalWarpPart4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
index 175d4c2fc1..10e1981858 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
@@ -57,7 +57,7 @@ public class Q10805_TheDimensionalWarpPart5 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
index beee90af7e..1eadeec2b8 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
@@ -56,7 +56,7 @@ public class Q10806_TheDimensionalWarpPart6 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
index 93768cb23a..de966012e1 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
@@ -56,7 +56,7 @@ public class Q10807_TheDimensionalWarpPart7 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
index 119b9fdae5..e0040553d4 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
@@ -319,7 +319,7 @@ public class Q10811_ExaltedOneWhoFacesTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
index 056a84b2ba..6788562412 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
@@ -324,7 +324,7 @@ public class Q10817_ExaltedOneWhoOvercomesTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
index 7f7838492a..117846c2b8 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
@@ -331,7 +331,7 @@ public class Q10823_ExaltedOneWhoShattersTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
index 3c06ec65b3..5aed716957 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
@@ -323,7 +323,7 @@ public class Q10873_ExaltedReachingAnotherLevel extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java
index f04a9018bb..8eba788a19 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java
@@ -323,7 +323,7 @@ public class Q10879_ExaltedGuideToPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java
index 377cc0827d..9bcc2608e8 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java
@@ -48,7 +48,7 @@ public class Q10885_SaviorsPathDiscovery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/Q10886_SaviorsPathSearchTheRefinery.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/Q10886_SaviorsPathSearchTheRefinery.java
index 69b8e4c169..046a2bfc1c 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/Q10886_SaviorsPathSearchTheRefinery.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/Q10886_SaviorsPathSearchTheRefinery.java
@@ -57,7 +57,7 @@ public class Q10886_SaviorsPathSearchTheRefinery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10887_SaviorsPathDemonsAndAtelia/Q10887_SaviorsPathDemonsAndAtelia.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10887_SaviorsPathDemonsAndAtelia/Q10887_SaviorsPathDemonsAndAtelia.java
index 850b565995..4ea3584275 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10887_SaviorsPathDemonsAndAtelia/Q10887_SaviorsPathDemonsAndAtelia.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10887_SaviorsPathDemonsAndAtelia/Q10887_SaviorsPathDemonsAndAtelia.java
@@ -75,7 +75,7 @@ public class Q10887_SaviorsPathDemonsAndAtelia extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10888_SaviorsPathDefeatTheEmbryo/Q10888_SaviorsPathDefeatTheEmbryo.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10888_SaviorsPathDefeatTheEmbryo/Q10888_SaviorsPathDefeatTheEmbryo.java
index bc32646fe9..fce0db075a 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10888_SaviorsPathDefeatTheEmbryo/Q10888_SaviorsPathDefeatTheEmbryo.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10888_SaviorsPathDefeatTheEmbryo/Q10888_SaviorsPathDefeatTheEmbryo.java
@@ -76,7 +76,7 @@ public class Q10888_SaviorsPathDefeatTheEmbryo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10889_SaviorsPathFallenEmperorsThrone/Q10889_SaviorsPathFallenEmperorsThrone.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10889_SaviorsPathFallenEmperorsThrone/Q10889_SaviorsPathFallenEmperorsThrone.java
index 1fd9101ab3..8ad3c5cb5b 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10889_SaviorsPathFallenEmperorsThrone/Q10889_SaviorsPathFallenEmperorsThrone.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10889_SaviorsPathFallenEmperorsThrone/Q10889_SaviorsPathFallenEmperorsThrone.java
@@ -55,7 +55,7 @@ public class Q10889_SaviorsPathFallenEmperorsThrone extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10890_SaviorsPathHallOfEtina/Q10890_SaviorsPathHallOfEtina.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10890_SaviorsPathHallOfEtina/Q10890_SaviorsPathHallOfEtina.java
index 6a38a93de2..5258b8a7b3 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10890_SaviorsPathHallOfEtina/Q10890_SaviorsPathHallOfEtina.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10890_SaviorsPathHallOfEtina/Q10890_SaviorsPathHallOfEtina.java
@@ -63,7 +63,7 @@ public class Q10890_SaviorsPathHallOfEtina extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/Q10904_JourneyToTheConquestWorld.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/Q10904_JourneyToTheConquestWorld.java
index a720ce3330..840105d886 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/Q10904_JourneyToTheConquestWorld.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/Q10904_JourneyToTheConquestWorld.java
@@ -46,7 +46,7 @@ public class Q10904_JourneyToTheConquestWorld extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10905_HuntingTime/Q10905_HuntingTime.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10905_HuntingTime/Q10905_HuntingTime.java
index dbaa7de9ce..d5f958353e 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10905_HuntingTime/Q10905_HuntingTime.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10905_HuntingTime/Q10905_HuntingTime.java
@@ -165,7 +165,7 @@ public class Q10905_HuntingTime extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10906_ChasingTheLight/Q10906_ChasingTheLight.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10906_ChasingTheLight/Q10906_ChasingTheLight.java
index 8fa1226328..ae9310f49b 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10906_ChasingTheLight/Q10906_ChasingTheLight.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10906_ChasingTheLight/Q10906_ChasingTheLight.java
@@ -58,7 +58,7 @@ public class Q10906_ChasingTheLight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/Q10907_WhereFlowersBlossom.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/Q10907_WhereFlowersBlossom.java
index bf7448011d..1965b35647 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/Q10907_WhereFlowersBlossom.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/Q10907_WhereFlowersBlossom.java
@@ -66,7 +66,7 @@ public class Q10907_WhereFlowersBlossom extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/Q10908_DarkSunPrimordialFlame.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/Q10908_DarkSunPrimordialFlame.java
index 92e604b84c..bd245393e1 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/Q10908_DarkSunPrimordialFlame.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/Q10908_DarkSunPrimordialFlame.java
@@ -49,7 +49,7 @@ public class Q10908_DarkSunPrimordialFlame extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10909_FlameHunting/Q10909_FlameHunting.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10909_FlameHunting/Q10909_FlameHunting.java
index 1acc1f00c6..29b159c333 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10909_FlameHunting/Q10909_FlameHunting.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10909_FlameHunting/Q10909_FlameHunting.java
@@ -113,7 +113,7 @@ public class Q10909_FlameHunting extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/Q10910_InSearchOfTheFireSource.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/Q10910_InSearchOfTheFireSource.java
index c48cbbd4fb..3c7d33cc44 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/Q10910_InSearchOfTheFireSource.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/Q10910_InSearchOfTheFireSource.java
@@ -64,7 +64,7 @@ public class Q10910_InSearchOfTheFireSource extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/Q10911_FireSmell.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/Q10911_FireSmell.java
index f2d826f729..b1d61ec73d 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/Q10911_FireSmell.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/Q10911_FireSmell.java
@@ -64,7 +64,7 @@ public class Q10911_FireSmell extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
index ed8427a4f6..7954f42559 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
@@ -85,7 +85,7 @@ public class Q11024_PathOfDestinyBeginning extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
index d32965c2a7..7f2bf5a2ae 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
@@ -125,7 +125,7 @@ public class Q11025_PathOfDestinyProving extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
index 3a17382c3f..f5eaeb9846 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
@@ -103,7 +103,7 @@ public class Q11026_PathOfDestinyConviction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
index a1bdc845bb..44c1aa1324 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
@@ -131,7 +131,7 @@ public class Q11027_PathOfDestinyOvercome extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/ThirdClassTransferQuest.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
index 6abf0e05aa..e0b1b42f88 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
@@ -133,7 +133,7 @@ public abstract class ThirdClassTransferQuest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/vehicles/AirShipController.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/vehicles/AirShipController.java
index d152ba5968..e177dd4f14 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/vehicles/AirShipController.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/vehicles/AirShipController.java
@@ -117,7 +117,7 @@ public abstract class AirShipController extends AbstractNpcAI
 	private static final SystemMessage SM_NEED_MORE = new SystemMessage(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_S1_TO_SUMMON_THE_AIRSHIP).addItemName(STARSTONE);
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("summon".equalsIgnoreCase(event))
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
index ac981f3f60..3e24424820 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
@@ -162,7 +162,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player.isTransformed())
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
index 82ba0c36c8..29bff5faa7 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
@@ -51,7 +51,7 @@ public class AllianceMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!"9001-01.htm".equals(event) && (player.getClan() == null))
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
index d8696a76a4..fe42ca332e 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
@@ -95,7 +95,7 @@ public class ClanMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LEADER_REQUIRED.containsKey(event) && !player.isClanLeader())
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/quest/Quest.java
index 5b58ba4e05..b26d584dc7 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/quest/Quest.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/quest/Quest.java
@@ -252,7 +252,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -274,7 +274,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -565,7 +565,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 			{
 				player.setSimulatedTalking(false);
 			}
-			res = onAdvEvent(event, npc, player);
+			res = onEvent(event, npc, player);
 		}
 		catch (Exception e)
 		{
@@ -1043,12 +1043,11 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 */
 	public String onDeath(Creature killer, Creature victim, QuestState qs)
 	{
-		return onAdvEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
+		return onEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
 	}
 	
 	/**
 	 * This function is called whenever a player clicks on a link in a quest dialog and whenever a timer fires.<br>
-	 * If is not overridden by a subclass, then default to the returned value of the simpler (and older) {@link #onEvent(String, QuestState)} override.<br>
 	 * If the player has a quest state, use it as parameter in the next call, otherwise return null.
 	 * @param event this parameter contains a string identifier for the event.<br>
 	 *            Generally, this string is passed directly via the link.<br>
@@ -1067,35 +1066,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 *            This parameter may be {@code null} in certain circumstances.
 	 * @return the text returned by the event (may be {@code null}, a filename or just text)
 	 */
-	public String onAdvEvent(String event, Npc npc, Player player)
-	{
-		if (player != null)
-		{
-			final QuestState qs = player.getQuestState(getName());
-			if (qs != null)
-			{
-				return onEvent(event, qs);
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * This function is called in place of {@link #onAdvEvent(String, Npc, Player)} if the former is not implemented.<br>
-	 * If a script contains both {@link #onAdvEvent(String, Npc, Player)} and this implementation, then this method will never be called unless the script's {@link #onAdvEvent(String, Npc, Player)} explicitly calls this method.
-	 * @param event this parameter contains a string identifier for the event.<br>
-	 *            Generally, this string is passed directly via the link.<br>
-	 *            For example:<br>
-	 *            <code>
-	 *            &lt;a action="bypass -h Quest 626_ADarkTwilight 31517-01.htm"&gt;hello&lt;/a&gt;
-	 *            </code><br>
-	 *            The above link sets the event variable to "31517-01.htm" for the quest 626_ADarkTwilight.<br>
-	 *            In the case of timers, this will be the name of the timer.<br>
-	 *            This parameter serves as a sort of identifier.
-	 * @param qs this parameter contains a reference to the quest state of the player who used the link or started the timer.
-	 * @return the text returned by the event (may be {@code null}, a filename or just text)
-	 */
-	public String onEvent(String event, QuestState qs)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return null;
 	}
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Aden/Gallias/Gallias.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Aden/Gallias/Gallias.java
index ae5ee1c2c9..d7d66442a2 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Aden/Gallias/Gallias.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Aden/Gallias/Gallias.java
@@ -66,7 +66,7 @@ public class Gallias extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String[] substrings = event.split(" ");
 		if (substrings.length < 1)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java
index 823e8ad3d0..8777766020 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java
@@ -47,7 +47,7 @@ public class Herphah extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Aden/Joachim/Joachim.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Aden/Joachim/Joachim.java
index bb0ec03afc..6eb0fa0b37 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Aden/Joachim/Joachim.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Aden/Joachim/Joachim.java
@@ -90,7 +90,7 @@ public class Joachim extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Aden/Lulu/Lulu.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Aden/Lulu/Lulu.java
index 262c1dd098..5a3283459b 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Aden/Lulu/Lulu.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Aden/Lulu/Lulu.java
@@ -58,7 +58,7 @@ public class Lulu extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("LULU_BLESSING") && (npc != null) && (npc.getId() == LULU))
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java
index 50c6589614..cc7376cb68 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java
@@ -47,7 +47,7 @@ public class Penny extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java
index aa798606e3..0112d3ab9c 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Aden/Ruine/Ruine.java
@@ -46,7 +46,7 @@ public class Ruine extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
index 2e2fb2c8ac..2de7c0cc27 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
@@ -68,7 +68,7 @@ public class AncientArcanCity extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CHANGE_STATE"))
 		{
@@ -102,7 +102,7 @@ public class AncientArcanCity extends AbstractNpcAI
 				cat.broadcastSocialAction(2);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
index 488f213820..9b0cc67a24 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/AncientCityArcan/Lykus/Lykus.java
@@ -42,7 +42,7 @@ public class Lykus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
index b794fb595b..852a7b9086 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/AncientCityArcan/Mumu/Mumu.java
@@ -39,7 +39,7 @@ public class Mumu extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
index a30526fee5..4c625e3e07 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java
@@ -329,7 +329,7 @@ public class AteliaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java
index 17ce64d654..95b253e31e 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java
@@ -75,7 +75,7 @@ public class AteliaRefinery extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java
index 3e37d72e7c..eab023a641 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java
@@ -49,7 +49,7 @@ public class Leona extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
@@ -115,7 +115,7 @@ public class Leona extends AbstractNpcAI
 		{
 			player.teleToLocation(REFINERY, true);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
index e39b64dcbf..0a5bc49ff4 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
@@ -56,7 +56,7 @@ public class BabyPets extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("HEAL") && (player != null))
 		{
@@ -78,7 +78,7 @@ public class BabyPets extends AbstractNpcAI
 				cancelQuestTimer("HEAL", null, player);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGOUT)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
index b28130726f..58b96be423 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
@@ -56,7 +56,7 @@ public class ImprovedBabyPets extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player != null)
 		{
@@ -108,7 +108,7 @@ public class ImprovedBabyPets extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Belas/Belas.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Belas/Belas.java
index da40a976bc..c932119b84 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Belas/Belas.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Belas/Belas.java
@@ -44,7 +44,7 @@ public class Belas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/BlackbirdCampsite/SoulSummonStone/SoulSummonStone.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/BlackbirdCampsite/SoulSummonStone/SoulSummonStone.java
index bc2bf34ac6..96d63c4e03 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/BlackbirdCampsite/SoulSummonStone/SoulSummonStone.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/BlackbirdCampsite/SoulSummonStone/SoulSummonStone.java
@@ -47,7 +47,7 @@ public class SoulSummonStone extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class SoulSummonStone extends AbstractNpcAI
 				return "34434-05.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/BlackbirdCampsite/TeleportDevice/TeleportDevice.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/BlackbirdCampsite/TeleportDevice/TeleportDevice.java
index bfafb8ec79..675ee1ff2e 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/BlackbirdCampsite/TeleportDevice/TeleportDevice.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/BlackbirdCampsite/TeleportDevice/TeleportDevice.java
@@ -44,7 +44,7 @@ public class TeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Valleria/Valleria.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Valleria/Valleria.java
index e7d88bcaef..6371e314fb 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Valleria/Valleria.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/BlackbirdCampsite/Valleria/Valleria.java
@@ -46,7 +46,7 @@ public class Valleria extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Conquest/ConquestTeleportDevice/ConquestTeleportDevice.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Conquest/ConquestTeleportDevice/ConquestTeleportDevice.java
index c2a22fa9b9..af4c7a4b5c 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Conquest/ConquestTeleportDevice/ConquestTeleportDevice.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Conquest/ConquestTeleportDevice/ConquestTeleportDevice.java
@@ -71,7 +71,7 @@ public class ConquestTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Conquest/Flowers/Flowers.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Conquest/Flowers/Flowers.java
index 06e13196ef..e916dc97e0 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Conquest/Flowers/Flowers.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Conquest/Flowers/Flowers.java
@@ -66,7 +66,7 @@ public class Flowers extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Conquest/SacredFire/SacredFire.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Conquest/SacredFire/SacredFire.java
index 057a50c280..c77aa6d92f 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Conquest/SacredFire/SacredFire.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Conquest/SacredFire/SacredFire.java
@@ -111,7 +111,7 @@ public class SacredFire extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final long personalConquestPoints = player.getVariables().getLong(PlayerVariables.CONQUEST_PERSONAL_POINTS, 0);
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
index f4cdad9ea7..4cd76e8871 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/CrumaTower/CrumaTower.java
@@ -46,14 +46,14 @@ public class CrumaTower extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("MESSAGE") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_GO_TO_UNDERGROUND_LV_3_USING_THE_ELEVATOR_IN_THE_BACK);
 			startQuestTimer(event, 15000, npc, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
index ed9e78dba6..577e1cb8f9 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
@@ -77,7 +77,7 @@ public class FrightenedRagnaOrc extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
index 637a0cb100..df0cbfae1d 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
@@ -53,7 +53,7 @@ public class DragonVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("Spawn".equals(event))
 		{
@@ -104,7 +104,7 @@ public class DragonVortex extends AbstractNpcAI
 		{
 			npc.setScriptValue(0);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
index d2aaa1686f..a71dea5ac3 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
@@ -53,7 +53,7 @@ public class LairOfAntharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CHECK_HOME") && (npc != null) && !npc.isDead())
 		{
@@ -67,7 +67,7 @@ public class LairOfAntharas extends AbstractNpcAI
 				npc.broadcastPacket(new ValidateLocation(npc));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
index 34f9a042b7..573e147009 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DragonValley/LeopardDragonHachling.java
@@ -55,7 +55,7 @@ public class LeopardDragonHachling extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && event.equals("MOVE_TO_TRANSFORM"))
 		{
@@ -77,7 +77,7 @@ public class LeopardDragonHachling extends AbstractNpcAI
 				npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, nearestLocation(npc));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
index f6333cf6fa..d1c9801807 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DragonValley/MercenaryCaptain.java
@@ -40,13 +40,13 @@ public class MercenaryCaptain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THE_SOUTHERN_PART_OF_DRAGON_VALLEY_IS_MUCH_MORE_DANGEROUS_THAN_THE_NORTHERN_BE_CAREFUL));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
index 1db1f78ddf..9f52d63860 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DragonValley/MercenaryTeleport/MercenaryTeleport.java
@@ -61,10 +61,10 @@ public class MercenaryTeleport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		player.teleToLocation(LOCATIONS.get(event), true);
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DragonValley/Namo.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
index 3aebefab98..d94ae48017 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DragonValley/Namo.java
@@ -40,13 +40,13 @@ public class Namo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THIS_PLACE_SWARMS_WITH_DRAGONS_BY_DAY_AND_UNDEAD_BY_NIGHT));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
index 3b0bea96c3..c7d4f89089 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DragonValley/Rakun.java
@@ -40,13 +40,13 @@ public class Rakun extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THIS_PLACE_SWARMS_WITH_DRAGONS_BY_DAY_AND_UNDEAD_BY_NIGHT));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
index 9c43f65c14..7126be9541 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
@@ -72,7 +72,7 @@ public class SeparatedSoul extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LOCATIONS.containsKey(event))
 		{
@@ -98,7 +98,7 @@ public class SeparatedSoul extends AbstractNpcAI
 				return "no-items.htm";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java
index c0e846b2a9..6f4e5076b1 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/EnchantedValley/Celestiel/Celestiel.java
@@ -50,7 +50,7 @@ public class Celestiel extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
index 51845e016e..b68fc842c7 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/FaeronVillage/AltarOfSouls/AltarOfSouls.java
@@ -49,7 +49,7 @@ public class AltarOfSouls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -96,7 +96,7 @@ public class AltarOfSouls extends AbstractNpcAI
 				return "33920-9.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
index 213ee3aba8..b8ceddde88 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/FaeronVillage/RemembranceTower/RemembranceTower.java
@@ -41,7 +41,7 @@ public class RemembranceTower extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("action") && npc.isScriptValue(0))
 		{
@@ -54,7 +54,7 @@ public class RemembranceTower extends AbstractNpcAI
 			npc.setScriptValue(0);
 			npc.broadcastPacket(new OnEventTrigger(EMMITER_ID, false));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
index 58df471290..aed0ea41aa 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
@@ -57,7 +57,7 @@ public class LargeCocoon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -134,7 +134,7 @@ public class LargeCocoon extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
index b8f295b4f4..07dcd68131 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
@@ -41,7 +41,7 @@ public class KrateisCube extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
index 4fbe395a2e..d29e5f30b0 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
@@ -365,7 +365,7 @@ public class TalentShow extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((event == null) || event.isEmpty())
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
index 643e2d0967..a09f8441a9 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
@@ -88,7 +88,7 @@ public class ForgeOfTheGods extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
index a1f80dbbba..a29a7e7422 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
@@ -84,7 +84,7 @@ public class Rooney extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport") && !npc.isDecayed())
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
index bfc9c04cce..3060491458 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GainakUnderground/GainakSiege.java
@@ -87,7 +87,7 @@ public class GainakSiege extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("GAINAK_WAR"))
 		{
@@ -129,7 +129,7 @@ public class GainakSiege extends AbstractNpcAI
 				ZoneManager.getInstance().getZoneById(GAINAK_TOWN_ZONE.getId(), PeaceZone.class).setEnabled(false);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
index b547082d2b..7d004b2c28 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java
@@ -46,7 +46,7 @@ public class Lailly extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
index b2085cc4ee..be2415b3da 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GainakUnderground/TavernEmployee/TavernEmployee.java
@@ -128,7 +128,7 @@ public class TavernEmployee extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
index 93a6441862..07f870be45 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java
@@ -76,7 +76,7 @@ public class Apherus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("buff"))
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
index ee3c0e5a60..cace789b79 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfGenesis/ApherusLookout/ApherusLookout.java
@@ -40,7 +40,7 @@ public class ApherusLookout extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		if (event.equals("open_bag"))
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
index abc2c90fc3..329befe8e2 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfGenesis/GardenWatchman.java
@@ -48,7 +48,7 @@ public class GardenWatchman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -78,7 +78,7 @@ public class GardenWatchman extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
index be6928ac05..24017298e3 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfGenesis/GenesisVines.java
@@ -42,7 +42,7 @@ public class GenesisVines extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CAST_SKILL") && npc.isScriptValue(1))
 		{
@@ -58,7 +58,7 @@ public class GenesisVines extends AbstractNpcAI
 			npc.setScriptValue(0);
 			npc.deleteMe();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
index 7aa5b51852..601f3e78d4 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfGenesis/Statues/Statues.java
@@ -53,7 +53,7 @@ public class Statues extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("fight"))
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java
index df86411501..4d6c8438a2 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfSpirits/Eubina/Eubina.java
@@ -39,7 +39,7 @@ public class Eubina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
index 30427be574..4a8e582e91 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfSpirits/FuryKiku.java
@@ -46,7 +46,7 @@ public class FuryKiku extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -76,7 +76,7 @@ public class FuryKiku extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
index c7289ad785..568c93f824 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java
@@ -50,7 +50,7 @@ public class Isabella extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAWN"))
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java
index 022fba7be5..7f45a854eb 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GardenOfSpirits/Rotoeh/Rotoeh.java
@@ -39,7 +39,7 @@ public class Rotoeh extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
index aa9b15ee4a..7680e80f26 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
@@ -42,7 +42,7 @@ public class GiantsCave extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Giran/Grace/Grace.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Giran/Grace/Grace.java
index 9a5094c18b..4f965135c1 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Giran/Grace/Grace.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Giran/Grace/Grace.java
@@ -56,7 +56,7 @@ public class Grace extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("GRACE_BLESSING") && (npc != null) && (npc.getId() == GRACE))
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
index 6ddf8e1215..65a5c9028c 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
@@ -57,7 +57,7 @@ public class Kekropus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
index 5ead8677b7..cc036471ea 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/GuillotineFortress/Spirit.java
@@ -82,7 +82,7 @@ public class Spirit extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -102,7 +102,7 @@ public class Spirit extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java
index 832e64457e..3dcefeda6c 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java
@@ -50,7 +50,7 @@ public class LionelHunter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs2 = player.getQuestState(Q10817_ExaltedOneWhoOvercomesTheLimit.class.getSimpleName());
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Heine/WrapGate.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
index 6d5ff6d966..38a8d4ce85 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Heine/WrapGate.java
@@ -40,7 +40,7 @@ public class WrapGate extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("enter_hellbound".equals(event))
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
index 5c959687d4..a97e52f0ee 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/HellboundIsland/LeonaBlackbird/LeonaBlackbird.java
@@ -39,7 +39,7 @@ public class LeonaBlackbird extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
index a76b250789..e069360325 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/HellboundIsland/Theorn/Theorn.java
@@ -60,7 +60,7 @@ public class Theorn extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
index 7895170eb3..be5ad1cff4 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/HuntersVillage/Merlot/Merlot.java
@@ -47,7 +47,7 @@ public class Merlot extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
index c0e3d5750a..5d7cd1d452 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/ImperialTomb/Zenya/Zenya.java
@@ -43,7 +43,7 @@ public class Zenya extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
index 4cddc8a640..237fc39d2b 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
@@ -63,7 +63,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -135,7 +135,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 				npc.reduceCurrentHp(500, npc, null); // poison kills Fafurion if he is not healed
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
index 62786ffb44..c25971b411 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
@@ -47,7 +47,7 @@ public class Rignos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -90,7 +90,7 @@ public class Rignos extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
index 509ed2062c..ea36e46b7d 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/IsleOfSouls/HillsOfGold.java
@@ -57,7 +57,7 @@ public class HillsOfGold extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -75,7 +75,7 @@ public class HillsOfGold extends AbstractNpcAI
 			});
 			startQuestTimer("SPICULA_AGGRO", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
index 7e605d0f40..4cc089deff 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java
@@ -61,7 +61,7 @@ public class AvantGarde extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
index 260c075eac..22ad98e51b 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
@@ -108,7 +108,7 @@ public class KetraOrcSupport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
index 3c84026d69..329e309d21 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/El.java
@@ -38,13 +38,13 @@ public class El extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_USE_THE_JUMP_BOARD_TO_GET_STRAIGHT_TO_THE_2ND_FLOOR, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
index 2b4e01ea0c..f51a78d8db 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
@@ -47,7 +47,7 @@ public class Erda extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
@@ -113,7 +113,7 @@ public class Erda extends AbstractNpcAI
 		{
 			player.teleToLocation(CAMILLE_LOC, true);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
index e7bf2864a8..faad0ae478 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/GeneralDilios.java
@@ -58,7 +58,7 @@ public class GeneralDilios extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("command_"))
 		{
@@ -87,7 +87,7 @@ public class GeneralDilios extends AbstractNpcAI
 				startQuestTimer("guard_animation_" + (value + 1), 1500, null, null);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
index 4661ad169e..4444e44e1f 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Lekon/Lekon.java
@@ -47,7 +47,7 @@ public class Lekon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
index 2673b270f4..8f772021e9 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java
@@ -56,7 +56,7 @@ public class LindviorScene extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -109,7 +109,7 @@ public class LindviorScene extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public void scheduleNextLindviorVisit()
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
index 2b891dc72b..200d1b8f01 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Nottingale/Nottingale.java
@@ -57,7 +57,7 @@ public class Nottingale extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
index aa54d49073..98e0ba51bf 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Plenos.java
@@ -38,13 +38,13 @@ public class Plenos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_CAN_BE_TELEPORTED_TO_EACH_SEED_IF_YOU_VOLUNTEER_WHY_NOT_TRY, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
index 68d82ede48..72023a54b0 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/SeedTeleportDevice.java
@@ -46,7 +46,7 @@ public class SeedTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -75,7 +75,7 @@ public class SeedTeleportDevice extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
index ab72fd9af0..61b3db3729 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
@@ -49,7 +49,7 @@ public class MithrilMinesTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int index = Integer.parseInt(event) - 1;
 		if (LOCS.length > index)
@@ -57,7 +57,7 @@ public class MithrilMinesTeleporter extends AbstractNpcAI
 			final Location loc = LOCS[index];
 			player.teleToLocation(loc, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
index 70892b69c1..fadc27f776 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
@@ -84,7 +84,7 @@ public class MonasteryOfSilence extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -132,7 +132,7 @@ public class MonasteryOfSilence extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
index 9a62fc8f94..593dcfba1a 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
@@ -62,7 +62,7 @@ public class PaganTeleporters extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
index 00c9950d3e..bc84758c24 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java
@@ -60,7 +60,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -90,7 +90,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI
 				instanceScript.notifyEvent(event, npc, player);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
index 6a7269166d..d680a521ee 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Parnassus/Fioren/Fioren.java
@@ -39,13 +39,13 @@ public class Fioren extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("startMovie"))
 		{
 			playMovie(player, Movie.SI_BARLOG_STORY);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
index ae5950b460..a547adab25 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java
@@ -74,7 +74,7 @@ public class Kaysen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
index 036d5cc4cf..b6e99ed14e 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/RaidersCrossroads/NervasTemporaryPrison/NervasTemporaryPrison.java
@@ -63,7 +63,7 @@ public class NervasTemporaryPrison extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
index e6fa87bc37..2d05d6bc5d 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/RuinsOfAgony/RoAGuard.java
@@ -38,14 +38,14 @@ public class RoAGuard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THIS_IS_RUINS_OF_AGONY_WHERE_KANILOV_IS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
index e4b5bcb8ca..b4fe636d73 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/RuinsOfDespair/RoDGuard.java
@@ -38,14 +38,14 @@ public class RoDGuard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THIS_IS_THE_RUINS_OF_AGONY_WHERE_POSLOF_IS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
index e7fe6846d8..dbf948d24f 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Rune/AltarOfSacrifice/AltarOfSacrifice.java
@@ -48,7 +48,7 @@ public class AltarOfSacrifice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("msg_text"))
 		{
@@ -68,7 +68,7 @@ public class AltarOfSacrifice extends AbstractNpcAI
 			startQuestTimer("msg_text", 135000, npc, null);
 			_jenas_guard.setScriptValue(0);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java
index f1605b2373..91042a31e8 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java
@@ -50,7 +50,7 @@ public class Roiental extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterGoldberg"))
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
index f531a781a4..79afa82cb1 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
@@ -147,7 +147,7 @@ public class Venom extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Rune/SwampOfScreams/SwampOfScreamsSiege.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Rune/SwampOfScreams/SwampOfScreamsSiege.java
index a84cc26be8..831f2b86ad 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Rune/SwampOfScreams/SwampOfScreamsSiege.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Rune/SwampOfScreams/SwampOfScreamsSiege.java
@@ -79,7 +79,7 @@ public class SwampOfScreamsSiege extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -116,7 +116,7 @@ public class SwampOfScreamsSiege extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
index deb303b021..c5fc651c81 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Klemis/Klemis.java
@@ -43,7 +43,7 @@ public class Klemis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("portInside"))
 		{
@@ -56,7 +56,7 @@ public class Klemis extends AbstractNpcAI
 				return "32734-01.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
index e7fe7a30db..a76b2970cf 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java
@@ -80,7 +80,7 @@ public class Maguen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || (player == null))
 		{
@@ -163,7 +163,7 @@ public class Maguen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
index 101b3642cb..1b94d82ec4 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java
@@ -48,7 +48,7 @@ public class Nemo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
index 80fd68cdf2..6f6d527c45 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java
@@ -297,7 +297,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("ChangeSeedsStatus"))
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
index 9a411ffb88..be452d8872 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Seyo/Seyo.java
@@ -51,7 +51,7 @@ public class Seyo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (npc == null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
index 9a37241c55..bd971c500c 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
@@ -197,7 +197,7 @@ public class StakatoNest extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || (player == null) || npc.isDead())
 		{
@@ -225,7 +225,7 @@ public class StakatoNest extends AbstractNpcAI
 			addAttackPlayerDesire(spawned, player);
 			npc.deleteMe();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private static Monster checkMinion(Npc npc)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
index 40b2a86832..42395b5413 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
@@ -47,7 +47,7 @@ public class StakatoNestTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int index = Integer.parseInt(event) - 1;
 		if (LOCS.length > index)
@@ -65,7 +65,7 @@ public class StakatoNestTeleporter extends AbstractNpcAI
 			}
 			player.teleToLocation(loc, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
index 41dbcbf216..5eefc5da6a 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java
@@ -44,7 +44,7 @@ public class Apprentice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("rideKukuru"))
 		{
@@ -61,7 +61,7 @@ public class Apprentice extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TRY_RIDING_A_KUKURU, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
index f8e38b7f27..db1544c70c 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
@@ -95,7 +95,7 @@ public class AwakeningMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, true);
 		if (qs == null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
index 4b120ba79f..d30f691c33 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Banette.java
@@ -38,7 +38,7 @@ public class Banette extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
@@ -62,7 +62,7 @@ public class Banette extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
index c946859d49..56f1da9739 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Bink.java
@@ -38,13 +38,13 @@ public class Bink extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TALKING_ISLAND_VILLAGE_IS_REALLY_BEAUTIFUL, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
index 1610f7ea63..efd750bcec 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java
@@ -45,7 +45,7 @@ public class BoyAndGirl extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_CHANGEWEAP"))
 		{
@@ -66,7 +66,7 @@ public class BoyAndGirl extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, npc.getId() == BOY ? NpcStringId.WOW_2 : NpcStringId.BOYS_ARE_SO_ANNOYING);
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
index b304102d06..8e7fc027f8 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java
@@ -41,7 +41,7 @@ public class Devno extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -74,7 +74,7 @@ public class Devno extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
index 5be095aaed..947279b8a9 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/DrillSergeant.java
@@ -42,7 +42,7 @@ public class DrillSergeant extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SOCIAL_SHOW"))
 		{
@@ -66,7 +66,7 @@ public class DrillSergeant extends AbstractNpcAI
 				npc.broadcastSocialAction(socialActionId);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
index 7aa097632b..79ea40ee9a 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java
@@ -41,7 +41,7 @@ public class Eleve extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Eleve extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
index e299fd28cb..8e72bdbe20 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Gagabu.java
@@ -44,13 +44,13 @@ public class Gagabu extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, GAGABU_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
index 054059086b..ddbfca41f3 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Galad.java
@@ -38,14 +38,14 @@ public class Galad extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSocialAction(3);
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.OCCASIONALLY_RARE_JEWELS_OF_GIANTS_ARE_DISCOVERED_IN_THE_BEACH, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
index af8aa802e5..339e3d6644 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/GiantSoldiers/GiantSoldiers.java
@@ -52,7 +52,7 @@ public class GiantSoldiers extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
index 3d3f55d424..023cc6fad3 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/GuardSoldier.java
@@ -38,7 +38,7 @@ public class GuardSoldier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -49,7 +49,7 @@ public class GuardSoldier extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(2);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
index 647fc28403..b84fd4aaf9 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Hadel/Hadel.java
@@ -43,7 +43,7 @@ public class Hadel extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
index a253456338..0804a6ba56 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java
@@ -38,7 +38,7 @@ public class Handermonkey extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE") && (npc != null))
 		{
@@ -54,7 +54,7 @@ public class Handermonkey extends AbstractNpcAI
 				npc.broadcastSocialAction(9);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
index b35872373d..cbc7a7867d 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
@@ -61,7 +61,7 @@ public class Hardin extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = getHtmlMessage(player);
 		if (htmltext != null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
index 890656d708..3ef0a0020c 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java
@@ -58,7 +58,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("HARNAK_SPAWN"))
 		{
@@ -70,7 +70,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
 				_templates.forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName), null));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private static class zoneInfo
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
index 28136c096d..631295d712 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HurnakMobMsg.java
@@ -55,13 +55,13 @@ public class HurnakMobMsg extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("ATTACK"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomEntry(ON_ATTACK_MSG));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
index ce0b1e46dc..acf09d8fb9 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Hera.java
@@ -38,14 +38,14 @@ public class Hera extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomBoolean() ? NpcStringId.DOES_THE_GODDESS_SEE_WHAT_SHE_HAS_DONE : NpcStringId.WHY_HAVE_THE_HEROES_ABANDONED_US);
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
index b1dc850162..01ba5d5cb2 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Heymond.java
@@ -38,7 +38,7 @@ public class Heymond extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
@@ -62,7 +62,7 @@ public class Heymond extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
index 40fa7b4819..51556e3197 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Holly.java
@@ -38,7 +38,7 @@ public class Holly extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -48,7 +48,7 @@ public class Holly extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(6);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
index c1813c1c1c..6f1bfebbd2 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java
@@ -41,7 +41,7 @@ public class Karonf extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Karonf extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
index 3b87cbc466..57d3fe6b7b 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Luderic.java
@@ -44,7 +44,7 @@ public class Luderic extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -54,7 +54,7 @@ public class Luderic extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(1);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
index 5e0fc069f7..ddf9468552 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Lumi.java
@@ -45,13 +45,13 @@ public class Lumi extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, LUMI_SHOUT[getRandom(3)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
index a78def82a7..3e10474ed3 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Mahram.java
@@ -38,13 +38,13 @@ public class Mahram extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.ALCHEMY_IS_A_SCIENCE_AND_AN_ART, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
index 6508884987..d6c1703c4b 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Mai.java
@@ -38,13 +38,13 @@ public class Mai extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EVERY_RACE_BUILT_A_PIECE_OF_THIS_VILLAGE, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
index b300cd0261..7044e42058 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/MarinSmith.java
@@ -38,13 +38,13 @@ public class MarinSmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.HMM_IS_THIS_STILL_A_DECENT_WEAPON, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
index 37dcf61a59..32fb35afd7 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java
@@ -41,7 +41,7 @@ public class Marsha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Marsha extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
index 898a85df76..abcd7a4036 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Milia.java
@@ -43,7 +43,7 @@ public class Milia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("gludioAirship"))
 		{
@@ -53,7 +53,7 @@ public class Milia extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SPEAK_WITH_ME_ABOUT_TRAVELING_AROUND_ADEN, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
index d7ca380c56..37d028e543 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java
@@ -64,7 +64,7 @@ public class MonkOfChaos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
index d3ee0146c3..e61836e286 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java
@@ -41,7 +41,7 @@ public class Morgan extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Morgan extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
index 00e7e2cbd6..4aa6e216bb 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Oris.java
@@ -40,7 +40,7 @@ public class Oris extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SOCIAL_ACTION_1"))
 		{
@@ -55,7 +55,7 @@ public class Oris extends AbstractNpcAI
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_HAVEN_T_FELT_THIS_GOOD_IN_AGES, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
index 86e0479877..d793e5c2f5 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
@@ -46,7 +46,7 @@ public class Pantheon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
index f40f5ed6f9..a7cd27e9d6 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
@@ -136,7 +136,7 @@ public class Raina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
index 0f60c6161c..001fc241a7 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java
@@ -41,7 +41,7 @@ public class Rubentis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_MOVE"))
 		{
@@ -65,7 +65,7 @@ public class Rubentis extends AbstractNpcAI
 			}
 			startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
index 3607f3c4a6..bef019dd59 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Ruks.java
@@ -38,14 +38,14 @@ public class Ruks extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, getRandomBoolean() ? NpcStringId.THE_SEVEN_SIGNS_ENDED : NpcStringId.WE_NEED_TO_FIND_HER_WEAKNESS);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
index 2a2be8706c..9aa784606f 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Sebion.java
@@ -38,13 +38,13 @@ public class Sebion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.TIS_A_SCRATCH, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
index 45369ed246..d7cd855dfc 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Shannon.java
@@ -38,13 +38,13 @@ public class Shannon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.LOOK_AT_ALL_THE_NEWBIES_HA_HA_HA, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
index 69b1f0bbf8..81cacf7b00 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Sodian.java
@@ -44,13 +44,13 @@ public class Sodian extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, SODIAN_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
index b99a7a455f..5743af34d9 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Stiller.java
@@ -44,13 +44,13 @@ public class Stiller extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, STILLER_SHOUT[getRandom(2)], 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
index 805a45e636..199152855a 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Theodore.java
@@ -38,13 +38,13 @@ public class Theodore extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.AND_NOW_YOUR_JOURNEY_BEGINS, 1000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
index caaded5fd2..98278f97f9 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/TomaJunior.java
@@ -38,7 +38,7 @@ public class TomaJunior extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SPAM_TEXT") && (npc != null))
 		{
@@ -49,7 +49,7 @@ public class TomaJunior extends AbstractNpcAI
 		{
 			npc.broadcastSocialAction(6);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
index b445494095..b5b4d3e364 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/TrainningSoldier.java
@@ -38,7 +38,7 @@ public class TrainningSoldier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -55,7 +55,7 @@ public class TrainningSoldier extends AbstractNpcAI
 			}
 			startQuestTimer("START_ATTACK", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
index ce046511ec..121db3a9d5 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java
@@ -64,7 +64,7 @@ public class Trandon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String[] substrings = event.split(" ");
 		if (substrings.length < 1)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
index e5d6fae1fe..084913f48a 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
@@ -42,7 +42,7 @@ public class YeSagiraGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
@@ -56,7 +56,7 @@ public class YeSagiraGuards extends AbstractNpcAI
 			}
 			startQuestTimer("GUARD_AGGRO", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
index bd28187ab5..17ba0fa150 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java
@@ -84,7 +84,7 @@ public class YeSegiraTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LOCATIONS.containsKey(event))
 		{
@@ -107,7 +107,7 @@ public class YeSegiraTeleportDevice extends AbstractNpcAI
 				// }
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_PLAYER_CREATE)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
index 6705c96a6a..28fb149e2d 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/TownOfGludio/Acateo/Acateo.java
@@ -40,7 +40,7 @@ public class Acateo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("give_circlet"))
 		{
@@ -51,7 +51,7 @@ public class Acateo extends AbstractNpcAI
 			giveItems(player, ACADEMY_CIRCLET, 1);
 			return "33905-2.html";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
index 2234d1cd5c..b1d272464c 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
@@ -108,7 +108,7 @@ public class VarkaSilenosSupport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
index 317c878bda..0d20929b02 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java
@@ -43,7 +43,7 @@ public class ElmoredenServantsGhost extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("teleport1") || event.equals("teleport2"))
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
index a468f50eb6..a86acca571 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java
@@ -83,7 +83,7 @@ public class Wastelands extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || !npc.isSpawned())
 		{
@@ -184,7 +184,7 @@ public class Wastelands extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
index 6757c37107..6c9bbff476 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/WharfGludioAirships/ZealotOfShilen/ZealotOfShilen.java
@@ -47,7 +47,7 @@ public class ZealotOfShilen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -75,7 +75,7 @@ public class ZealotOfShilen extends AbstractNpcAI
 			}
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
index a91e9af3ac..df31ade535 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/areas/WindmillHill/Commando.java
@@ -38,14 +38,14 @@ public class Commando extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.WE_RE_LOOKING_FOR_RANGERS_FROM_ADEN);
 			startQuestTimer("NPC_SHOUT", (10 + getRandom(5)) * 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Anais/Anais.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Anais/Anais.java
index 1ef3225aff..d6cedb0002 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Anais/Anais.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Anais/Anais.java
@@ -75,7 +75,7 @@ public class Anais extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -134,7 +134,7 @@ public class Anais extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
index 30bcbe6e8f..a31e9c50a5 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
@@ -114,7 +114,7 @@ public class Anakim extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -187,7 +187,7 @@ public class Anakim extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Anakim/AnakimBoss.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Anakim/AnakimBoss.java
index 4d2efc8950..d1eb6a6595 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Anakim/AnakimBoss.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Anakim/AnakimBoss.java
@@ -51,7 +51,7 @@ public class AnakimBoss extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -64,7 +64,7 @@ public class AnakimBoss extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Anakim/AnakimElitePriest.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Anakim/AnakimElitePriest.java
index 830edb0595..92121f98f0 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Anakim/AnakimElitePriest.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Anakim/AnakimElitePriest.java
@@ -46,7 +46,7 @@ public class AnakimElitePriest extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -59,7 +59,7 @@ public class AnakimElitePriest extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index 7a4d70c1a1..9bf351bcc2 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -113,7 +113,7 @@ public class Antharas extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 4d763cfbc2..4f21286ea4 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -162,7 +162,7 @@ public class Baium extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -471,7 +471,7 @@ public class Baium extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
index 38ab8ddc7a..cbfcdaab5c 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java
@@ -105,7 +105,7 @@ public class BalokWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -115,7 +115,7 @@ public class BalokWarzone extends AbstractInstance
 				takeItems(player, PRISON_KEY, -1);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Baylor/CrystalPrison.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Baylor/CrystalPrison.java
index 471290d5af..04cf6deac8 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Baylor/CrystalPrison.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Baylor/CrystalPrison.java
@@ -62,7 +62,7 @@ public class CrystalPrison extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index 50e09a37f4..ab97ef6856 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -126,7 +126,7 @@ public class Beleth extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -536,7 +536,7 @@ public class Beleth extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
index e209566fa6..fd2ef530f0 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
@@ -49,7 +49,7 @@ public class Wormhole extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Camille/Camille.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Camille/Camille.java
index 2a0a61dd1b..dd233d7417 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Camille/Camille.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Camille/Camille.java
@@ -54,7 +54,7 @@ public class Camille extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class Camille extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Core/Core.java
index 22ecb6163b..33ac1770ac 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -143,7 +143,7 @@ public class Core extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
@@ -162,7 +162,7 @@ public class Core extends AbstractNpcAI
 			_minions.forEach(Attackable::decayMe);
 			_minions.clear();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Cyrax/Cyrax.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Cyrax/Cyrax.java
index 2db6e9aba4..74a0988a6d 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Cyrax/Cyrax.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Cyrax/Cyrax.java
@@ -48,7 +48,7 @@ public class Cyrax extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -61,7 +61,7 @@ public class Cyrax extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Cyrax/TempleEliteWizard.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Cyrax/TempleEliteWizard.java
index 952b95b114..10ba8c3692 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Cyrax/TempleEliteWizard.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Cyrax/TempleEliteWizard.java
@@ -44,7 +44,7 @@ public class TempleEliteWizard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleEliteWizard extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/ChoirOfDarkness.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/ChoirOfDarkness.java
index a751dddda1..6b580a021c 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/ChoirOfDarkness.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/ChoirOfDarkness.java
@@ -44,7 +44,7 @@ public class ChoirOfDarkness extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class ChoirOfDarkness extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/Etina.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/Etina.java
index 4d4a0f502c..af378c3b5c 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/Etina.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/Etina.java
@@ -47,7 +47,7 @@ public class Etina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -60,7 +60,7 @@ public class Etina extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
index c50e6f27bf..d37a600158 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
@@ -348,7 +348,7 @@ public class EtisVanEtina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -515,7 +515,7 @@ public class EtisVanEtina extends AbstractNpcAI
 			}
 			
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private void clean()
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleDarkJudge.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleDarkJudge.java
index b81c3e3326..c87468b0c0 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleDarkJudge.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleDarkJudge.java
@@ -44,7 +44,7 @@ public class GreatTempleDarkJudge extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class GreatTempleDarkJudge extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleSoulGuide.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleSoulGuide.java
index f9b2910521..e2826b2d6a 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleSoulGuide.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/GreatTempleSoulGuide.java
@@ -44,7 +44,7 @@ public class GreatTempleSoulGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class GreatTempleSoulGuide extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/JudgeOfHeresy.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/JudgeOfHeresy.java
index cc97dae023..2d259843ea 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/JudgeOfHeresy.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/JudgeOfHeresy.java
@@ -44,7 +44,7 @@ public class JudgeOfHeresy extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class JudgeOfHeresy extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/Kain.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/Kain.java
index 3e91ed595b..d0b7796a2a 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/Kain.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/Kain.java
@@ -46,7 +46,7 @@ public class Kain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -59,7 +59,7 @@ public class Kain extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/LiberatorOfLust.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/LiberatorOfLust.java
index bc8754e0d1..0fa794a681 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/LiberatorOfLust.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/LiberatorOfLust.java
@@ -44,7 +44,7 @@ public class LiberatorOfLust extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class LiberatorOfLust extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/SeekerOfDespair.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/SeekerOfDespair.java
index 238bb9059d..ba2104ca4a 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/SeekerOfDespair.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/SeekerOfDespair.java
@@ -44,7 +44,7 @@ public class SeekerOfDespair extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class SeekerOfDespair extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/SoulDestroyer.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/SoulDestroyer.java
index b367b6bf57..e0a62f245f 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/SoulDestroyer.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/SoulDestroyer.java
@@ -44,7 +44,7 @@ public class SoulDestroyer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class SoulDestroyer extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleArchon.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleArchon.java
index 1c64cfa42a..44912b9640 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleArchon.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleArchon.java
@@ -44,7 +44,7 @@ public class TempleArchon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleArchon extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleDarkWizard.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleDarkWizard.java
index 3ec81dfc15..b6f7bc9ec0 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleDarkWizard.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleDarkWizard.java
@@ -44,7 +44,7 @@ public class TempleDarkWizard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleDarkWizard extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleFlameMaster.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleFlameMaster.java
index 05fb61b56e..ed88451b14 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleFlameMaster.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleFlameMaster.java
@@ -44,7 +44,7 @@ public class TempleFlameMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleFlameMaster extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleHighPriest.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleHighPriest.java
index a8beab98b5..e6e8f47074 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleHighPriest.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/EtisVanEtina/TempleHighPriest.java
@@ -44,7 +44,7 @@ public class TempleHighPriest extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class TempleHighPriest extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Fafurion/EliteWizard.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Fafurion/EliteWizard.java
index 79e7dda2bb..228eb89e38 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Fafurion/EliteWizard.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Fafurion/EliteWizard.java
@@ -44,7 +44,7 @@ public class EliteWizard extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class EliteWizard extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
index f073ce5023..6490646183 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
@@ -104,7 +104,7 @@ public class Fafurion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Fafurion/FafurionBoss.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Fafurion/FafurionBoss.java
index bef5e76a5a..2df7a11464 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Fafurion/FafurionBoss.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Fafurion/FafurionBoss.java
@@ -60,7 +60,7 @@ public class FafurionBoss extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -73,7 +73,7 @@ public class FafurionBoss extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
index 051aa92133..c334e6bcba 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java
@@ -63,7 +63,7 @@ public class IceQueensCastle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -113,7 +113,7 @@ public class IceQueensCastle extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
index e8f1807991..fbcb761d20 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java
@@ -157,7 +157,7 @@ public class IceQueensCastleBattle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterEasy"))
 		{
@@ -677,7 +677,7 @@ public class IceQueensCastleBattle extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
index c3af699f0a..7987a7ad61 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Freya/Jinia/Jinia.java
@@ -43,7 +43,7 @@ public class Jinia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
index 104e22e3e1..fab0d156d4 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
@@ -165,7 +165,7 @@ public class LastImperialTomb extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
index e210922a52..51cae3cce4 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
@@ -62,7 +62,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Helios/Helios.java
index 639cd6fc22..57afd2efbd 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Helios/Helios.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Helios/Helios.java
@@ -320,7 +320,7 @@ public class Helios extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Helios/Helios1.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Helios/Helios1.java
index fa6ce1207c..acc6b01710 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Helios/Helios1.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Helios/Helios1.java
@@ -45,7 +45,7 @@ public class Helios1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -58,7 +58,7 @@ public class Helios1 extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Helios/Helios2.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Helios/Helios2.java
index 29c7011d9d..1f509d028b 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Helios/Helios2.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Helios/Helios2.java
@@ -45,7 +45,7 @@ public class Helios2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -58,7 +58,7 @@ public class Helios2 extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Helios/Helios3.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Helios/Helios3.java
index e22751d69a..5b486c4776 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Helios/Helios3.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Helios/Helios3.java
@@ -46,7 +46,7 @@ public class Helios3 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -59,7 +59,7 @@ public class Helios3 extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java
index 3d84797981..3ffd2d2d04 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Helios/RoyalArchmageMinion.java
@@ -44,7 +44,7 @@ public class RoyalArchmageMinion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -57,7 +57,7 @@ public class RoyalArchmageMinion extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
index 71911f3b10..38f4ad20f9 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java
@@ -92,7 +92,7 @@ public class IstinaCavern extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance instance = npc.getInstanceWorld();
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
index d691b47e99..5dc3034643 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Istina/Rumiese/Rumiese.java
@@ -40,7 +40,7 @@ public class Rumiese extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
index 23616d549c..40706c5ba2 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
@@ -141,7 +141,7 @@ public class Kelbim extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -281,7 +281,7 @@ public class Kelbim extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
index 3f7474ca75..669f1c6a12 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
@@ -137,7 +137,7 @@ public class KimerianCommon extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance instance = npc.getInstanceWorld();
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
index 1b80edf3d0..0e1c106dd7 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
@@ -113,7 +113,7 @@ public class Lilith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -187,7 +187,7 @@ public class Lilith extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Lilith/LilithBoss.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Lilith/LilithBoss.java
index 88a4754d9b..017f4401c4 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Lilith/LilithBoss.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Lilith/LilithBoss.java
@@ -51,7 +51,7 @@ public class LilithBoss extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -64,7 +64,7 @@ public class LilithBoss extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Lilith/LilithEliteShaman.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Lilith/LilithEliteShaman.java
index fc07c02971..f3cdcab778 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Lilith/LilithEliteShaman.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Lilith/LilithEliteShaman.java
@@ -47,7 +47,7 @@ public class LilithEliteShaman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -60,7 +60,7 @@ public class LilithEliteShaman extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/LimitBarrier.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/LimitBarrier.java
index 2307b7d54a..8465df89d4 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/LimitBarrier.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/LimitBarrier.java
@@ -86,7 +86,7 @@ public class LimitBarrier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -115,7 +115,7 @@ public class LimitBarrier extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
index 2ab4321819..79e2bf0615 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
@@ -49,7 +49,7 @@ public class KatoSicanus extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
index 725d1c82a4..1b9da09d48 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
@@ -674,7 +674,7 @@ public class Lindvior extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
index a0143d1006..0642797ceb 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java
@@ -49,7 +49,7 @@ public class Vortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -110,7 +110,7 @@ public class Vortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
index ea8fe5012c..43f89210d5 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java
@@ -122,7 +122,7 @@ public class OctavisWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -146,7 +146,7 @@ public class OctavisWarzone extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index a1280f613e..993f37de77 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -145,7 +145,7 @@ public class Orfen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -201,7 +201,7 @@ public class Orfen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 749b0837ce..f265014db1 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -79,7 +79,7 @@ public class QueenAnt extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -106,7 +106,7 @@ public class QueenAnt extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
index 3932e219b1..14dc584626 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
@@ -53,7 +53,7 @@ public class QueenShyeed extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java
index cc2d991eed..c797aa26c6 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java
@@ -148,7 +148,7 @@ public class Ramona extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -376,7 +376,7 @@ public class Ramona extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
index d153e1b97e..1ad24e96d2 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
@@ -80,7 +80,7 @@ public class Sailren extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -249,7 +249,7 @@ public class Sailren extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
index 734fba70f4..242c263e46 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java
@@ -73,7 +73,7 @@ public class Cannon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
index e489452acb..0ced3aa48d 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
@@ -62,7 +62,7 @@ public class TautiWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -170,7 +170,7 @@ public class TautiWarzone extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
index d5cb93e801..bbe2ae15fa 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java
@@ -182,7 +182,7 @@ public class TeredorWarzone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
index 354bd02dfb..5e5ac4e39e 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
@@ -507,7 +507,7 @@ public class Stage1 extends AbstractInstance implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
index 3a2fb5317e..0fbcc084f2 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
@@ -50,7 +50,7 @@ public class Daichir extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterEarthWyrnCave"))
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
index 9d86a999d5..38845fd4c2 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
@@ -570,7 +570,7 @@ public class Trasken extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -694,7 +694,7 @@ public class Trasken extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index ad8dcc0131..ea1b1e89a1 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -191,7 +191,7 @@ public class Valakas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -380,7 +380,7 @@ public class Valakas extends AbstractNpcAI
 		{
 			BOSS_ZONE.oustAllPlayers();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
index 74b234330b..eff9745cb2 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java
@@ -172,7 +172,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter60"))
 		{
@@ -254,7 +254,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/AdenReconstructorManager.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
index ee8e2039c8..bb1b3366c1 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
@@ -42,7 +42,7 @@ public class AdenReconstructorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -51,7 +51,7 @@ public class AdenReconstructorManager extends AbstractNpcAI
 				npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THE_LAND_OF_ADEN_IS_IN_NEED_OF_MATERIALS_TO_REBUILD_FROM_SHILLIEN_S_DESTRUCTION);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
index 1d5b61b320..6f90d5ffaf 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java
@@ -129,7 +129,7 @@ public class AdventureGuildsman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
index 2766cd07c2..ce1306bea5 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/AdventurersGuide/AdventurersGuide.java
@@ -64,7 +64,7 @@ public class AdventurersGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/AetherDrops.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/AetherDrops.java
index e7cff46397..7b03584d4c 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/AetherDrops.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/AetherDrops.java
@@ -277,7 +277,7 @@ public class AetherDrops extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) || (player != null))
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
index 146846b28c..41f93ebccf 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java
@@ -51,7 +51,7 @@ public class AlchemistManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index ba4c89ccb2..05cd50f4a0 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -63,7 +63,7 @@ public class ArenaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -128,7 +128,7 @@ public class ArenaManager extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
index ec5bcaaa7e..b0ceb24045 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
@@ -38,7 +38,7 @@ public class BlackJudge extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("weakenBreath"))
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
index 5d6ce2dce4..2fe4df94b3 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
@@ -42,7 +42,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equals("31092-01.html"))
@@ -79,7 +79,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 			giveAdena(player, count, false);
 			return "31092-04.html";
 		}
-		return super.onAdvEvent(htmltext, npc, player);
+		return super.onEvent(htmltext, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
index c2cef598e4..9871e6d7cc 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
@@ -56,7 +56,7 @@ public class CastleAmbassador extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
index 21fcb4813a..7bbc678cca 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
@@ -57,7 +57,7 @@ public class CastleBlacksmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return (event.equalsIgnoreCase(npc.getId() + "-02.html") && hasRights(player, npc)) ? event : null;
 	}
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
index fc004a82da..483b74139c 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
@@ -393,7 +393,7 @@ public class CastleChamberlain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Castle castle = npc.getCastle();
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
index 9be1866509..ce4104d552 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
@@ -140,7 +140,7 @@ public class CastleCourtMagician extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player.getClan() == null) && (player.getClanId() != npc.getCastle().getOwnerId()))
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
index 71e6de5cfb..4b12db517e 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
@@ -72,7 +72,7 @@ public class CastleDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
index a1466e4501..7f24c7c794 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
@@ -56,7 +56,7 @@ public class CastleMercenaryManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index 859383ede7..34a00e8407 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -78,7 +78,7 @@ public class CastleTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
@@ -168,7 +168,7 @@ public class CastleTeleporter extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
index 2fd32d136c..d222e07095 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
@@ -52,7 +52,7 @@ public class CastleWarehouse extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final boolean isMyLord = player.isClanLeader() && (player.getClan().getCastleId() == (npc.getCastle() != null ? npc.getCastle().getResidenceId() : -1));
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index f2bb40c15c..a6e9f3fc69 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -64,7 +64,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
index a328f1f1c6..b673f2cd8c 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
@@ -57,7 +57,7 @@ public class ClanHallDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 127c241f00..8fc827c0ec 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -103,7 +103,7 @@ public class ClanHallManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
index cb41bb0802..1b7f8fa43b 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
@@ -67,7 +67,7 @@ public class ClanTrader extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 39859c438c..8ffe92dad6 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -237,7 +237,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		if (!_isEnabled)
 		{
@@ -962,7 +962,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	{
 		if (event.getCommand().startsWith("Quest ClassMaster "))
 		{
-			final String html = onAdvEvent(event.getCommand().substring(18), null, event.getPlayer());
+			final String html = onEvent(event.getCommand().substring(18), null, event.getPlayer());
 			event.getPlayer().sendPacket(TutorialCloseHtml.STATIC_PACKET);
 			showResult(event.getPlayer(), html);
 		}
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
index d17ae8ecf1..d32004d14c 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
@@ -43,7 +43,7 @@ public class CrimsonHatuOtis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -69,7 +69,7 @@ public class CrimsonHatuOtis extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/DivineBeast.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/DivineBeast.java
index 7ba428a4ac..ace7bc05e4 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/DivineBeast.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/DivineBeast.java
@@ -44,7 +44,7 @@ public class DivineBeast extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player == null) || !player.hasServitors())
 		{
@@ -55,7 +55,7 @@ public class DivineBeast extends AbstractNpcAI
 			cancelQuestTimer(event, npc, player);
 			player.getServitors().values().forEach(summon -> summon.unSummon(player));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/EinhasadStore/EinhasadStore.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/EinhasadStore/EinhasadStore.java
index 0b94653f7d..f71a6c7dd6 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/EinhasadStore/EinhasadStore.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/EinhasadStore/EinhasadStore.java
@@ -54,7 +54,7 @@ public class EinhasadStore extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/EnergySeeds.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/EnergySeeds.java
index 3f5d8b4335..742a23ebb6 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/EnergySeeds.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/EnergySeeds.java
@@ -196,7 +196,7 @@ public class EnergySeeds extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("StartSoDAi"))
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/FameManager/FameManager.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/FameManager/FameManager.java
index 6703456c6e..d7935ea7b4 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/FameManager/FameManager.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/FameManager/FameManager.java
@@ -49,7 +49,7 @@ public class FameManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
index 96707cb209..9e6e75fefc 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
@@ -69,7 +69,7 @@ public class FortressSiegeManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
index 24e8352d82..24122df4f3 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
@@ -85,7 +85,7 @@ public class GameAssistant extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
index a9bacb24e5..a2b3fde3fe 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
@@ -67,7 +67,7 @@ public class HealerTrainer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
index e9cd75460c..b4560d67ab 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
@@ -89,7 +89,7 @@ public class HermuncusMinion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(eventValue, " ");
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/KastiaResearcher/KastiaResearcher.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/KastiaResearcher/KastiaResearcher.java
index 74a31f924d..95a22f53a9 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/KastiaResearcher/KastiaResearcher.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/KastiaResearcher/KastiaResearcher.java
@@ -38,7 +38,7 @@ public class KastiaResearcher extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("exit"))
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
index 82f99b0aad..319f3e7c6e 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
@@ -49,7 +49,7 @@ public class LaVieEnRose extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
index f632a22e48..374ba61a4e 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
@@ -71,7 +71,7 @@ public class ManorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
index 2e1cec1f7f..180966229a 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
@@ -138,7 +138,7 @@ public class MentorGuide extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("exchange"))
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/Minigame/Minigame.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/Minigame/Minigame.java
index d024a66eea..692745957e 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/Minigame/Minigame.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/Minigame/Minigame.java
@@ -68,7 +68,7 @@ public class Minigame extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final MinigameRoom room = getRoomByManager(npc);
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
index f4c0ada4da..c1171a6a41 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
@@ -96,7 +96,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
index 9b25bd70e7..d05d3b25d5 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/NornilTeleportDevice/NornilTeleportDevice.java
@@ -48,14 +48,14 @@ public class NornilTeleportDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("teleport_"))
 		{
 			final int locId = Integer.parseInt(event.replace("teleport_", ""));
 			player.teleToLocation(LOCATIONS[locId - 1]);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
index 8999e979f5..abb2c728fc 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
@@ -61,7 +61,7 @@ public class OlyBuffer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index 7215006f36..399a2a13bd 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -88,7 +88,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/PrisonGuards.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/PrisonGuards.java
index 56e657f2cf..89f41510f7 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/PrisonGuards.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/PrisonGuards.java
@@ -53,7 +53,7 @@ public class PrisonGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CLEAR_STATUS"))
 		{
@@ -67,7 +67,7 @@ public class PrisonGuards extends AbstractNpcAI
 			}
 			startQuestTimer("CHECK_HOME", 30000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/PrisonManager/PrisonManager.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/PrisonManager/PrisonManager.java
index 2634f960ad..506ec45e74 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/PrisonManager/PrisonManager.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/PrisonManager/PrisonManager.java
@@ -65,7 +65,7 @@ public class PrisonManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
index 2de491b72f..b69386a3bc 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
@@ -84,7 +84,7 @@ public class Proclaimer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("giveBuff"))
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
index 89ccfeeb31..da0ee6163b 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
@@ -79,7 +79,7 @@ public class ProvisionalHalls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/Servitors/SinEater.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/Servitors/SinEater.java
index f3eef350a6..58c1e1b5fc 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/Servitors/SinEater.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/Servitors/SinEater.java
@@ -48,7 +48,7 @@ public class SinEater extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TALK") && (player != null) && (player.getPet() != null))
 		{
@@ -79,7 +79,7 @@ public class SinEater extends AbstractNpcAI
 			}
 			startQuestTimer("TALK", 60000, null, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_CREATURE_DEATH)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
index 73fc7bbe45..f9f194e984 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
@@ -128,7 +128,7 @@ public class SupportUnitCaptain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int fortOwner = npc.getFort().getOwnerClan() == null ? 0 : npc.getFort().getOwnerClan().getId();
 		if ((player.getClan() == null) || (player.getClanId() != fortOwner))
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
index 2811ce1124..fb74013816 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
@@ -53,7 +53,7 @@ public class SymbolMaker extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
index 5b6352fd25..a0ffaf71f0 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
@@ -94,7 +94,7 @@ public class TeleportToUndergroundColiseum extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.endsWith(".htm"))
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
index 365d552517..e242f3669b 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java
@@ -75,7 +75,7 @@ public class TersisHerald extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("giveBuff"))
 		{
@@ -87,7 +87,7 @@ public class TersisHerald extends AbstractNpcAI
 			npc.setTarget(player);
 			npc.doCast(DRAGON_BUFF.getSkill());
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
index 096e76d29c..50a958e759 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
@@ -62,7 +62,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = "";
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
index 62b88383df..cff61e3c05 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/VillageMasters/ClassTransferTalk/ClassTransferTalk.java
@@ -87,7 +87,7 @@ public class ClassTransferTalk extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/WarriorFishingBlock.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
index 3e99a52646..4c17068d6b 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
@@ -75,7 +75,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -104,7 +104,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java
index 82aea81c02..affde916e3 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java
@@ -70,7 +70,7 @@ public class WaterDragonEliteSupplyDrops extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) || (player != null))
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
index feb8fdc6f3..41c94c0448 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
@@ -156,7 +156,7 @@ public class WeaverOlf extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.contains("_grade_"))
 		{
@@ -185,7 +185,7 @@ public class WeaverOlf extends AbstractNpcAI
 			}
 			else
 			{
-				return super.onAdvEvent(event, npc, player);
+				return super.onEvent(event, npc, player);
 			}
 			
 			if (hasQuestItems(player, itemIds[0]))
@@ -225,7 +225,7 @@ public class WeaverOlf extends AbstractNpcAI
 			{
 				return npc.getId() + "-no.htm";
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		return event;
 	}
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index 0426c4320b..b0e0f70475 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -210,7 +210,7 @@ public class WyvernManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
index b27ac2f278..fb877bb630 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
@@ -36,7 +36,7 @@ public class DelevelManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.DELEVEL_MANAGER_ENABLED)
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
index 3d24e2bd67..84a6dadc7b 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
@@ -54,7 +54,7 @@ public class FactionSystem extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class FactionSystem extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
index 8a1940f5b4..32a1337dc4 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
@@ -34,7 +34,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -77,7 +77,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 				npc.broadcastInfo(); // update flag status
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
index dd92204d87..8d51dd3c2f 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
@@ -60,7 +60,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("AUTOBUFF") && (npc != null) && !npc.isDead())
 		{
@@ -88,7 +88,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
 			}
 			startQuestTimer("AUTOBUFF", 30000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
index bb9c9c2a07..5e4391d17c 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
@@ -39,7 +39,7 @@ public class NoblessMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.NOBLESS_MASTER_ENABLED)
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java
index 8969a03789..a166acce78 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java
@@ -49,7 +49,7 @@ public class ShadowWeapons extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
index ba8d24ed64..82bb289dd9 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
@@ -160,7 +160,7 @@ public class Deathmatch extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
index d65c2ef5a8..2541fd449f 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
@@ -213,7 +213,7 @@ public class Rabbits extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/events/Race/Race.java
index bbf9371324..5bd0aadf97 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/events/Race/Race.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/events/Race/Race.java
@@ -320,7 +320,7 @@ public class Race extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 5bef3710ae..32876f2350 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -177,7 +177,7 @@ public class TvT extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/BalthusFestival/BalthusFestival.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/BalthusFestival/BalthusFestival.java
index 14707d2013..6310750de3 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/BalthusFestival/BalthusFestival.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/BalthusFestival/BalthusFestival.java
@@ -132,7 +132,7 @@ public class BalthusFestival extends LongTimeEvent implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!isEventPeriod())
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
index dd0cf1e2e1..825d5f20eb 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java
@@ -45,7 +45,7 @@ public class BirthOfDraco extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
index 0e3e99cb93..97f02c400f 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
@@ -64,7 +64,7 @@ public class CharacterBirthday extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("despawn_npc"))
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/ChuseokHarvestFestival/ChuseokHarvestFestival.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/ChuseokHarvestFestival/ChuseokHarvestFestival.java
index d0425a4300..7a500c168f 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/ChuseokHarvestFestival/ChuseokHarvestFestival.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/ChuseokHarvestFestival/ChuseokHarvestFestival.java
@@ -55,7 +55,7 @@ public class ChuseokHarvestFestival extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/DragonSlayer/DragonSlayer.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/DragonSlayer/DragonSlayer.java
index 6028b2495a..7b325445c2 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/DragonSlayer/DragonSlayer.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/DragonSlayer/DragonSlayer.java
@@ -58,7 +58,7 @@ public class DragonSlayer extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equals("receive_reward"))
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/DreamMaker/DreamMaker.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/DreamMaker/DreamMaker.java
index 2c8168dc14..e313a87db7 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/DreamMaker/DreamMaker.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/DreamMaker/DreamMaker.java
@@ -54,7 +54,7 @@ public class DreamMaker extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index cdd7a3706b..8813e11b05 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -56,7 +56,7 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
index 6fba0ed198..60d1df1085 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
@@ -73,7 +73,7 @@ public class FreyaCelebration extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("give_potion"))
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
index 1913a4c22b..cf05b43301 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
@@ -86,7 +86,7 @@ public class GiftOfVitality extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
index 09fb6ae1a1..b241956f2e 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
@@ -59,7 +59,7 @@ public class HeavyMedal extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		int level = checkLevel(player);
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/HungryHorse/HungryHorse.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
index dc51633c85..e2edada6f9 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/HungryHorse/HungryHorse.java
@@ -56,7 +56,7 @@ public class HungryHorse extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
index bed65b3783..704b36f005 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java
@@ -55,7 +55,7 @@ public class HuntForSanta extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/LegendsMark/LegendsMark.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/LegendsMark/LegendsMark.java
index 957c80c9b7..1f3c44d672 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/LegendsMark/LegendsMark.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/LegendsMark/LegendsMark.java
@@ -216,7 +216,7 @@ public class LegendsMark extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
index 5f00ed589f..2c2ff61b76 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
@@ -49,7 +49,7 @@ public class LoveYourGatekeeper extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
index 86d9b42242..8237a3a59d 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/LoversJubilee/LoversJubilee.java
@@ -61,7 +61,7 @@ public class LoversJubilee extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmtext = event;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
index e4275b525e..d0ce19ca1c 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
@@ -68,7 +68,7 @@ public class MasterOfEnchanting extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("buy_staff"))
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java
index 3648cead8e..9ae22c7fea 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java
@@ -76,7 +76,7 @@ public class Eraton extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/RedLibra/RedLibra.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/RedLibra/RedLibra.java
index eb10d9c5b6..37eb4931d7 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/RedLibra/RedLibra.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/RedLibra/RedLibra.java
@@ -100,7 +100,7 @@ public class RedLibra extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
index 15ce00cf72..c8f1b3032e 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
@@ -58,7 +58,7 @@ public class RudolphsBlessing extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("rudolph_eat") && (player != null) && player.isOnline())
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
index 58f787eeb5..393bf983cc 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
@@ -297,7 +297,7 @@ public class SavingSanta extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!isEventPeriod())
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/SmashItCompletely/SmashItCompletely.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/SmashItCompletely/SmashItCompletely.java
index f6561b0854..5dfe37755f 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/SmashItCompletely/SmashItCompletely.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/SmashItCompletely/SmashItCompletely.java
@@ -100,7 +100,7 @@ public class SmashItCompletely extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/SnowmanEnergy/SnowmanEnergy.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/SnowmanEnergy/SnowmanEnergy.java
index 3e321d0c30..134be45110 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/SnowmanEnergy/SnowmanEnergy.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/SnowmanEnergy/SnowmanEnergy.java
@@ -235,7 +235,7 @@ public class SnowmanEnergy extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
index b5c375c3f4..6435393d96 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
@@ -51,7 +51,7 @@ public class ThePowerOfLove extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java
index 8e90fc10db..67ba1cc555 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java
@@ -45,7 +45,7 @@ public class TrainingWithDandy extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
index 75d9710029..9f1cabf05f 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/AltarOfShilen/AltarOfShilen.java
@@ -130,7 +130,7 @@ public class AltarOfShilen extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (event.equals("enterInstance"))
@@ -266,7 +266,7 @@ public class AltarOfShilen extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/AshenShadowCamp/AshenShadowCamp.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/AshenShadowCamp/AshenShadowCamp.java
index 25f884289c..03c1494694 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/AshenShadowCamp/AshenShadowCamp.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/AshenShadowCamp/AshenShadowCamp.java
@@ -267,7 +267,7 @@ public class AshenShadowCamp extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
index 9fd76dc8e9..4db1fc5d16 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java
@@ -198,7 +198,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.contains("enterInstance"))
 		{
@@ -314,7 +314,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance
 			}
 			return null;
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
index 5a447c59d2..5e355d7494 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java
@@ -467,7 +467,7 @@ public class CeremonyOfChaos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
index 1dd487a5d4..9a50c73199 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
@@ -72,7 +72,7 @@ public class ChamberOfProphecies extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
index d28b4ac526..2893aadafa 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java
@@ -177,7 +177,7 @@ public class ChamberOfDelusion extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/CommandPost/CommandPost.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/CommandPost/CommandPost.java
index 468347c880..4c7ecfac4f 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/CommandPost/CommandPost.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/CommandPost/CommandPost.java
@@ -105,7 +105,7 @@ public class CommandPost extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
index 9982fdd612..d3ec315e68 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java
@@ -114,13 +114,13 @@ public class CrystalCavernsCoralGarden extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
index d637bef30e..ea651a8573 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java
@@ -79,13 +79,13 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
index 3d35ef1e68..052add4b91 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java
@@ -135,13 +135,13 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
index bcdfefa43e..2894965800 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
@@ -122,7 +122,7 @@ public class DarkCloudMansion extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
index a19382a228..9554b30092 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java
@@ -43,7 +43,7 @@ public class DimensionMakkum extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = getPlayerInstance(player);
 		switch (event)
@@ -67,7 +67,7 @@ public class DimensionMakkum extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
index 982831b518..0f1aaf54b7 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/DimensionalWrap/DimensionalArchon.java
@@ -53,13 +53,13 @@ public class DimensionalArchon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("NPC_SHOUT"))
 		{
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), getRandomEntry(ARCHON_MSG)));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
index a0b3f39979..85503329da 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/DimensionalWrap/DimensionalTrap.java
@@ -53,7 +53,7 @@ public class DimensionalTrap extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || npc.isAlikeDead())
 		{
@@ -102,7 +102,7 @@ public class DimensionalTrap extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
index deb42042bf..64d86af1f0 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java
@@ -115,7 +115,7 @@ public class DimensionalWrap extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java
index 59c1f783c2..cf8b9e2097 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/EtisVanEtinaSolo/EtisVanEtinaSolo.java
@@ -128,7 +128,7 @@ public class EtisVanEtinaSolo extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -476,7 +476,7 @@ public class EtisVanEtinaSolo extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
index 6dcc329c54..c1b34e22c4 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java
@@ -44,7 +44,7 @@ public class EvasHiddenSpace extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
index 5f1829d4a8..764871d303 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
@@ -189,12 +189,12 @@ public class EvilIncubator extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player);
 		if ((st == null) || !st.isStarted())
 		{
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/FallenEmperorsThrone/FallenEmperorsThrone.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/FallenEmperorsThrone/FallenEmperorsThrone.java
index 7d2d91104c..bfa6c0c5e7 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/FallenEmperorsThrone/FallenEmperorsThrone.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/FallenEmperorsThrone/FallenEmperorsThrone.java
@@ -78,7 +78,7 @@ public class FallenEmperorsThrone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -244,7 +244,7 @@ public class FallenEmperorsThrone extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
index f84132d869..9e440419b9 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/FortressOfTheDead/FortressOfTheDead.java
@@ -58,7 +58,7 @@ public class FortressOfTheDead extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("enterInstance"))
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Fortuna/Fortuna.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Fortuna/Fortuna.java
index c725c77e68..a4e9f97ade 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Fortuna/Fortuna.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Fortuna/Fortuna.java
@@ -51,7 +51,7 @@ public class Fortuna extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -472,7 +472,7 @@ public class Fortuna extends AbstractInstance
 				return null;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/IceQueensCastle/Freya.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/IceQueensCastle/Freya.java
index 8dfcbb296f..c9caac0450 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/IceQueensCastle/Freya.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/IceQueensCastle/Freya.java
@@ -91,7 +91,7 @@ public class Freya extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -590,7 +590,7 @@ public class Freya extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
index 8d9f67fe72..13f7a30124 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
@@ -642,7 +642,7 @@ public class Kamaloka extends AbstractInstance
 	 * Handles only player's enter, single parameter - integer kamaloka index
 	 */
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
index 6b198291df..7945ba71ac 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java
@@ -195,7 +195,7 @@ public class KartiasLabyrinth extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -268,7 +268,7 @@ public class KartiasLabyrinth extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Kastia100/Kastia100.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Kastia100/Kastia100.java
index 1f06af83ba..494e767d14 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Kastia100/Kastia100.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Kastia100/Kastia100.java
@@ -72,7 +72,7 @@ public class Kastia100 extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -218,7 +218,7 @@ public class Kastia100 extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private void moveMonsters(List<Npc> monsterList)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Kastia105/Kastia105.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Kastia105/Kastia105.java
index 891ebba558..13f88dd7bd 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Kastia105/Kastia105.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Kastia105/Kastia105.java
@@ -72,7 +72,7 @@ public class Kastia105 extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -217,7 +217,7 @@ public class Kastia105 extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private void moveMonsters(List<Npc> monsterList)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Kastia110/Kastia110.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Kastia110/Kastia110.java
index 612083f9a5..51a1831520 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Kastia110/Kastia110.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Kastia110/Kastia110.java
@@ -72,7 +72,7 @@ public class Kastia110 extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -217,7 +217,7 @@ public class Kastia110 extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private void moveMonsters(List<Npc> monsterList)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Kastia115/Kastia115.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Kastia115/Kastia115.java
index 0dafd4131e..3badd2703d 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Kastia115/Kastia115.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Kastia115/Kastia115.java
@@ -72,7 +72,7 @@ public class Kastia115 extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -217,7 +217,7 @@ public class Kastia115 extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private void moveMonsters(List<Npc> monsterList)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Kastia120/Kastia120.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Kastia120/Kastia120.java
index 5aee7a21fe..d3f61a568c 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Kastia120/Kastia120.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Kastia120/Kastia120.java
@@ -72,7 +72,7 @@ public class Kastia120 extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -217,7 +217,7 @@ public class Kastia120 extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private void moveMonsters(List<Npc> monsterList)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Kastia125/Kastia125.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Kastia125/Kastia125.java
index 43af350dea..6e42c9776c 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Kastia125/Kastia125.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Kastia125/Kastia125.java
@@ -72,7 +72,7 @@ public class Kastia125 extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -217,7 +217,7 @@ public class Kastia125 extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private void moveMonsters(List<Npc> monsterList)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Kastia130/Kastia130.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Kastia130/Kastia130.java
index 454f5c821c..513bd5866d 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Kastia130/Kastia130.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Kastia130/Kastia130.java
@@ -72,7 +72,7 @@ public class Kastia130 extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -217,7 +217,7 @@ public class Kastia130 extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private void moveMonsters(List<Npc> monsterList)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java
index 94d8159ff5..cccd33f522 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java
@@ -211,7 +211,7 @@ public class KrofinNest extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
index 04ef9907cc..38f17b9a10 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/MysticTavern/MysticTavern.java
@@ -81,7 +81,7 @@ public class MysticTavern extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
index 792beada18..60c3e76ef3 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java
@@ -81,7 +81,7 @@ public class StoryOfFreya extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Instance world = npc.getInstanceWorld();
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
index dc1f01c993..a432a3061c 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/MysticTavern/StoryOfTauti/StoryOfTauti.java
@@ -107,7 +107,7 @@ public class StoryOfTauti extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		switch (event)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
index 00aa306a45..063a07f74c 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java
@@ -124,7 +124,7 @@ public class NightmareKamaloka extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
index 057ad35d11..9f4624da06 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
@@ -93,7 +93,7 @@ public class NornilsGarden extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if (isInInstance(world))
@@ -157,7 +157,7 @@ public class NornilsGarden extends AbstractInstance
 		{
 			enterInstance(player, npc, TEMPLATE_ID);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Nursery/Nursery.java
index 537f5b9bd6..5cdc8792e0 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Nursery/Nursery.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/Nursery/Nursery.java
@@ -192,7 +192,7 @@ public class Nursery extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance instance = npc.getInstanceWorld();
 		if (isInInstance(instance))
@@ -269,7 +269,7 @@ public class Nursery extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
index 05d17c0eba..b02db6b8a2 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java
@@ -105,7 +105,7 @@ public class PailakaRuneCastle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
index a775c55a75..2a53eb1b8e 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java
@@ -173,7 +173,7 @@ public class PrisonOfDarkness extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterInstance"))
 		{
@@ -313,7 +313,7 @@ public class PrisonOfDarkness extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/SpiritForest/SpiritForest.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/SpiritForest/SpiritForest.java
index 80d2b027c3..cc1fd47341 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/SpiritForest/SpiritForest.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/SpiritForest/SpiritForest.java
@@ -50,7 +50,7 @@ public class SpiritForest extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java
index 4821d385e9..36da965160 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java
@@ -63,7 +63,7 @@ public class ThroneOfHeroesGoldberg extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -173,7 +173,7 @@ public class ThroneOfHeroesGoldberg extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java
index 64e50fc2d4..85713877b4 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java
@@ -64,7 +64,7 @@ public class ThroneOfHeroesMaryReed extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -184,7 +184,7 @@ public class ThroneOfHeroesMaryReed extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java
index 6d2183e820..2934005d7d 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java
@@ -61,7 +61,7 @@ public class ThroneOfHeroesTauti extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -161,7 +161,7 @@ public class ThroneOfHeroesTauti extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
index d27eb27ea8..3a796fbed7 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
@@ -140,7 +140,7 @@ public class TimedHunting extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("ENTER"))
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
index deb3853b15..590c663ad9 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
@@ -69,7 +69,7 @@ public class Q00500_BrothersBoundInChains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
index 423c6e803e..c864667da8 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
@@ -71,7 +71,7 @@ public class Q00511_AwlUnderFoot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
index a1a53739b6..ddf6e99c97 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
@@ -58,7 +58,7 @@ public class Q00512_BladeUnderFoot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
index 6774e7a4bd..617f21fea8 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
@@ -69,7 +69,7 @@ public class Q00726_LightWithinTheDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
index abfa40101d..4b4817d4d3 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
@@ -57,7 +57,7 @@ public class Q00727_HopeWithinTheDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
index 630aa1cda7..a0ebe33ec3 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00833_DevilsTreasureTauti/Q00833_DevilsTreasureTauti.java
@@ -65,7 +65,7 @@ public class Q00833_DevilsTreasureTauti extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
index c769ce3645..2acf8dfdce 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java
@@ -61,7 +61,7 @@ public class Q00835_PitiableMelisa extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java
index 7616d4bbf0..de81d4aaec 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java
@@ -67,7 +67,7 @@ public class Q00933_TombRaiders extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java
index 843fde9426..72231b7c25 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java
@@ -79,7 +79,7 @@ public class Q00937_ToReviveTheFishingGuild extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java
index 99f3fcc930..fe8d92a02b 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q00938_TheFishermansOtherHobby/Q00938_TheFishermansOtherHobby.java
@@ -73,7 +73,7 @@ public class Q00938_TheFishermansOtherHobby extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java
index b8a48fb7c0..b7adae47eb 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10423_EmbryoStrongholdRaid/Q10423_EmbryoStrongholdRaid.java
@@ -88,7 +88,7 @@ public class Q10423_EmbryoStrongholdRaid extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java
index 0ae20fa900..cc47b45280 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10454_FinalEmbryoApostle/Q10454_FinalEmbryoApostle.java
@@ -49,7 +49,7 @@ public class Q10454_FinalEmbryoApostle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10507_ObtainingNewPower/Q10507_ObtainingNewPower.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10507_ObtainingNewPower/Q10507_ObtainingNewPower.java
index 549dcdca8b..53a5d44964 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10507_ObtainingNewPower/Q10507_ObtainingNewPower.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10507_ObtainingNewPower/Q10507_ObtainingNewPower.java
@@ -324,7 +324,7 @@ public class Q10507_ObtainingNewPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10510_PowerHarmony/Q10510_PowerHarmony.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10510_PowerHarmony/Q10510_PowerHarmony.java
index 5df473a147..57806eafb8 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10510_PowerHarmony/Q10510_PowerHarmony.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10510_PowerHarmony/Q10510_PowerHarmony.java
@@ -327,7 +327,7 @@ public class Q10510_PowerHarmony extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
index 1f16a04162..700f0cd179 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
@@ -55,7 +55,7 @@ public class Q10566_BestChoice extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java
index 7e752c8f51..7d8d1708e6 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10575_LetsGoFishing/Q10575_LetsGoFishing.java
@@ -74,7 +74,7 @@ public class Q10575_LetsGoFishing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java
index cce92a68e0..0b2f1f104f 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10576_GlitteringWeapons/Q10576_GlitteringWeapons.java
@@ -62,7 +62,7 @@ public class Q10576_GlitteringWeapons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java
index 4ee7e52e23..47341cc412 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10577_TemperARustingBlade/Q10577_TemperARustingBlade.java
@@ -63,7 +63,7 @@ public class Q10577_TemperARustingBlade extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java
index e3726f1cbc..4c8311d430 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10578_TheSoulOfASword/Q10578_TheSoulOfASword.java
@@ -63,7 +63,7 @@ public class Q10578_TheSoulOfASword extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java
index 6e858af38c..552c974380 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10579_ContainingTheAttributePower/Q10579_ContainingTheAttributePower.java
@@ -67,7 +67,7 @@ public class Q10579_ContainingTheAttributePower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/Q10589_WhereFatesIntersect.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/Q10589_WhereFatesIntersect.java
index 8b4da55fc2..74101e9544 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/Q10589_WhereFatesIntersect.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10589_WhereFatesIntersect/Q10589_WhereFatesIntersect.java
@@ -81,7 +81,7 @@ public class Q10589_WhereFatesIntersect extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10590_ReawakenedFate/Q10590_ReawakenedFate.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10590_ReawakenedFate/Q10590_ReawakenedFate.java
index e59de9802e..6fc05897a4 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10590_ReawakenedFate/Q10590_ReawakenedFate.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10590_ReawakenedFate/Q10590_ReawakenedFate.java
@@ -78,7 +78,7 @@ public class Q10590_ReawakenedFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java
index 7b4c393fd0..a1e02d3b94 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java
@@ -120,7 +120,7 @@ public class Q10591_NobleMaterial extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
index 37095951fa..55a5aaefa4 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10801_TheDimensionalWarpPart1/Q10801_TheDimensionalWarpPart1.java
@@ -55,7 +55,7 @@ public class Q10801_TheDimensionalWarpPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
index b5befed756..9c4627c016 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10802_TheDimensionalWarpPart2/Q10802_TheDimensionalWarpPart2.java
@@ -56,7 +56,7 @@ public class Q10802_TheDimensionalWarpPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
index 65695c5a8c..2565dec6f1 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10803_TheDimensionalWarpPart3/Q10803_TheDimensionalWarpPart3.java
@@ -57,7 +57,7 @@ public class Q10803_TheDimensionalWarpPart3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
index 205ca9acf8..d627be1c7b 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10804_TheDimensionalWarpPart4/Q10804_TheDimensionalWarpPart4.java
@@ -57,7 +57,7 @@ public class Q10804_TheDimensionalWarpPart4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
index 175d4c2fc1..10e1981858 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10805_TheDimensionalWarpPart5/Q10805_TheDimensionalWarpPart5.java
@@ -57,7 +57,7 @@ public class Q10805_TheDimensionalWarpPart5 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
index beee90af7e..1eadeec2b8 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10806_TheDimensionalWarpPart6/Q10806_TheDimensionalWarpPart6.java
@@ -56,7 +56,7 @@ public class Q10806_TheDimensionalWarpPart6 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
index 93768cb23a..de966012e1 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10807_TheDimensionalWarpPart7/Q10807_TheDimensionalWarpPart7.java
@@ -56,7 +56,7 @@ public class Q10807_TheDimensionalWarpPart7 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
index 119b9fdae5..e0040553d4 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
@@ -319,7 +319,7 @@ public class Q10811_ExaltedOneWhoFacesTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
index 056a84b2ba..6788562412 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
@@ -324,7 +324,7 @@ public class Q10817_ExaltedOneWhoOvercomesTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
index 7f7838492a..117846c2b8 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
@@ -331,7 +331,7 @@ public class Q10823_ExaltedOneWhoShattersTheLimit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
index 3c06ec65b3..5aed716957 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
@@ -323,7 +323,7 @@ public class Q10873_ExaltedReachingAnotherLevel extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java
index f04a9018bb..8eba788a19 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java
@@ -323,7 +323,7 @@ public class Q10879_ExaltedGuideToPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java
index 377cc0827d..9bcc2608e8 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java
@@ -48,7 +48,7 @@ public class Q10885_SaviorsPathDiscovery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/Q10886_SaviorsPathSearchTheRefinery.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/Q10886_SaviorsPathSearchTheRefinery.java
index 69b8e4c169..046a2bfc1c 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/Q10886_SaviorsPathSearchTheRefinery.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/Q10886_SaviorsPathSearchTheRefinery.java
@@ -57,7 +57,7 @@ public class Q10886_SaviorsPathSearchTheRefinery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10887_SaviorsPathDemonsAndAtelia/Q10887_SaviorsPathDemonsAndAtelia.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10887_SaviorsPathDemonsAndAtelia/Q10887_SaviorsPathDemonsAndAtelia.java
index 850b565995..4ea3584275 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10887_SaviorsPathDemonsAndAtelia/Q10887_SaviorsPathDemonsAndAtelia.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10887_SaviorsPathDemonsAndAtelia/Q10887_SaviorsPathDemonsAndAtelia.java
@@ -75,7 +75,7 @@ public class Q10887_SaviorsPathDemonsAndAtelia extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10888_SaviorsPathDefeatTheEmbryo/Q10888_SaviorsPathDefeatTheEmbryo.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10888_SaviorsPathDefeatTheEmbryo/Q10888_SaviorsPathDefeatTheEmbryo.java
index bc32646fe9..fce0db075a 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10888_SaviorsPathDefeatTheEmbryo/Q10888_SaviorsPathDefeatTheEmbryo.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10888_SaviorsPathDefeatTheEmbryo/Q10888_SaviorsPathDefeatTheEmbryo.java
@@ -76,7 +76,7 @@ public class Q10888_SaviorsPathDefeatTheEmbryo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10889_SaviorsPathFallenEmperorsThrone/Q10889_SaviorsPathFallenEmperorsThrone.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10889_SaviorsPathFallenEmperorsThrone/Q10889_SaviorsPathFallenEmperorsThrone.java
index 1fd9101ab3..8ad3c5cb5b 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10889_SaviorsPathFallenEmperorsThrone/Q10889_SaviorsPathFallenEmperorsThrone.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10889_SaviorsPathFallenEmperorsThrone/Q10889_SaviorsPathFallenEmperorsThrone.java
@@ -55,7 +55,7 @@ public class Q10889_SaviorsPathFallenEmperorsThrone extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10890_SaviorsPathHallOfEtina/Q10890_SaviorsPathHallOfEtina.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10890_SaviorsPathHallOfEtina/Q10890_SaviorsPathHallOfEtina.java
index 6a38a93de2..5258b8a7b3 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10890_SaviorsPathHallOfEtina/Q10890_SaviorsPathHallOfEtina.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10890_SaviorsPathHallOfEtina/Q10890_SaviorsPathHallOfEtina.java
@@ -63,7 +63,7 @@ public class Q10890_SaviorsPathHallOfEtina extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/Q10904_JourneyToTheConquestWorld.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/Q10904_JourneyToTheConquestWorld.java
index a720ce3330..840105d886 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/Q10904_JourneyToTheConquestWorld.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/Q10904_JourneyToTheConquestWorld.java
@@ -46,7 +46,7 @@ public class Q10904_JourneyToTheConquestWorld extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10905_HuntingTime/Q10905_HuntingTime.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10905_HuntingTime/Q10905_HuntingTime.java
index dbaa7de9ce..d5f958353e 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10905_HuntingTime/Q10905_HuntingTime.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10905_HuntingTime/Q10905_HuntingTime.java
@@ -165,7 +165,7 @@ public class Q10905_HuntingTime extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10906_ChasingTheLight/Q10906_ChasingTheLight.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10906_ChasingTheLight/Q10906_ChasingTheLight.java
index 8fa1226328..ae9310f49b 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10906_ChasingTheLight/Q10906_ChasingTheLight.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10906_ChasingTheLight/Q10906_ChasingTheLight.java
@@ -58,7 +58,7 @@ public class Q10906_ChasingTheLight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/Q10907_WhereFlowersBlossom.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/Q10907_WhereFlowersBlossom.java
index bf7448011d..1965b35647 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/Q10907_WhereFlowersBlossom.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/Q10907_WhereFlowersBlossom.java
@@ -66,7 +66,7 @@ public class Q10907_WhereFlowersBlossom extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/Q10908_DarkSunPrimordialFlame.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/Q10908_DarkSunPrimordialFlame.java
index 92e604b84c..bd245393e1 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/Q10908_DarkSunPrimordialFlame.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/Q10908_DarkSunPrimordialFlame.java
@@ -49,7 +49,7 @@ public class Q10908_DarkSunPrimordialFlame extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10909_FlameHunting/Q10909_FlameHunting.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10909_FlameHunting/Q10909_FlameHunting.java
index 1acc1f00c6..29b159c333 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10909_FlameHunting/Q10909_FlameHunting.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10909_FlameHunting/Q10909_FlameHunting.java
@@ -113,7 +113,7 @@ public class Q10909_FlameHunting extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/Q10910_InSearchOfTheFireSource.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/Q10910_InSearchOfTheFireSource.java
index c48cbbd4fb..3c7d33cc44 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/Q10910_InSearchOfTheFireSource.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/Q10910_InSearchOfTheFireSource.java
@@ -64,7 +64,7 @@ public class Q10910_InSearchOfTheFireSource extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10911_FireSmell/Q10911_FireSmell.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10911_FireSmell/Q10911_FireSmell.java
index f2d826f729..b1d61ec73d 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10911_FireSmell/Q10911_FireSmell.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q10911_FireSmell/Q10911_FireSmell.java
@@ -64,7 +64,7 @@ public class Q10911_FireSmell extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
index ed8427a4f6..7954f42559 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
@@ -85,7 +85,7 @@ public class Q11024_PathOfDestinyBeginning extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
index d32965c2a7..7f2bf5a2ae 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
@@ -125,7 +125,7 @@ public class Q11025_PathOfDestinyProving extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
index 3a17382c3f..f5eaeb9846 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
@@ -103,7 +103,7 @@ public class Q11026_PathOfDestinyConviction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
index a1bdc845bb..44c1aa1324 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
@@ -131,7 +131,7 @@ public class Q11027_PathOfDestinyOvercome extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/ThirdClassTransferQuest.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
index 6abf0e05aa..e0b1b42f88 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
@@ -133,7 +133,7 @@ public abstract class ThirdClassTransferQuest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/vehicles/AirShipController.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/vehicles/AirShipController.java
index d152ba5968..e177dd4f14 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/vehicles/AirShipController.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/vehicles/AirShipController.java
@@ -117,7 +117,7 @@ public abstract class AirShipController extends AbstractNpcAI
 	private static final SystemMessage SM_NEED_MORE = new SystemMessage(SystemMessageId.YOU_DON_T_HAVE_ENOUGH_S1_TO_SUMMON_THE_AIRSHIP).addItemName(STARSTONE);
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("summon".equalsIgnoreCase(event))
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
index ac981f3f60..3e24424820 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
@@ -162,7 +162,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player.isTransformed())
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
index 82ba0c36c8..29bff5faa7 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
@@ -51,7 +51,7 @@ public class AllianceMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!"9001-01.htm".equals(event) && (player.getClan() == null))
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
index d8696a76a4..fe42ca332e 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
@@ -95,7 +95,7 @@ public class ClanMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LEADER_REQUIRED.containsKey(event) && !player.isClanLeader())
 		{
diff --git a/L2J_Mobius_11.2_AgeOfMagic/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_11.2_AgeOfMagic/java/org/l2jmobius/gameserver/model/quest/Quest.java
index 5b58ba4e05..b26d584dc7 100644
--- a/L2J_Mobius_11.2_AgeOfMagic/java/org/l2jmobius/gameserver/model/quest/Quest.java
+++ b/L2J_Mobius_11.2_AgeOfMagic/java/org/l2jmobius/gameserver/model/quest/Quest.java
@@ -252,7 +252,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -274,7 +274,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -565,7 +565,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 			{
 				player.setSimulatedTalking(false);
 			}
-			res = onAdvEvent(event, npc, player);
+			res = onEvent(event, npc, player);
 		}
 		catch (Exception e)
 		{
@@ -1043,12 +1043,11 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 */
 	public String onDeath(Creature killer, Creature victim, QuestState qs)
 	{
-		return onAdvEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
+		return onEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
 	}
 	
 	/**
 	 * This function is called whenever a player clicks on a link in a quest dialog and whenever a timer fires.<br>
-	 * If is not overridden by a subclass, then default to the returned value of the simpler (and older) {@link #onEvent(String, QuestState)} override.<br>
 	 * If the player has a quest state, use it as parameter in the next call, otherwise return null.
 	 * @param event this parameter contains a string identifier for the event.<br>
 	 *            Generally, this string is passed directly via the link.<br>
@@ -1067,35 +1066,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 *            This parameter may be {@code null} in certain circumstances.
 	 * @return the text returned by the event (may be {@code null}, a filename or just text)
 	 */
-	public String onAdvEvent(String event, Npc npc, Player player)
-	{
-		if (player != null)
-		{
-			final QuestState qs = player.getQuestState(getName());
-			if (qs != null)
-			{
-				return onEvent(event, qs);
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * This function is called in place of {@link #onAdvEvent(String, Npc, Player)} if the former is not implemented.<br>
-	 * If a script contains both {@link #onAdvEvent(String, Npc, Player)} and this implementation, then this method will never be called unless the script's {@link #onAdvEvent(String, Npc, Player)} explicitly calls this method.
-	 * @param event this parameter contains a string identifier for the event.<br>
-	 *            Generally, this string is passed directly via the link.<br>
-	 *            For example:<br>
-	 *            <code>
-	 *            &lt;a action="bypass -h Quest 626_ADarkTwilight 31517-01.htm"&gt;hello&lt;/a&gt;
-	 *            </code><br>
-	 *            The above link sets the event variable to "31517-01.htm" for the quest 626_ADarkTwilight.<br>
-	 *            In the case of timers, this will be the name of the timer.<br>
-	 *            This parameter serves as a sort of identifier.
-	 * @param qs this parameter contains a reference to the quest state of the player who used the link or started the timer.
-	 * @return the text returned by the event (may be {@code null}, a filename or just text)
-	 */
-	public String onEvent(String event, QuestState qs)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return null;
 	}
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java
index e41862d662..2442348744 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java
@@ -449,7 +449,7 @@ public class FeedableBeasts extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("polymorph Mad Cow") && (npc != null) && (player != null) && MAD_COW_POLYMORPH.containsKey(npc.getId()))
 		{
@@ -473,7 +473,7 @@ public class FeedableBeasts extends AbstractNpcAI
 			nextNpc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player);
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
index 829a648ea6..086879818f 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
@@ -44,7 +44,7 @@ public class Tunatun extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("Whip".equals(event))
 		{
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
index a26e6075fd..31fc2ba199 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
@@ -43,12 +43,12 @@ public class Toma extends AbstractNpcAI
 	private Toma()
 	{
 		addFirstTalkId(TOMA);
-		onAdvEvent("RESPAWN_TOMA", null, null);
+		onEvent("RESPAWN_TOMA", null, null);
 		startQuestTimer("RESPAWN_TOMA", TELEPORT_DELAY, null, null, true);
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("RESPAWN_TOMA"))
 		{
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
index abc4e265d9..0ccd2abad4 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
@@ -41,7 +41,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -54,7 +54,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 				npc.deleteMe();
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_DAY_NIGHT_CHANGE)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
index 8b1dba5b13..f65d38e761 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
@@ -84,7 +84,7 @@ public class Rooney extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport") && !npc.isDecayed())
 		{
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/FrozenLabyrinth/Rafforty/Rafforty.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/FrozenLabyrinth/Rafforty/Rafforty.java
index 7933bbb4c9..93c81b6573 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/FrozenLabyrinth/Rafforty/Rafforty.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/FrozenLabyrinth/Rafforty/Rafforty.java
@@ -35,7 +35,7 @@ public class Rafforty extends AbstractNpcAI
 	private static final int BOTTLE = 16027;
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
index bdd4ab193d..049d8710eb 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
@@ -108,7 +108,7 @@ public class KetraOrcSupport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
index e82d2f133f..9e1d92cd23 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
@@ -62,7 +62,7 @@ public class PaganTeleporters extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
index 30a877dfa7..ef27a0985d 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
@@ -168,7 +168,7 @@ public class PrimevalIsle extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -211,7 +211,7 @@ public class PrimevalIsle extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
index fc9ca1bc2d..f959ca6dd4 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
@@ -145,7 +145,7 @@ public class Venom extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java
index 6f97a61ba2..ace31064f0 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java
@@ -86,7 +86,7 @@ public class ToIVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int npcId = npc.getId();
 		
@@ -132,7 +132,7 @@ public class ToIVortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
index 240db66f2f..15a124ce18 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
@@ -108,7 +108,7 @@ public class VarkaSilenosSupport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index b4f9c10b23..2271d337e5 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -192,7 +192,7 @@ public class Antharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -605,7 +605,7 @@ public class Antharas extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 939469c5cd..4e315948e2 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -163,7 +163,7 @@ public class Baium extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -477,7 +477,7 @@ public class Baium extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Core/Core.java
index 7b6c38ef6e..cdb31e2e91 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -143,7 +143,7 @@ public class Core extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
@@ -162,7 +162,7 @@ public class Core extends AbstractNpcAI
 			_minions.forEach(Attackable::decayMe);
 			_minions.clear();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
index 53cf0d9b9f..ddd0eb3a5d 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
@@ -112,7 +112,7 @@ public class DrChaos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -223,7 +223,7 @@ public class DrChaos extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Frintezza/Frintezza.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Frintezza/Frintezza.java
index 746e683455..3fcf49e7cf 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Frintezza/Frintezza.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Frintezza/Frintezza.java
@@ -317,7 +317,7 @@ public class Frintezza extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		long temp = 0;
 		if (event.equalsIgnoreCase("waiting"))
@@ -1290,7 +1290,7 @@ public class Frintezza extends AbstractNpcAI
 			_zone.oustAllPlayers();
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 59c52d5928..010953ceb3 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -169,7 +169,7 @@ public class Orfen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("orfen_unlock"))
 		{
@@ -232,7 +232,7 @@ public class Orfen extends AbstractNpcAI
 			mob.setIsRaidMinion(true);
 			MINIONS.add(mob);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 43a0e85ace..d04a936a65 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -146,7 +146,7 @@ public class QueenAnt extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -230,7 +230,7 @@ public class QueenAnt extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
index 4843e1b1c9..8300985ed2 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
@@ -80,7 +80,7 @@ public class Sailren extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -249,7 +249,7 @@ public class Sailren extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index 8edc4da52a..82f638645c 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -191,7 +191,7 @@ public class Valakas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -380,7 +380,7 @@ public class Valakas extends AbstractNpcAI
 		{
 			BOSS_ZONE.oustAllPlayers();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
index dcda98b75a..ddb248b5f8 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
@@ -197,7 +197,7 @@ public class Zaken extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -588,7 +588,7 @@ public class Zaken extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index 658cec490b..582782ce09 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -51,7 +51,7 @@ public class ArenaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -100,7 +100,7 @@ public class ArenaManager extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/Asamah/Asamah.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/Asamah/Asamah.java
index 0b5f4da993..7d35f1914e 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/Asamah/Asamah.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/Asamah/Asamah.java
@@ -39,7 +39,7 @@ public class Asamah extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("32115-03.htm") || event.equals("32115-04.htm"))
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
index d31eb72af9..990e647d15 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
@@ -48,7 +48,7 @@ public class BlackJudge extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final int level = ((player.getExpertiseLevel() < 5) ? player.getExpertiseLevel() : 5);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
index 565ad1f2aa..feb10e7cb7 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
@@ -56,7 +56,7 @@ public class CastleBlacksmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return (event.equalsIgnoreCase(npc.getId() + "-02.html") && hasRights(player, npc)) ? event : null;
 	}
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
index 93778f79c6..656c71f0ca 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
@@ -444,7 +444,7 @@ public class CastleChamberlain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Castle castle = npc.getCastle();
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
index 9ce5138635..c7f6e25d77 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
@@ -121,7 +121,7 @@ public class CastleCourtMagician extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player.getClan() == null) && (player.getClanId() != npc.getCastle().getOwnerId()))
 		{
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
index e4ff45968e..5d4b54fc35 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
@@ -57,7 +57,7 @@ public class CastleMercenaryManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index 6237d80278..49f87eb678 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -55,7 +55,7 @@ public class CastleTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("teleporter-03.html"))
 		{
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
index 4b95b34215..9b304c6628 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
@@ -52,7 +52,7 @@ public class CastleWarehouse extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
index d6ab16eb9c..71ff559ebd 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
@@ -68,7 +68,7 @@ public class ClanTrader extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/GatekeeperSpirit/GatekeeperSpirit.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/GatekeeperSpirit/GatekeeperSpirit.java
index 3a9a0b5cf2..88e2f3809b 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/GatekeeperSpirit/GatekeeperSpirit.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/GatekeeperSpirit/GatekeeperSpirit.java
@@ -51,7 +51,7 @@ public class GatekeeperSpirit extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
index eb6fde96d4..20f8545b07 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
@@ -52,7 +52,7 @@ public class HealerTrainer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
index e90a243ef9..1aee79ee59 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
@@ -70,7 +70,7 @@ public class ManorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
index 78a72f3d4f..a53f2f1e56 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
@@ -66,7 +66,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -123,7 +123,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NewbieTravelToken/NewbieTravelToken.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NewbieTravelToken/NewbieTravelToken.java
index 1e91f84c71..9012523eda 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NewbieTravelToken/NewbieTravelToken.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NewbieTravelToken/NewbieTravelToken.java
@@ -55,7 +55,7 @@ public class NewbieTravelToken extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
@@ -71,7 +71,7 @@ public class NewbieTravelToken extends AbstractNpcAI
 				{
 					player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT);
 				}
-				return super.onAdvEvent(event, npc, player);
+				return super.onEvent(event, npc, player);
 			}
 		}
 		return event;
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NoblesseTeleport/NoblesseTeleport.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NoblesseTeleport/NoblesseTeleport.java
index 859acb44fc..d10ac38e8d 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NoblesseTeleport/NoblesseTeleport.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NoblesseTeleport/NoblesseTeleport.java
@@ -60,7 +60,7 @@ public class NoblesseTeleport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("teleportWithToken".equals(event))
 		{
@@ -73,7 +73,7 @@ public class NoblesseTeleport extends AbstractNpcAI
 				return "noble-nopass.htm";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/OracleTeleport/OracleTeleport.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/OracleTeleport/OracleTeleport.java
index 859afa0ddf..f84b1d5637 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/OracleTeleport/OracleTeleport.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/OracleTeleport/OracleTeleport.java
@@ -152,7 +152,7 @@ public class OracleTeleport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = "";
 		final QuestState qs = getQuestState(player, true);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/Selina/Selina.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/Selina/Selina.java
index 35f8bda220..0646f39485 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/Selina/Selina.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/Selina/Selina.java
@@ -61,7 +61,7 @@ public class Selina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final BuffHolder buff = BUFFS.get(event);
 		if (buff != null)
@@ -69,7 +69,7 @@ public class Selina extends AbstractNpcAI
 			if ((getQuestItemsCount(player, GOLDEN_RAM_COIN) >= buff.getCost()))
 			{
 				castSkill(npc, player, buff);
-				return super.onAdvEvent(event, npc, player);
+				return super.onEvent(event, npc, player);
 			}
 		}
 		else
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/Servitors/SinEater.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/Servitors/SinEater.java
index 48f0999dd6..8ac11b0adb 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/Servitors/SinEater.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/Servitors/SinEater.java
@@ -48,7 +48,7 @@ public class SinEater extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TALK") && (player != null) && (player.getSummon() != null))
 		{
@@ -79,7 +79,7 @@ public class SinEater extends AbstractNpcAI
 			}
 			startQuestTimer("TALK", 60000, null, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_CREATURE_DEATH)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
index f6d1e74529..a733b87dad 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
@@ -53,7 +53,7 @@ public class SymbolMaker extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/TownPets/TownPets.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/TownPets/TownPets.java
index dfb0cd77d1..c65d385f3a 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/TownPets/TownPets.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/TownPets/TownPets.java
@@ -52,7 +52,7 @@ public class TownPets extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("move"))
 		{
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/TurekOrcs.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/TurekOrcs.java
index 6c877ef8fc..75fe5836ae 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/TurekOrcs.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/TurekOrcs.java
@@ -54,7 +54,7 @@ public class TurekOrcs extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("checkState") && !npc.isDead() && (npc.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK))
 		{
@@ -68,7 +68,7 @@ public class TurekOrcs extends AbstractNpcAI
 				npc.getVariables().remove("state");
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
index f8d5844f1e..3398510a18 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
@@ -63,7 +63,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = "";
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/WarriorFishingBlock.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
index 56b29fee5b..78e3d1c99e 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
@@ -75,7 +75,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -104,7 +104,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index f701cd5a86..879d96fbf9 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -181,7 +181,7 @@ public class WyvernManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
index d1a1483f87..e1cc56dcd9 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
@@ -352,7 +352,7 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String html = event;
 		final Clan clan = player.getClan();
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java
index 9801b840d4..4c46bcefa1 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java
@@ -157,7 +157,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 	}
 	
 	@Override
-	public synchronized String onAdvEvent(String event, Npc npc, Player player)
+	public synchronized String onEvent(String event, Npc npc, Player player)
 	{
 		String html = event;
 		final Clan clan = player.getClan();
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
index 0c2e7586c9..c49be5297b 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
@@ -36,7 +36,7 @@ public class DelevelManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.DELEVEL_MANAGER_ENABLED)
 		{
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java
index 55c8a86364..887467ce32 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java
@@ -99,7 +99,7 @@ public class EchoCrystals extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = "";
 		final QuestState qs = player.getQuestState(EchoCrystals.class.getSimpleName());
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
index ff6d40ec0e..4713803f1d 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
@@ -54,7 +54,7 @@ public class FactionSystem extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class FactionSystem extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
index 8b9c676ad5..771c8a9058 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
@@ -34,7 +34,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -77,7 +77,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 				npc.broadcastInfo(); // update flag status
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/MissQueen/MissQueen.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/MissQueen/MissQueen.java
index f91c65bf7a..23d8355ab8 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/MissQueen/MissQueen.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/MissQueen/MissQueen.java
@@ -61,7 +61,7 @@ public class MissQueen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equals("newbie_coupon"))
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
index 669fcfc85c..ddf7e923eb 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
@@ -39,7 +39,7 @@ public class NoblessMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.NOBLESS_MASTER_ENABLED)
 		{
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
index ce1b4b5b34..8a1b47de56 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
@@ -267,7 +267,7 @@ public class NpcLocationInfo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (Util.isDigit(event))
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java
index 8fc9988c4a..c675775039 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java
@@ -69,7 +69,7 @@ public class RaidbossInfo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (Util.isDigit(event))
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
index d49ede04b5..737286697c 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
@@ -166,7 +166,7 @@ public class Deathmatch extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 497e2cd3a2..25e6a8546b 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -184,7 +184,7 @@ public class TvT extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/events/Wedding/Wedding.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/events/Wedding/Wedding.java
index 82d4e748bd..f6783a161c 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/events/Wedding/Wedding.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/events/Wedding/Wedding.java
@@ -50,7 +50,7 @@ public class Wedding extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player.getPartnerId() == 0)
 		{
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
index aa5419e179..76aaa4ab09 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
@@ -59,7 +59,7 @@ public class HeavyMedal extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		int level = checkLevel(player);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/events/L2Day/L2Day.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/events/L2Day/L2Day.java
index a76a9d35bc..34a09fb8f3 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/events/L2Day/L2Day.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/events/L2Day/L2Day.java
@@ -149,7 +149,7 @@ public class L2Day extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java
index 4011cd351b..71b33a4b11 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java
@@ -45,7 +45,7 @@ public class Q00001_LettersOfLove extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java
index 284213105c..eb6e075c5a 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java
@@ -48,7 +48,7 @@ public class Q00002_WhatWomenWant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java
index 53b9c272ca..48c610cbcd 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java
@@ -57,7 +57,7 @@ public class Q00003_WillTheSealBeBroken extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java
index 04610bc64f..8044b88840 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java
@@ -50,7 +50,7 @@ public class Q00004_LongLiveThePaagrioLord extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java
index a715426747..46298e52ed 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java
@@ -50,7 +50,7 @@ public class Q00005_MinersFavor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00006_StepIntoTheFuture/Q00006_StepIntoTheFuture.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00006_StepIntoTheFuture/Q00006_StepIntoTheFuture.java
index 55f38736e8..8e084042ee 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00006_StepIntoTheFuture/Q00006_StepIntoTheFuture.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00006_StepIntoTheFuture/Q00006_StepIntoTheFuture.java
@@ -44,7 +44,7 @@ public class Q00006_StepIntoTheFuture extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00007_ATripBegins/Q00007_ATripBegins.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00007_ATripBegins/Q00007_ATripBegins.java
index 54509c49b6..7d0ce4b1e5 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00007_ATripBegins/Q00007_ATripBegins.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00007_ATripBegins/Q00007_ATripBegins.java
@@ -44,7 +44,7 @@ public class Q00007_ATripBegins extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00008_AnAdventureBegins/Q00008_AnAdventureBegins.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00008_AnAdventureBegins/Q00008_AnAdventureBegins.java
index 7afb5dd01a..0ec29c0c4b 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00008_AnAdventureBegins/Q00008_AnAdventureBegins.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00008_AnAdventureBegins/Q00008_AnAdventureBegins.java
@@ -44,7 +44,7 @@ public class Q00008_AnAdventureBegins extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00009_IntoTheCityOfHumans/Q00009_IntoTheCityOfHumans.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00009_IntoTheCityOfHumans/Q00009_IntoTheCityOfHumans.java
index 935e4e4a2c..8be80d33e1 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00009_IntoTheCityOfHumans/Q00009_IntoTheCityOfHumans.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00009_IntoTheCityOfHumans/Q00009_IntoTheCityOfHumans.java
@@ -41,7 +41,7 @@ public class Q00009_IntoTheCityOfHumans extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00010_IntoTheWorld/Q00010_IntoTheWorld.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00010_IntoTheWorld/Q00010_IntoTheWorld.java
index 22eb9b6162..aa8d9bcaa9 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00010_IntoTheWorld/Q00010_IntoTheWorld.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00010_IntoTheWorld/Q00010_IntoTheWorld.java
@@ -44,7 +44,7 @@ public class Q00010_IntoTheWorld extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00011_SecretMeetingWithKetraOrcs/Q00011_SecretMeetingWithKetraOrcs.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00011_SecretMeetingWithKetraOrcs/Q00011_SecretMeetingWithKetraOrcs.java
index 5bb77f81b1..81e498d7db 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00011_SecretMeetingWithKetraOrcs/Q00011_SecretMeetingWithKetraOrcs.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00011_SecretMeetingWithKetraOrcs/Q00011_SecretMeetingWithKetraOrcs.java
@@ -40,7 +40,7 @@ public class Q00011_SecretMeetingWithKetraOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00012_SecretMeetingWithVarkaSilenos/Q00012_SecretMeetingWithVarkaSilenos.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00012_SecretMeetingWithVarkaSilenos/Q00012_SecretMeetingWithVarkaSilenos.java
index e1f8f70880..ababcdfac2 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00012_SecretMeetingWithVarkaSilenos/Q00012_SecretMeetingWithVarkaSilenos.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00012_SecretMeetingWithVarkaSilenos/Q00012_SecretMeetingWithVarkaSilenos.java
@@ -40,7 +40,7 @@ public class Q00012_SecretMeetingWithVarkaSilenos extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
index 7372bacd78..ffd6c296ce 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
@@ -39,7 +39,7 @@ public class Q00013_ParcelDelivery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00014_WhereaboutsOfTheArchaeologist/Q00014_WhereaboutsOfTheArchaeologist.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00014_WhereaboutsOfTheArchaeologist/Q00014_WhereaboutsOfTheArchaeologist.java
index 47e4cb43dd..9ee9de8348 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00014_WhereaboutsOfTheArchaeologist/Q00014_WhereaboutsOfTheArchaeologist.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00014_WhereaboutsOfTheArchaeologist/Q00014_WhereaboutsOfTheArchaeologist.java
@@ -39,7 +39,7 @@ public class Q00014_WhereaboutsOfTheArchaeologist extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
index bc7a7a10ea..910092e2ec 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
@@ -37,7 +37,7 @@ public class Q00015_SweetWhispers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
index abb9827ca3..592fdac5d1 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
@@ -44,7 +44,7 @@ public class Q00016_TheComingDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
index 46a588102e..25ce0d55c5 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
@@ -42,7 +42,7 @@ public class Q00017_LightAndDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00018_MeetingWithTheGoldenRam/Q00018_MeetingWithTheGoldenRam.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00018_MeetingWithTheGoldenRam/Q00018_MeetingWithTheGoldenRam.java
index 180247f0e3..d96eb61d9d 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00018_MeetingWithTheGoldenRam/Q00018_MeetingWithTheGoldenRam.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00018_MeetingWithTheGoldenRam/Q00018_MeetingWithTheGoldenRam.java
@@ -41,7 +41,7 @@ public class Q00018_MeetingWithTheGoldenRam extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
index 66b9d5c2c7..bb6c36b83a 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
@@ -39,7 +39,7 @@ public class Q00019_GoToThePastureland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
index d15aecda5f..bda4080189 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
@@ -36,7 +36,7 @@ public class Q00020_BringUpWithLove extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00021_HiddenTruth/Q00021_HiddenTruth.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00021_HiddenTruth/Q00021_HiddenTruth.java
index f2c819691c..9112bc42fb 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00021_HiddenTruth/Q00021_HiddenTruth.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00021_HiddenTruth/Q00021_HiddenTruth.java
@@ -60,7 +60,7 @@ public class Q00021_HiddenTruth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00022_TragedyInVonHellmannForest/Q00022_TragedyInVonHellmannForest.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00022_TragedyInVonHellmannForest/Q00022_TragedyInVonHellmannForest.java
index dd238d2bdf..2094d3ee15 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00022_TragedyInVonHellmannForest/Q00022_TragedyInVonHellmannForest.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00022_TragedyInVonHellmannForest/Q00022_TragedyInVonHellmannForest.java
@@ -75,7 +75,7 @@ public class Q00022_TragedyInVonHellmannForest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(getName());
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00023_LidiasHeart/Q00023_LidiasHeart.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00023_LidiasHeart/Q00023_LidiasHeart.java
index 12f8c8f734..8ff1022a30 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00023_LidiasHeart/Q00023_LidiasHeart.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00023_LidiasHeart/Q00023_LidiasHeart.java
@@ -57,7 +57,7 @@ public class Q00023_LidiasHeart extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java
index cc262aeaab..6af0f28be9 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java
@@ -65,7 +65,7 @@ public class Q00024_InhabitantsOfTheForestOfTheDead extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		QuestState st = player.getQuestState(getName());
 		if (st == null)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00025_HidingBehindTheTruth/Q00025_HidingBehindTheTruth.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00025_HidingBehindTheTruth/Q00025_HidingBehindTheTruth.java
index 8a66d626ea..12c6888063 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00025_HidingBehindTheTruth/Q00025_HidingBehindTheTruth.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00025_HidingBehindTheTruth/Q00025_HidingBehindTheTruth.java
@@ -61,7 +61,7 @@ public class Q00025_HidingBehindTheTruth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java
index b1f6635860..2e3b7a022f 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java
@@ -46,7 +46,7 @@ public class Q00027_ChestCaughtWithABaitOfWind extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java
index 8d88920693..51beebeff9 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java
@@ -43,7 +43,7 @@ public class Q00028_ChestCaughtWithABaitOfIcyAir extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java
index 1e31b901ff..6052d385ac 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java
@@ -43,7 +43,7 @@ public class Q00029_ChestCaughtWithABaitOfEarth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java
index 0810188f5e..eefad116c1 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java
@@ -43,7 +43,7 @@ public class Q00030_ChestCaughtWithABaitOfFire extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
index ee2e030cb0..be773b6fd8 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
@@ -43,7 +43,7 @@ public class Q00031_SecretBuriedInTheSwamp extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
index c91fda6efe..f85f3b2055 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
@@ -50,7 +50,7 @@ public class Q00032_AnObviousLie extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
index 16291f8602..7928362d94 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
@@ -45,7 +45,7 @@ public class Q00033_MakeAPairOfDressShoes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
index ded74683a9..959801b2c4 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
@@ -52,7 +52,7 @@ public class Q00034_InSearchOfCloth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
index 2c2387e3b2..7de5369c33 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
@@ -48,7 +48,7 @@ public class Q00035_FindGlitteringJewelry extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
index 1d043af1b3..9b31083906 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
@@ -44,7 +44,7 @@ public class Q00036_MakeASewingKit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
index 46f0180831..4d3ca7e25a 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
@@ -49,7 +49,7 @@ public class Q00037_MakeFormalWear extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java
index 4a13d85a15..fe4aec5023 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java
@@ -69,7 +69,7 @@ public class Q00038_DragonFangs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00039_RedEyedInvaders/Q00039_RedEyedInvaders.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00039_RedEyedInvaders/Q00039_RedEyedInvaders.java
index 593c8b1faf..e098a35276 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00039_RedEyedInvaders/Q00039_RedEyedInvaders.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00039_RedEyedInvaders/Q00039_RedEyedInvaders.java
@@ -73,7 +73,7 @@ public class Q00039_RedEyedInvaders extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
index 19b876b0c3..d7768891c9 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
@@ -47,7 +47,7 @@ public class Q00042_HelpTheUncle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
index f511a817ae..8404924563 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
@@ -47,7 +47,7 @@ public class Q00043_HelpTheSister extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
index f4bf3e1386..cbe8d58331 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
@@ -48,7 +48,7 @@ public class Q00044_HelpTheSon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00045_ToTalkingIsland/Q00045_ToTalkingIsland.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00045_ToTalkingIsland/Q00045_ToTalkingIsland.java
index 3532fad5db..c756356850 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00045_ToTalkingIsland/Q00045_ToTalkingIsland.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00045_ToTalkingIsland/Q00045_ToTalkingIsland.java
@@ -45,7 +45,7 @@ public class Q00045_ToTalkingIsland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00046_OnceMoreInTheArmsOfTheMotherTree/Q00046_OnceMoreInTheArmsOfTheMotherTree.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00046_OnceMoreInTheArmsOfTheMotherTree/Q00046_OnceMoreInTheArmsOfTheMotherTree.java
index 126f8b4e33..7db29865f0 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00046_OnceMoreInTheArmsOfTheMotherTree/Q00046_OnceMoreInTheArmsOfTheMotherTree.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00046_OnceMoreInTheArmsOfTheMotherTree/Q00046_OnceMoreInTheArmsOfTheMotherTree.java
@@ -49,7 +49,7 @@ public class Q00046_OnceMoreInTheArmsOfTheMotherTree extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00047_IntoTheDarkElvenForest/Q00047_IntoTheDarkElvenForest.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00047_IntoTheDarkElvenForest/Q00047_IntoTheDarkElvenForest.java
index 2843d5074c..524c5928be 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00047_IntoTheDarkElvenForest/Q00047_IntoTheDarkElvenForest.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00047_IntoTheDarkElvenForest/Q00047_IntoTheDarkElvenForest.java
@@ -49,7 +49,7 @@ public class Q00047_IntoTheDarkElvenForest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00048_ToTheImmortalPlateau/Q00048_ToTheImmortalPlateau.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00048_ToTheImmortalPlateau/Q00048_ToTheImmortalPlateau.java
index 295aad188c..a81e001d19 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00048_ToTheImmortalPlateau/Q00048_ToTheImmortalPlateau.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00048_ToTheImmortalPlateau/Q00048_ToTheImmortalPlateau.java
@@ -49,7 +49,7 @@ public class Q00048_ToTheImmortalPlateau extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00049_TheRoadHome/Q00049_TheRoadHome.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00049_TheRoadHome/Q00049_TheRoadHome.java
index bd5282300f..48294749b1 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00049_TheRoadHome/Q00049_TheRoadHome.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00049_TheRoadHome/Q00049_TheRoadHome.java
@@ -49,7 +49,7 @@ public class Q00049_TheRoadHome extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java
index 3fb4bbf534..f1f9bd865e 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java
@@ -41,7 +41,7 @@ public class Q00050_LanoscosSpecialBait extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java
index d1f1738289..c37da4b044 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java
@@ -41,7 +41,7 @@ public class Q00051_OFullesSpecialBait extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java
index 6bfb6bda56..a3cd83571b 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java
@@ -41,7 +41,7 @@ public class Q00052_WilliesSpecialBait extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java
index 0a0e7eaf7b..5f8af90c0f 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java
@@ -41,7 +41,7 @@ public class Q00053_LinnaeusSpecialBait extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java
index cb6c4b0eba..aa00c69fcc 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java
@@ -58,7 +58,7 @@ public class Q00101_SwordOfSolidarity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java
index 98440e5e11..c23eea496e 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java
@@ -70,7 +70,7 @@ public class Q00102_SeaOfSporesFever extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java
index 96d10265f4..b0adc9afac 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java
@@ -65,7 +65,7 @@ public class Q00103_SpiritOfCraftsman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java
index 982beffefc..5e24a27559 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java
@@ -63,7 +63,7 @@ public class Q00104_SpiritOfMirrors extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java
index 44482f18b6..9a40319b4d 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java
@@ -69,7 +69,7 @@ public class Q00105_SkirmishWithOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java
index 939600c213..a011d6bc6b 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java
@@ -62,7 +62,7 @@ public class Q00106_ForgottenTruth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = player.getQuestState(getName());
 		final String htmltext = event;
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java
index 5821da8601..88d4611aab 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java
@@ -57,7 +57,7 @@ public class Q00107_MercilessPunishment extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = player.getQuestState(getName());
 		final String htmltext = event;
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java
index 8220ebf7a5..2eaf9e03a5 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java
@@ -88,7 +88,7 @@ public class Q00108_JumbleTumbleDiamondFuss extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = player.getQuestState(getName());
 		final String htmltext = event;
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
index 9d09f55bde..6c28298c1f 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
@@ -42,7 +42,7 @@ public class Q00109_InSearchOfTheNest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
index 591d0a3b1e..a7aa759137 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
@@ -39,7 +39,7 @@ public class Q00110_ToThePrimevalIsle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java
index 1701deb14f..2122f9a6cb 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java
@@ -73,7 +73,7 @@ public class Q00111_ElrokianHuntersProof extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00112_WalkOfFate/Q00112_WalkOfFate.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00112_WalkOfFate/Q00112_WalkOfFate.java
index ccfad7bcb2..53958ebc31 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00112_WalkOfFate/Q00112_WalkOfFate.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00112_WalkOfFate/Q00112_WalkOfFate.java
@@ -38,7 +38,7 @@ public class Q00112_WalkOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java
index 4d0f9df13e..0387fcadeb 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java
@@ -39,7 +39,7 @@ public class Q00113_StatusOfTheBeaconTower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState st = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java
index a3a06f8819..024108be13 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java
@@ -56,7 +56,7 @@ public class Q00114_ResurrectionOfAnOldManager extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
index 8a8888d6fa..61ed7aba46 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
@@ -53,7 +53,7 @@ public class Q00115_TheOtherSideOfTruth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00116_BeyondTheHillsOfWinter/Q00116_BeyondTheHillsOfWinter.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00116_BeyondTheHillsOfWinter/Q00116_BeyondTheHillsOfWinter.java
index 575e885acf..7453839403 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00116_BeyondTheHillsOfWinter/Q00116_BeyondTheHillsOfWinter.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00116_BeyondTheHillsOfWinter/Q00116_BeyondTheHillsOfWinter.java
@@ -45,7 +45,7 @@ public class Q00116_BeyondTheHillsOfWinter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00117_TheOceanOfDistantStars/Q00117_TheOceanOfDistantStars.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00117_TheOceanOfDistantStars/Q00117_TheOceanOfDistantStars.java
index 33635c2524..3c488d780b 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00117_TheOceanOfDistantStars/Q00117_TheOceanOfDistantStars.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00117_TheOceanOfDistantStars/Q00117_TheOceanOfDistantStars.java
@@ -49,7 +49,7 @@ public class Q00117_TheOceanOfDistantStars extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00118_ToLeadAndBeLed/Q00118_ToLeadAndBeLed.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00118_ToLeadAndBeLed/Q00118_ToLeadAndBeLed.java
index e1a0d56357..8caf1b7ac5 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00118_ToLeadAndBeLed/Q00118_ToLeadAndBeLed.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00118_ToLeadAndBeLed/Q00118_ToLeadAndBeLed.java
@@ -70,7 +70,7 @@ public class Q00118_ToLeadAndBeLed extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		// Manage Sponsor's quest events.
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
index 3a1ea6e91b..9c9f431c9e 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
@@ -39,7 +39,7 @@ public class Q00119_LastImperialPrince extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00120_PavelsLastResearch/Q00120_PavelsLastResearch.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00120_PavelsLastResearch/Q00120_PavelsLastResearch.java
index 55eec858df..da129ae362 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00120_PavelsLastResearch/Q00120_PavelsLastResearch.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00120_PavelsLastResearch/Q00120_PavelsLastResearch.java
@@ -58,7 +58,7 @@ public class Q00120_PavelsLastResearch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java
index 7221ed6fba..7b252ab919 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java
@@ -36,7 +36,7 @@ public class Q00121_PavelTheGiant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java
index 9c2c8d29af..5de5e26a90 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java
@@ -36,7 +36,7 @@ public class Q00122_OminousNews extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00123_TheLeaderAndTheFollower/Q00123_TheLeaderAndTheFollower.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00123_TheLeaderAndTheFollower/Q00123_TheLeaderAndTheFollower.java
index 0b352174aa..40c7a60629 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00123_TheLeaderAndTheFollower/Q00123_TheLeaderAndTheFollower.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00123_TheLeaderAndTheFollower/Q00123_TheLeaderAndTheFollower.java
@@ -68,7 +68,7 @@ public class Q00123_TheLeaderAndTheFollower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		// Manage Sponsor's quest events.
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
index 97b982af69..616228a712 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
@@ -39,7 +39,7 @@ public class Q00124_MeetingTheElroki extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
index 9a4b0f79db..19acf27977 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
@@ -68,7 +68,7 @@ public class Q00125_TheNameOfEvil1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
index f4c160757c..c7e853a1d7 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
@@ -44,7 +44,7 @@ public class Q00126_TheNameOfEvil2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00127_KamaelAWindowToTheFuture/Q00127_KamaelAWindowToTheFuture.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00127_KamaelAWindowToTheFuture/Q00127_KamaelAWindowToTheFuture.java
index 6798035991..a6eafc3043 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00127_KamaelAWindowToTheFuture/Q00127_KamaelAWindowToTheFuture.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00127_KamaelAWindowToTheFuture/Q00127_KamaelAWindowToTheFuture.java
@@ -50,7 +50,7 @@ public class Q00127_KamaelAWindowToTheFuture extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState st = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java
index fcd77c5331..092fb9befc 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java
@@ -41,7 +41,7 @@ public class Q00151_CureForFever extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java
index acdde2c689..a1ccd1199b 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java
@@ -48,7 +48,7 @@ public class Q00152_ShardsOfGolem extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java
index 19c8b3c4d9..350f2244f3 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java
@@ -51,7 +51,7 @@ public class Q00153_DeliverGoods extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java
index fbf12a075d..dbef4c8788 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java
@@ -45,7 +45,7 @@ public class Q00154_SacrificeToTheSea extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java
index d3b24eb465..611418249b 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java
@@ -40,7 +40,7 @@ public class Q00155_FindSirWindawood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java
index e11cb50be0..6a2996500a 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java
@@ -40,7 +40,7 @@ public class Q00156_MillenniumLove extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java
index 5ef3dd4e20..8c875c17f8 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java
@@ -40,7 +40,7 @@ public class Q00157_RecoverSmuggledGoods extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java
index 6ef008543a..5481fe869a 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java
@@ -41,7 +41,7 @@ public class Q00158_SeedOfEvil extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java
index 2d64576cdc..e784810ef1 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java
@@ -41,7 +41,7 @@ public class Q00159_ProtectTheWaterSource extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java
index 34f5318396..f656503498 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java
@@ -47,7 +47,7 @@ public class Q00160_NerupasRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java
index d4a75b300d..2106be167e 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java
@@ -41,7 +41,7 @@ public class Q00161_FruitOfTheMotherTree extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java
index c83ee2ee20..397a3a285f 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java
@@ -58,7 +58,7 @@ public class Q00162_CurseOfTheUndergroundFortress extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java
index a271c0455f..d0c5f9c437 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java
@@ -56,7 +56,7 @@ public class Q00163_LegacyOfThePoet extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java
index a894c04b1b..9d71b64c3e 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java
@@ -40,7 +40,7 @@ public class Q00164_BloodFiend extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java
index f6dc827e5d..645b5f35e8 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java
@@ -52,7 +52,7 @@ public class Q00165_ShilensHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java
index 9a30057914..64ca29022f 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java
@@ -46,7 +46,7 @@ public class Q00166_MassOfDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java
index 687b8a2fa1..250c6c34a4 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java
@@ -41,7 +41,7 @@ public class Q00167_DwarvenKinship extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java
index 02d711dd30..8b24454abb 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java
@@ -46,7 +46,7 @@ public class Q00168_DeliverSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java
index ba22df803f..20fa7e54ed 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java
@@ -41,7 +41,7 @@ public class Q00169_OffspringOfNightmares extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java
index fd0b07889d..5c5f7c218c 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java
@@ -40,7 +40,7 @@ public class Q00170_DangerousSeduction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00171_ActsOfEvil/Q00171_ActsOfEvil.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00171_ActsOfEvil/Q00171_ActsOfEvil.java
index 3ba5374a9e..272459bb22 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00171_ActsOfEvil/Q00171_ActsOfEvil.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00171_ActsOfEvil/Q00171_ActsOfEvil.java
@@ -67,7 +67,7 @@ public class Q00171_ActsOfEvil extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
index 5307ecf795..6191362a2d 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
@@ -67,7 +67,7 @@ public class Q00211_TrialOfTheChallenger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
index 2269dfa65f..3c68e4cff5 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
@@ -65,7 +65,7 @@ public class Q00212_TrialOfDuty extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
index ae5fc63751..7d16c04697 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
@@ -85,7 +85,7 @@ public class Q00213_TrialOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
index a3a8656ac5..5e2a42645a 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
@@ -113,7 +113,7 @@ public class Q00214_TrialOfTheScholar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
index 9f531dab50..5c4a11ac2f 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
@@ -70,7 +70,7 @@ public class Q00215_TrialOfThePilgrim extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
index 4584577a39..6ac987111c 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
@@ -85,7 +85,7 @@ public class Q00216_TrialOfTheGuildsman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
index 2ad05d813a..d4de2d4b70 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
@@ -99,7 +99,7 @@ public class Q00217_TestimonyOfTrust extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
index 79e23baff3..def85bcdd1 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
@@ -86,7 +86,7 @@ public class Q00218_TestimonyOfLife extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
index b531dfde8e..ea1fe2eb09 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
@@ -116,7 +116,7 @@ public class Q00219_TestimonyOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
index d4616c3ac2..3aa8dd0182 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
@@ -114,7 +114,7 @@ public class Q00220_TestimonyOfGlory extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
index 2010e41184..fc25572efa 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
@@ -117,7 +117,7 @@ public class Q00221_TestimonyOfProsperity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
index 1b84b140a4..a2ea88c16f 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
@@ -81,7 +81,7 @@ public class Q00222_TestOfTheDuelist extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
index 4902b64882..84e6da1458 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
@@ -81,7 +81,7 @@ public class Q00223_TestOfTheChampion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
index 077937bc96..f6a761a671 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
@@ -88,7 +88,7 @@ public class Q00224_TestOfSagittarius extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
index 65a39b2684..ee239722e6 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
@@ -86,7 +86,7 @@ public class Q00225_TestOfTheSearcher extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
index 27da047424..80c33248f4 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
@@ -77,7 +77,7 @@ public class Q00226_TestOfTheHealer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
index c65713a750..e26d7c8246 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
@@ -97,7 +97,7 @@ public class Q00227_TestOfTheReformer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
index ec2c570f73..875d8f63a4 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
@@ -90,7 +90,7 @@ public class Q00228_TestOfMagus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
index be53465986..23c1b77cd6 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
@@ -103,7 +103,7 @@ public class Q00229_TestOfWitchcraft extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
index 14318ab76a..c0c6f5f1c4 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
@@ -155,7 +155,7 @@ public class Q00230_TestOfTheSummoner extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = player.getQuestState(getName());
 		if (st == null)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
index fe2a136a31..4ae4f0abfe 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
@@ -76,7 +76,7 @@ public class Q00231_TestOfTheMaestro extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
index 81cbaded82..28fc7b0597 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
@@ -85,7 +85,7 @@ public class Q00232_TestOfTheLord extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
index ae66bd66d8..553f1f5f75 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
@@ -99,7 +99,7 @@ public class Q00233_TestOfTheWarSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00234_FatesWhisper/Q00234_FatesWhisper.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00234_FatesWhisper/Q00234_FatesWhisper.java
index 55ff14bdef..c0ae50b6ab 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00234_FatesWhisper/Q00234_FatesWhisper.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00234_FatesWhisper/Q00234_FatesWhisper.java
@@ -84,7 +84,7 @@ public class Q00234_FatesWhisper extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java
index 8e307ff45e..5dae3aff00 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java
@@ -51,7 +51,7 @@ public class Q00235_MimirsElixir extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00241_PossessorOfAPreciousSoul1/Q00241_PossessorOfAPreciousSoul1.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00241_PossessorOfAPreciousSoul1/Q00241_PossessorOfAPreciousSoul1.java
index 872215e1d9..c47b8bcb41 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00241_PossessorOfAPreciousSoul1/Q00241_PossessorOfAPreciousSoul1.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00241_PossessorOfAPreciousSoul1/Q00241_PossessorOfAPreciousSoul1.java
@@ -83,7 +83,7 @@ public class Q00241_PossessorOfAPreciousSoul1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00242_PossessorOfAPreciousSoul2/Q00242_PossessorOfAPreciousSoul2.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00242_PossessorOfAPreciousSoul2/Q00242_PossessorOfAPreciousSoul2.java
index 7c4c58c2df..c8a959c411 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00242_PossessorOfAPreciousSoul2/Q00242_PossessorOfAPreciousSoul2.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00242_PossessorOfAPreciousSoul2/Q00242_PossessorOfAPreciousSoul2.java
@@ -58,7 +58,7 @@ public class Q00242_PossessorOfAPreciousSoul2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/Q00246_PossessorOfAPreciousSoul3.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/Q00246_PossessorOfAPreciousSoul3.java
index 77e9d9d090..fcb351fc35 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/Q00246_PossessorOfAPreciousSoul3.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/Q00246_PossessorOfAPreciousSoul3.java
@@ -63,7 +63,7 @@ public class Q00246_PossessorOfAPreciousSoul3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java
index d0f17c69c2..ce598cfed9 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java
@@ -40,7 +40,7 @@ public class Q00247_PossessorOfAPreciousSoul4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
index cb45e96162..dee2911193 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
@@ -159,7 +159,7 @@ public class Q00255_Tutorial extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (Config.DISABLE_TUTORIAL)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
index 92140228f8..4cddf3b90b 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
@@ -48,7 +48,7 @@ public class Q00257_TheGuardIsBusy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
index 30f60779d4..099c2a6f56 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
@@ -44,7 +44,7 @@ public class Q00258_BringWolfPelts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
index 37a20c2d84..38b968ff65 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
@@ -50,7 +50,7 @@ public class Q00259_RequestFromTheFarmOwner extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
index 8b8203fac4..af132f0132 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
@@ -55,7 +55,7 @@ public class Q00260_OrcHunting extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
index 279b1e99c4..7580da1e87 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
@@ -38,7 +38,7 @@ public class Q00261_CollectorsDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
index 59885a0276..78e52e23ad 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
@@ -38,7 +38,7 @@ public class Q00262_TradeWithTheIvoryTower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
index 672ca9d1f7..a37e97f43b 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
@@ -41,7 +41,7 @@ public class Q00263_OrcSubjugation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
index 198a2ddf3c..2051d66775 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
@@ -45,7 +45,7 @@ public class Q00264_KeenClaws extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
index f3d13be98d..345747514b 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
@@ -45,7 +45,7 @@ public class Q00265_BondsOfSlavery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
index f24aba862d..0b54e36964 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
@@ -44,7 +44,7 @@ public class Q00266_PleasOfPixies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
index 7107f1e417..0cd3f6eb5e 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
@@ -42,7 +42,7 @@ public class Q00267_WrathOfVerdure extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
index 428875524d..136eaa1e24 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
@@ -42,7 +42,7 @@ public class Q00271_ProofOfValor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
index bb56be886e..b868648957 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
@@ -39,7 +39,7 @@ public class Q00272_WrathOfAncestors extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
index 3604f0ed4c..8dc3b441e4 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
@@ -44,7 +44,7 @@ public class Q00273_InvadersOfTheHolyLand extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
index 71f0e48a95..d6e36b38cd 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
@@ -43,7 +43,7 @@ public class Q00274_SkirmishWithTheWerewolves extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = player.getQuestState(getName());
 		final String htmltext = event;
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
index 5b914eba2f..14bad6a84a 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
@@ -43,7 +43,7 @@ public class Q00275_DarkWingedSpies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
index a867b592a2..b3376ed064 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
@@ -43,7 +43,7 @@ public class Q00276_TotemOfTheHestui extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
index 9067a6a874..770f98dcdc 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
@@ -39,7 +39,7 @@ public class Q00277_GatekeepersOffering extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java
index a1595dc6a9..2ecbf86cc1 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java
@@ -44,7 +44,7 @@ public class Q00291_RevengeOfTheRedbonnet extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
index 66357e80c1..b29d456279 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
@@ -53,7 +53,7 @@ public class Q00292_BrigandsSweep extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
index 0553ec1b63..fcee5b8adb 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
@@ -52,7 +52,7 @@ public class Q00293_TheHiddenVeins extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
index e13faf4f7c..5ba87dcaba 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
@@ -41,7 +41,7 @@ public class Q00294_CovertBusiness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
index 724d5789fa..c8e239b240 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
@@ -40,7 +40,7 @@ public class Q00295_DreamingOfTheSkies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
index 40e6804e92..7a07c18847 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
@@ -46,7 +46,7 @@ public class Q00296_TarantulasSpiderSilk extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
index 140ed73f53..5452acbac8 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
@@ -40,7 +40,7 @@ public class Q00297_GatekeepersFavor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00298_LizardmensConspiracy/Q00298_LizardmensConspiracy.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00298_LizardmensConspiracy/Q00298_LizardmensConspiracy.java
index d82318aa5c..009a0c8387 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00298_LizardmensConspiracy/Q00298_LizardmensConspiracy.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00298_LizardmensConspiracy/Q00298_LizardmensConspiracy.java
@@ -43,7 +43,7 @@ public class Q00298_LizardmensConspiracy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00299_GatherIngredientsForPie/Q00299_GatherIngredientsForPie.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00299_GatherIngredientsForPie/Q00299_GatherIngredientsForPie.java
index f971b729d6..d014f06743 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00299_GatherIngredientsForPie/Q00299_GatherIngredientsForPie.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00299_GatherIngredientsForPie/Q00299_GatherIngredientsForPie.java
@@ -46,7 +46,7 @@ public class Q00299_GatherIngredientsForPie extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
index 6bb280e539..18c95ba7be 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
@@ -57,7 +57,7 @@ public class Q00300_HuntingLetoLizardman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
index 835d3a80eb..1b9bd8b13d 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
@@ -38,7 +38,7 @@ public class Q00303_CollectArrowheads extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
index 41dc44e6d7..95167a0527 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
@@ -52,7 +52,7 @@ public class Q00306_CrystalOfFireAndIce extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
index 966827a579..a01aa6fbdd 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
@@ -38,7 +38,7 @@ public class Q00313_CollectSpores extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
index bb35f94253..aa6cc0b7ef 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
@@ -45,7 +45,7 @@ public class Q00316_DestroyPlagueCarriers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
index e5ede363bd..0980d21a6d 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
@@ -39,7 +39,7 @@ public class Q00317_CatchTheWind extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
index f4c9452bd4..6604bcef09 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
@@ -38,7 +38,7 @@ public class Q00319_ScentOfDeath extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
index 2081d65387..49797cd3bb 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
@@ -39,7 +39,7 @@ public class Q00320_BonesTellTheFuture extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
index c369978c15..fe3745a8e6 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
@@ -49,7 +49,7 @@ public class Q00324_SweetestVenom extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
index b3821fd0fd..9ba5f87b94 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
@@ -72,7 +72,7 @@ public class Q00325_GrimCollector extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
index f1d4d1bb69..02f1f76d92 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
@@ -42,7 +42,7 @@ public class Q00326_VanquishRemnants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
index c3785a9466..cb43fb00d3 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
@@ -96,7 +96,7 @@ public class Q00327_RecoverTheFarmland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
index e2fcf3686c..34562997ef 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
@@ -54,7 +54,7 @@ public class Q00328_SenseForBusiness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
index 0e8e192284..12ff64b9d9 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
@@ -38,7 +38,7 @@ public class Q00329_CuriosityOfADwarf extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00330_AdeptOfTaste/Q00330_AdeptOfTaste.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00330_AdeptOfTaste/Q00330_AdeptOfTaste.java
index 5f47b580d7..4f830c62be 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00330_AdeptOfTaste/Q00330_AdeptOfTaste.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00330_AdeptOfTaste/Q00330_AdeptOfTaste.java
@@ -97,7 +97,7 @@ public class Q00330_AdeptOfTaste extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
index 28bf997650..604738dbfd 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
@@ -40,7 +40,7 @@ public class Q00331_ArrowOfVengeance extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
index 454bcbf5c0..5e0171f19f 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
@@ -122,7 +122,7 @@ public class Q00333_HuntOfTheBlackLion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00334_TheWishingPotion/Q00334_TheWishingPotion.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00334_TheWishingPotion/Q00334_TheWishingPotion.java
index 1781e5476e..82f51630e2 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00334_TheWishingPotion/Q00334_TheWishingPotion.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00334_TheWishingPotion/Q00334_TheWishingPotion.java
@@ -112,7 +112,7 @@ public class Q00334_TheWishingPotion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java
index b4511f78bd..32da8c5854 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java
@@ -399,7 +399,7 @@ public class Q00335_TheSongOfTheHunter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = player.getQuestState(getName());
 		if (st == null)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java
index 127fcea53e..1fafa626e7 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java
@@ -145,7 +145,7 @@ public class Q00336_CoinsOfMagic extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
index 34a340958b..70f0b0e2af 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
@@ -113,7 +113,7 @@ public class Q00337_AudienceWithTheLandDragon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java
index 174c5ea0a6..22673c9cae 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java
@@ -38,7 +38,7 @@ public class Q00338_AlligatorHunter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/Q00340_SubjugationOfLizardmen.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/Q00340_SubjugationOfLizardmen.java
index 06ac3bcacf..c86c294b96 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/Q00340_SubjugationOfLizardmen.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/Q00340_SubjugationOfLizardmen.java
@@ -46,7 +46,7 @@ public class Q00340_SubjugationOfLizardmen extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java
index 26c64cb86b..878e4752df 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java
@@ -50,7 +50,7 @@ public class Q00341_HuntingForWildBeasts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00343_UnderTheShadowOfTheIvoryTower/Q00343_UnderTheShadowOfTheIvoryTower.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00343_UnderTheShadowOfTheIvoryTower/Q00343_UnderTheShadowOfTheIvoryTower.java
index e806d1f6b1..594291fe92 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00343_UnderTheShadowOfTheIvoryTower/Q00343_UnderTheShadowOfTheIvoryTower.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00343_UnderTheShadowOfTheIvoryTower/Q00343_UnderTheShadowOfTheIvoryTower.java
@@ -68,7 +68,7 @@ public class Q00343_UnderTheShadowOfTheIvoryTower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
index 0cd6d703a8..c9121466bd 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
@@ -66,7 +66,7 @@ public class Q00344_1000YearsTheEndOfLamentation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00345_MethodToRaiseTheDead/Q00345_MethodToRaiseTheDead.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00345_MethodToRaiseTheDead/Q00345_MethodToRaiseTheDead.java
index 74a7b6571f..8a367739ef 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00345_MethodToRaiseTheDead/Q00345_MethodToRaiseTheDead.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00345_MethodToRaiseTheDead/Q00345_MethodToRaiseTheDead.java
@@ -52,7 +52,7 @@ public class Q00345_MethodToRaiseTheDead extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00347_GoGetTheCalculator/Q00347_GoGetTheCalculator.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00347_GoGetTheCalculator/Q00347_GoGetTheCalculator.java
index ad0fac211d..d54b1dae23 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00347_GoGetTheCalculator/Q00347_GoGetTheCalculator.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00347_GoGetTheCalculator/Q00347_GoGetTheCalculator.java
@@ -45,7 +45,7 @@ public class Q00347_GoGetTheCalculator extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java
index bd562a48dd..3c0493316a 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java
@@ -82,7 +82,7 @@ public class Q00348_AnArrogantSearch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java
index bd5eee4b73..15223e15ab 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java
@@ -149,7 +149,7 @@ public class Q00350_EnhanceYourWeapon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00351_BlackSwan/Q00351_BlackSwan.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00351_BlackSwan/Q00351_BlackSwan.java
index 379cfefb46..96dee839c7 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00351_BlackSwan/Q00351_BlackSwan.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00351_BlackSwan/Q00351_BlackSwan.java
@@ -45,7 +45,7 @@ public class Q00351_BlackSwan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00352_HelpRoodRaiseANewPet/Q00352_HelpRoodRaiseANewPet.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00352_HelpRoodRaiseANewPet/Q00352_HelpRoodRaiseANewPet.java
index e80b8c816b..f2f571246f 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00352_HelpRoodRaiseANewPet/Q00352_HelpRoodRaiseANewPet.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00352_HelpRoodRaiseANewPet/Q00352_HelpRoodRaiseANewPet.java
@@ -39,7 +39,7 @@ public class Q00352_HelpRoodRaiseANewPet extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00353_PowerOfDarkness/Q00353_PowerOfDarkness.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00353_PowerOfDarkness/Q00353_PowerOfDarkness.java
index 5405b5a5a2..49133bd409 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00353_PowerOfDarkness/Q00353_PowerOfDarkness.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00353_PowerOfDarkness/Q00353_PowerOfDarkness.java
@@ -38,7 +38,7 @@ public class Q00353_PowerOfDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
index fd47e99a77..d2b1c3468b 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
@@ -71,7 +71,7 @@ public class Q00354_ConquestOfAlligatorIsland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
index be26435568..4d7e9ae9c5 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
@@ -86,7 +86,7 @@ public class Q00355_FamilyHonor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
index b09fd5075d..9739174965 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
@@ -42,7 +42,7 @@ public class Q00356_DigUpTheSeaOfSpores extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00357_WarehouseKeepersAmbition/Q00357_WarehouseKeepersAmbition.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00357_WarehouseKeepersAmbition/Q00357_WarehouseKeepersAmbition.java
index 911a0f9c46..c7bbfbcb08 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00357_WarehouseKeepersAmbition/Q00357_WarehouseKeepersAmbition.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00357_WarehouseKeepersAmbition/Q00357_WarehouseKeepersAmbition.java
@@ -54,7 +54,7 @@ public class Q00357_WarehouseKeepersAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
index cc2faffdbc..bd58be9ffc 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
@@ -50,7 +50,7 @@ public class Q00358_IllegitimateChildOfTheGoddess extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/Q00359_ForASleeplessDeadman.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/Q00359_ForASleeplessDeadman.java
index d76ffffe91..373b29ba9d 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/Q00359_ForASleeplessDeadman.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/Q00359_ForASleeplessDeadman.java
@@ -65,7 +65,7 @@ public class Q00359_ForASleeplessDeadman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
index 669caabc4d..52af79413c 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
@@ -52,7 +52,7 @@ public class Q00360_PlunderTheirSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState st = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00362_BardsMandolin/Q00362_BardsMandolin.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00362_BardsMandolin/Q00362_BardsMandolin.java
index 47adcd724c..4a5e17efd9 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00362_BardsMandolin/Q00362_BardsMandolin.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00362_BardsMandolin/Q00362_BardsMandolin.java
@@ -43,7 +43,7 @@ public class Q00362_BardsMandolin extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/Q00363_SorrowfulSoundOfFlute.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/Q00363_SorrowfulSoundOfFlute.java
index d787363ff7..50be8fc6d2 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/Q00363_SorrowfulSoundOfFlute.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/Q00363_SorrowfulSoundOfFlute.java
@@ -49,7 +49,7 @@ public class Q00363_SorrowfulSoundOfFlute extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00364_JovialAccordion/Q00364_JovialAccordion.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00364_JovialAccordion/Q00364_JovialAccordion.java
index a3bfbc2fa5..c27cdd5915 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00364_JovialAccordion/Q00364_JovialAccordion.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00364_JovialAccordion/Q00364_JovialAccordion.java
@@ -48,7 +48,7 @@ public class Q00364_JovialAccordion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00365_DevilsLegacy/Q00365_DevilsLegacy.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00365_DevilsLegacy/Q00365_DevilsLegacy.java
index b5eac54cd5..3462b2f993 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00365_DevilsLegacy/Q00365_DevilsLegacy.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00365_DevilsLegacy/Q00365_DevilsLegacy.java
@@ -42,7 +42,7 @@ public class Q00365_DevilsLegacy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00366_SilverHairedShaman/Q00366_SilverHairedShaman.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00366_SilverHairedShaman/Q00366_SilverHairedShaman.java
index 06828fb937..2724814c9b 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00366_SilverHairedShaman/Q00366_SilverHairedShaman.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00366_SilverHairedShaman/Q00366_SilverHairedShaman.java
@@ -50,7 +50,7 @@ public class Q00366_SilverHairedShaman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00367_ElectrifyingRecharge/Q00367_ElectrifyingRecharge.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00367_ElectrifyingRecharge/Q00367_ElectrifyingRecharge.java
index 9d2e2621dc..96134d163d 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00367_ElectrifyingRecharge/Q00367_ElectrifyingRecharge.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00367_ElectrifyingRecharge/Q00367_ElectrifyingRecharge.java
@@ -64,7 +64,7 @@ public class Q00367_ElectrifyingRecharge extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00368_TrespassingIntoTheHolyGround/Q00368_TrespassingIntoTheHolyGround.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00368_TrespassingIntoTheHolyGround/Q00368_TrespassingIntoTheHolyGround.java
index 943693578b..96fa8aa862 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00368_TrespassingIntoTheHolyGround/Q00368_TrespassingIntoTheHolyGround.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00368_TrespassingIntoTheHolyGround/Q00368_TrespassingIntoTheHolyGround.java
@@ -52,7 +52,7 @@ public class Q00368_TrespassingIntoTheHolyGround extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
index ac5006df40..249063d1e4 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
@@ -58,7 +58,7 @@ public class Q00369_CollectorOfJewels extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
index 451e92a2dc..a7b8267e7c 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
@@ -57,7 +57,7 @@ public class Q00370_AnElderSowsSeeds extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java
index 140e7b4837..d2a2919d1c 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java
@@ -76,7 +76,7 @@ public class Q00371_ShrieksOfGhosts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00372_LegacyOfInsolence/Q00372_LegacyOfInsolence.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00372_LegacyOfInsolence/Q00372_LegacyOfInsolence.java
index d7d7da7a92..01ad127bd3 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00372_LegacyOfInsolence/Q00372_LegacyOfInsolence.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00372_LegacyOfInsolence/Q00372_LegacyOfInsolence.java
@@ -79,7 +79,7 @@ public class Q00372_LegacyOfInsolence extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java
index 04b27a69ef..3044722438 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java
@@ -144,7 +144,7 @@ public class Q00373_SupplierOfReagents extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java
index fa0a8f40b1..de05a2ed39 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java
@@ -59,7 +59,7 @@ public class Q00374_WhisperOfDreamsPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java
index 92d2258627..4d78918819 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java
@@ -53,7 +53,7 @@ public class Q00375_WhisperOfDreamsPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java
index 45163414eb..728dbb3924 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java
@@ -73,7 +73,7 @@ public class Q00376_ExplorationOfTheGiantsCavePart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java
index 4db552bf24..aa24b3545f 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java
@@ -56,7 +56,7 @@ public class Q00377_ExplorationOfTheGiantsCavePart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00378_GrandFeast/Q00378_GrandFeast.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00378_GrandFeast/Q00378_GrandFeast.java
index 23effcbff8..f786415605 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00378_GrandFeast/Q00378_GrandFeast.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00378_GrandFeast/Q00378_GrandFeast.java
@@ -63,7 +63,7 @@ public class Q00378_GrandFeast extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00379_FantasyWine/Q00379_FantasyWine.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00379_FantasyWine/Q00379_FantasyWine.java
index b0ddd6201d..68676f9268 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00379_FantasyWine/Q00379_FantasyWine.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00379_FantasyWine/Q00379_FantasyWine.java
@@ -44,7 +44,7 @@ public class Q00379_FantasyWine extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00380_BringOutTheFlavorOfIngredients/Q00380_BringOutTheFlavorOfIngredients.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00380_BringOutTheFlavorOfIngredients/Q00380_BringOutTheFlavorOfIngredients.java
index c8dfb67e20..eabb1407dd 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00380_BringOutTheFlavorOfIngredients/Q00380_BringOutTheFlavorOfIngredients.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00380_BringOutTheFlavorOfIngredients/Q00380_BringOutTheFlavorOfIngredients.java
@@ -48,7 +48,7 @@ public class Q00380_BringOutTheFlavorOfIngredients extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java
index 95b77864e4..3c5e7ed6a1 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java
@@ -46,7 +46,7 @@ public class Q00381_LetsBecomeARoyalMember extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00382_KailsMagicCoin/Q00382_KailsMagicCoin.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00382_KailsMagicCoin/Q00382_KailsMagicCoin.java
index 48c6e7d4b5..5e8d2bfaa5 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00382_KailsMagicCoin/Q00382_KailsMagicCoin.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00382_KailsMagicCoin/Q00382_KailsMagicCoin.java
@@ -46,7 +46,7 @@ public class Q00382_KailsMagicCoin extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00383_TreasureHunt/Q00383_TreasureHunt.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00383_TreasureHunt/Q00383_TreasureHunt.java
index 0572d80de1..f0a44dd79b 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00383_TreasureHunt/Q00383_TreasureHunt.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00383_TreasureHunt/Q00383_TreasureHunt.java
@@ -39,7 +39,7 @@ public class Q00383_TreasureHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java
index fb04492f02..6b72e4a8d3 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java
@@ -137,7 +137,7 @@ public class Q00384_WarehouseKeepersPastime extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null))
@@ -332,7 +332,7 @@ public class Q00384_WarehouseKeepersPastime extends Quest
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private String takeHtml(Player player, QuestState qs, int num, int npcId)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00385_YokeOfThePast/Q00385_YokeOfThePast.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00385_YokeOfThePast/Q00385_YokeOfThePast.java
index 16b3e3c204..e3aafcf356 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00385_YokeOfThePast/Q00385_YokeOfThePast.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00385_YokeOfThePast/Q00385_YokeOfThePast.java
@@ -122,7 +122,7 @@ public class Q00385_YokeOfThePast extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
index 52d23ae640..33309a5251 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
@@ -134,7 +134,7 @@ public class Q00386_StolenDignity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (npc.getId() == WAREHOUSE_KEEPER_ROMP))
@@ -269,7 +269,7 @@ public class Q00386_StolenDignity extends Quest
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private String takeHtml(Player player, QuestState qs, int num)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
index 2ab4d79329..93adcc8447 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
@@ -51,7 +51,7 @@ public class Q00401_PathOfTheWarrior extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
index a3ec2311df..74dca4054f 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
@@ -69,7 +69,7 @@ public class Q00402_PathOfTheHumanKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
index 76e47dc423..3c5e6d021b 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
@@ -54,7 +54,7 @@ public class Q00403_PathOfTheRogue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
index 5653461268..7fb9acf31f 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
@@ -59,7 +59,7 @@ public class Q00404_PathOfTheHumanWizard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
index 84b2825948..4def764e78 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
@@ -58,7 +58,7 @@ public class Q00405_PathOfTheCleric extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
index acd4c05424..684722b15b 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
@@ -48,7 +48,7 @@ public class Q00406_PathOfTheElvenKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
index f1afb1022a..00e46fcdfe 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
@@ -55,7 +55,7 @@ public class Q00407_PathOfTheElvenScout extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
index 845fddac63..4657beb9df 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
@@ -58,7 +58,7 @@ public class Q00408_PathOfTheElvenWizard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
index 3c21bb4d25..f5c7d04a51 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
@@ -49,7 +49,7 @@ public class Q00409_PathOfTheElvenOracle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
index 32a80fa6fc..765c7d6203 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
@@ -54,7 +54,7 @@ public class Q00410_PathOfThePalusKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
index ce8dd67f9c..72c35c8340 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
@@ -50,7 +50,7 @@ public class Q00411_PathOfTheAssassin extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
index e0cb66987e..08c6281f1c 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
@@ -56,7 +56,7 @@ public class Q00412_PathOfTheDarkWizard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
index 36ff734a60..99d17ff368 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
@@ -52,7 +52,7 @@ public class Q00413_PathOfTheShillienOracle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
index 66c91344f0..21dc83bf4e 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
@@ -56,7 +56,7 @@ public class Q00414_PathOfTheOrcRaider extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
index 86e2475706..4f47f04b74 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
@@ -73,7 +73,7 @@ public class Q00415_PathOfTheOrcMonk extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
index de562df6e3..0ec40d405f 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
@@ -73,7 +73,7 @@ public class Q00416_PathOfTheOrcShaman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
index b698e29294..fa06a95c9c 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
@@ -72,7 +72,7 @@ public class Q00417_PathOfTheScavenger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
index b63aa44cfa..edcdab6965 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
@@ -57,7 +57,7 @@ public class Q00418_PathOfTheArtisan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00419_GetAPet/Q00419_GetAPet.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00419_GetAPet/Q00419_GetAPet.java
index 827ab2111c..f3712a6703 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00419_GetAPet/Q00419_GetAPet.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00419_GetAPet/Q00419_GetAPet.java
@@ -80,7 +80,7 @@ public class Q00419_GetAPet extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
index 49a1b6f64d..5e992cb377 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
@@ -89,7 +89,7 @@ public class Q00420_LittleWing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
index f94314e452..af26f7241e 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
@@ -60,7 +60,7 @@ public class Q00421_LittleWingsBigAdventure extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java
index 1a55288f55..07ce8241da 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java
@@ -58,7 +58,7 @@ public class Q00422_RepentYourSins extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java
index f6b0c9f367..722f25a787 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java
@@ -315,7 +315,7 @@ public class Q00426_QuestForFishingShot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java
index 7f86fa0428..98068dd50f 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java
@@ -42,7 +42,7 @@ public class Q00431_WeddingMarch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java
index 1e911d91fb..e28824832c 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java
@@ -40,7 +40,7 @@ public class Q00432_BirthdayPartySong extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java
index e429e7285e..292d1f0fa5 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java
@@ -123,7 +123,7 @@ public class Q00501_ProofOfClanAlliance extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java
index 3db58e5ef6..7821595009 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java
@@ -106,7 +106,7 @@ public class Q00503_PursuitOfClanAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java
index c13afc24f5..436aa5732d 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java
@@ -64,7 +64,7 @@ public class Q00504_CompetitionForTheBanditStronghold extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
index 0a78c768c2..cf6f5371c3 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
@@ -79,7 +79,7 @@ public class Q00508_AClansReputation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
index 70ce194ce0..2d70609b98 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
@@ -75,7 +75,7 @@ public class Q00509_AClansFame extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
index 2be8d8ff42..da794e5d5c 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
@@ -46,7 +46,7 @@ public class Q00510_AClansPrestige extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java
index e48ef7d9e3..00a2a728f6 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java
@@ -48,7 +48,7 @@ public class Q00601_WatchingEyes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java
index ff132b61ff..7d71d2e7da 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java
@@ -46,7 +46,7 @@ public class Q00602_ShadowOfLight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00603_DaimonTheWhiteEyedPart1/Q00603_DaimonTheWhiteEyedPart1.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00603_DaimonTheWhiteEyedPart1/Q00603_DaimonTheWhiteEyedPart1.java
index 87bdb6220f..b6ca9ad115 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00603_DaimonTheWhiteEyedPart1/Q00603_DaimonTheWhiteEyedPart1.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00603_DaimonTheWhiteEyedPart1/Q00603_DaimonTheWhiteEyedPart1.java
@@ -62,7 +62,7 @@ public class Q00603_DaimonTheWhiteEyedPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java
index fbca15fd0e..26a50bd354 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java
@@ -69,7 +69,7 @@ public class Q00604_DaimonTheWhiteEyedPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("DESPAWN".equals(event))
 		{
@@ -78,7 +78,7 @@ public class Q00604_DaimonTheWhiteEyedPart2 extends Quest
 				npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getTemplate().getDisplayId(), NpcStringId.CAN_LIGHT_EXIST_WITHOUT_DARKNESS));
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java
index 4586ac7d0b..ea2947694f 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java
@@ -189,7 +189,7 @@ public class Q00605_AllianceWithKetraOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java
index 959228be25..5c1a23e6d1 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java
@@ -71,7 +71,7 @@ public class Q00606_BattleAgainstVarkaSilenos extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00607_ProveYourCourageKetra/Q00607_ProveYourCourageKetra.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00607_ProveYourCourageKetra/Q00607_ProveYourCourageKetra.java
index 15eba2362e..4bcf994e80 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00607_ProveYourCourageKetra/Q00607_ProveYourCourageKetra.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00607_ProveYourCourageKetra/Q00607_ProveYourCourageKetra.java
@@ -62,7 +62,7 @@ public class Q00607_ProveYourCourageKetra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00608_SlayTheEnemyCommanderKetra/Q00608_SlayTheEnemyCommanderKetra.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00608_SlayTheEnemyCommanderKetra/Q00608_SlayTheEnemyCommanderKetra.java
index d172d7c670..abd7afb8fd 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00608_SlayTheEnemyCommanderKetra/Q00608_SlayTheEnemyCommanderKetra.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00608_SlayTheEnemyCommanderKetra/Q00608_SlayTheEnemyCommanderKetra.java
@@ -62,7 +62,7 @@ public class Q00608_SlayTheEnemyCommanderKetra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00609_MagicalPowerOfWaterPart1/Q00609_MagicalPowerOfWaterPart1.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00609_MagicalPowerOfWaterPart1/Q00609_MagicalPowerOfWaterPart1.java
index ce3357dbcc..c369c79051 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00609_MagicalPowerOfWaterPart1/Q00609_MagicalPowerOfWaterPart1.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00609_MagicalPowerOfWaterPart1/Q00609_MagicalPowerOfWaterPart1.java
@@ -91,7 +91,7 @@ public class Q00609_MagicalPowerOfWaterPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java
index cc7b7626d7..8abb7bd48c 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java
@@ -95,7 +95,7 @@ public class Q00610_MagicalPowerOfWaterPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (player != null)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java
index 1efbe68fc0..c252867128 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java
@@ -189,7 +189,7 @@ public class Q00611_AllianceWithVarkaSilenos extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java
index 2e56c6bbb4..fbc7262bf6 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java
@@ -71,7 +71,7 @@ public class Q00612_BattleAgainstKetraOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00613_ProveYourCourageVarka/Q00613_ProveYourCourageVarka.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00613_ProveYourCourageVarka/Q00613_ProveYourCourageVarka.java
index d40bef609b..691782f40c 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00613_ProveYourCourageVarka/Q00613_ProveYourCourageVarka.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00613_ProveYourCourageVarka/Q00613_ProveYourCourageVarka.java
@@ -62,7 +62,7 @@ public class Q00613_ProveYourCourageVarka extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00614_SlayTheEnemyCommanderVarka/Q00614_SlayTheEnemyCommanderVarka.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00614_SlayTheEnemyCommanderVarka/Q00614_SlayTheEnemyCommanderVarka.java
index 5a8abb0976..69db73b822 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00614_SlayTheEnemyCommanderVarka/Q00614_SlayTheEnemyCommanderVarka.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00614_SlayTheEnemyCommanderVarka/Q00614_SlayTheEnemyCommanderVarka.java
@@ -62,7 +62,7 @@ public class Q00614_SlayTheEnemyCommanderVarka extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00615_MagicalPowerOfFirePart1/Q00615_MagicalPowerOfFirePart1.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00615_MagicalPowerOfFirePart1/Q00615_MagicalPowerOfFirePart1.java
index f4b17d65d5..dc4cc878fc 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00615_MagicalPowerOfFirePart1/Q00615_MagicalPowerOfFirePart1.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00615_MagicalPowerOfFirePart1/Q00615_MagicalPowerOfFirePart1.java
@@ -91,7 +91,7 @@ public class Q00615_MagicalPowerOfFirePart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java
index 948f8e83cf..3766161454 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java
@@ -95,7 +95,7 @@ public class Q00616_MagicalPowerOfFirePart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (player != null)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
index 4ba688ab87..d229bb8450 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
@@ -91,7 +91,7 @@ public class Q00617_GatherTheFlames extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
index eb434a6dc5..9d5480d77f 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
@@ -45,7 +45,7 @@ public class Q00618_IntoTheFlame extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java
index 96a6262e4a..3616a624ba 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java
@@ -66,7 +66,7 @@ public class Q00619_RelicsOfTheOldEmpire extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
index c574b10cc2..fc73362f70 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
@@ -74,7 +74,7 @@ public class Q00620_FourGoblets extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
index 1929766c94..6955935e35 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
@@ -54,7 +54,7 @@ public class Q00621_EggDelivery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
index 81b027b585..c62001e3fb 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
@@ -54,7 +54,7 @@ public class Q00622_SpecialtyLiquorDelivery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
index 4e1da4a413..36eaaada2e 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
@@ -46,7 +46,7 @@ public class Q00623_TheFinestFood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java
index 183edfed65..d6b99c9896 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java
@@ -48,7 +48,7 @@ public class Q00624_TheFinestIngredientsPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java
index 7d92f54bf6..219df8edf6 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java
@@ -70,7 +70,7 @@ public class Q00625_TheFinestIngredientsPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java
index 3bb1fcb814..4b170bcdc8 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java
@@ -62,7 +62,7 @@ public class Q00626_ADarkTwilight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
index 94a7635124..21a5a99ced 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
@@ -77,7 +77,7 @@ public class Q00627_HeartInSearchOfPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00628_HuntGoldenRam/Q00628_HuntGoldenRam.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00628_HuntGoldenRam/Q00628_HuntGoldenRam.java
index c7f0b82670..e04b101226 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00628_HuntGoldenRam/Q00628_HuntGoldenRam.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00628_HuntGoldenRam/Q00628_HuntGoldenRam.java
@@ -61,7 +61,7 @@ public class Q00628_HuntGoldenRam extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00629_CleanUpTheSwampOfScreams/Q00629_CleanUpTheSwampOfScreams.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00629_CleanUpTheSwampOfScreams/Q00629_CleanUpTheSwampOfScreams.java
index c965261343..e366cae61f 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00629_CleanUpTheSwampOfScreams/Q00629_CleanUpTheSwampOfScreams.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00629_CleanUpTheSwampOfScreams/Q00629_CleanUpTheSwampOfScreams.java
@@ -59,7 +59,7 @@ public class Q00629_CleanUpTheSwampOfScreams extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
index 0225f3aba3..8ce2b05b52 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
@@ -85,7 +85,7 @@ public class Q00631_DeliciousTopChoiceMeat extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00632_NecromancersRequest/Q00632_NecromancersRequest.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00632_NecromancersRequest/Q00632_NecromancersRequest.java
index 261b93ef96..2a72e3e590 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00632_NecromancersRequest/Q00632_NecromancersRequest.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00632_NecromancersRequest/Q00632_NecromancersRequest.java
@@ -73,7 +73,7 @@ public class Q00632_NecromancersRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00633_InTheForgottenVillage/Q00633_InTheForgottenVillage.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00633_InTheForgottenVillage/Q00633_InTheForgottenVillage.java
index 318d2181c6..96b3d3fcad 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00633_InTheForgottenVillage/Q00633_InTheForgottenVillage.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00633_InTheForgottenVillage/Q00633_InTheForgottenVillage.java
@@ -80,7 +80,7 @@ public class Q00633_InTheForgottenVillage extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00634_InSearchOfFragmentsOfDimension/Q00634_InSearchOfFragmentsOfDimension.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00634_InSearchOfFragmentsOfDimension/Q00634_InSearchOfFragmentsOfDimension.java
index f899d44f4d..ccdf529531 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00634_InSearchOfFragmentsOfDimension/Q00634_InSearchOfFragmentsOfDimension.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00634_InSearchOfFragmentsOfDimension/Q00634_InSearchOfFragmentsOfDimension.java
@@ -47,7 +47,7 @@ public class Q00634_InSearchOfFragmentsOfDimension extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00635_IntoTheDimensionalRift/Q00635_IntoTheDimensionalRift.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00635_IntoTheDimensionalRift/Q00635_IntoTheDimensionalRift.java
index 08260420f2..5924c734b4 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00635_IntoTheDimensionalRift/Q00635_IntoTheDimensionalRift.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00635_IntoTheDimensionalRift/Q00635_IntoTheDimensionalRift.java
@@ -67,7 +67,7 @@ public class Q00635_IntoTheDimensionalRift extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00636_TruthBeyond/Q00636_TruthBeyond.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00636_TruthBeyond/Q00636_TruthBeyond.java
index a6d8d26e0f..4808483e0b 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00636_TruthBeyond/Q00636_TruthBeyond.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00636_TruthBeyond/Q00636_TruthBeyond.java
@@ -42,7 +42,7 @@ public class Q00636_TruthBeyond extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java
index fa340ae87f..a832a3f5cd 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java
@@ -43,7 +43,7 @@ public class Q00637_ThroughOnceMore extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java
index 704cad657c..7945da47d1 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java
@@ -43,7 +43,7 @@ public class Q00638_SeekersOfTheHolyGrail extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/Q00639_GuardiansOfTheHolyGrail.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/Q00639_GuardiansOfTheHolyGrail.java
index ca9f81ba1f..44c3359564 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/Q00639_GuardiansOfTheHolyGrail.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/Q00639_GuardiansOfTheHolyGrail.java
@@ -66,7 +66,7 @@ public class Q00639_GuardiansOfTheHolyGrail extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00640_TheZeroHour/Q00640_TheZeroHour.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00640_TheZeroHour/Q00640_TheZeroHour.java
index 4b68f21f14..6fb874367a 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00640_TheZeroHour/Q00640_TheZeroHour.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00640_TheZeroHour/Q00640_TheZeroHour.java
@@ -58,7 +58,7 @@ public class Q00640_TheZeroHour extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
index 9c5980e5a1..8156edda9c 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
@@ -44,7 +44,7 @@ public class Q00641_AttackSailren extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = player.getQuestState(getName());
 		if (st == null)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
index 2aaa18a58e..d2a4b1a6bf 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
@@ -57,7 +57,7 @@ public class Q00642_APowerfulPrimevalCreature extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
index 7706c40be3..91c1aae649 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
@@ -41,7 +41,7 @@ public class Q00643_RiseAndFallOfTheElrokiTribe extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00644_GraveRobberAnnihilation/Q00644_GraveRobberAnnihilation.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00644_GraveRobberAnnihilation/Q00644_GraveRobberAnnihilation.java
index 673325ab28..4533060c5b 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00644_GraveRobberAnnihilation/Q00644_GraveRobberAnnihilation.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00644_GraveRobberAnnihilation/Q00644_GraveRobberAnnihilation.java
@@ -53,7 +53,7 @@ public class Q00644_GraveRobberAnnihilation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
index 627ab5d2e7..704a49d9ac 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
@@ -53,7 +53,7 @@ public class Q00645_GhostsOfBatur extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00646_SignsOfRevolt/Q00646_SignsOfRevolt.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00646_SignsOfRevolt/Q00646_SignsOfRevolt.java
index c6cf9ea561..49c66f85a4 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00646_SignsOfRevolt/Q00646_SignsOfRevolt.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00646_SignsOfRevolt/Q00646_SignsOfRevolt.java
@@ -51,7 +51,7 @@ public class Q00646_SignsOfRevolt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java
index 2e7f70af00..cf62f6832b 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java
@@ -43,7 +43,7 @@ public class Q00647_InfluxOfMachines extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
index 157b7fc69a..26ffb4b83b 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
@@ -83,7 +83,7 @@ public class Q00648_AnIceMerchantsDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		QuestState st = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java
index d8cd38d17c..2b4a743769 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java
@@ -40,7 +40,7 @@ public class Q00649_ALooterAndARailroadMan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java
index 352a2c59e4..b3d06fe5ed 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java
@@ -45,7 +45,7 @@ public class Q00650_ABrokenDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java
index 33572f02b1..a826d3961a 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java
@@ -50,7 +50,7 @@ public class Q00651_RunawayYouth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java
index 524c63a61b..ebf6264436 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java
@@ -54,7 +54,7 @@ public class Q00652_AnAgedExAdventurer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java
index ced5edb6f8..5c61126bc8 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java
@@ -51,7 +51,7 @@ public class Q00653_WildMaiden extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00654_JourneyToASettlement/Q00654_JourneyToASettlement.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00654_JourneyToASettlement/Q00654_JourneyToASettlement.java
index b0ce7aecc6..cc37b44f42 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00654_JourneyToASettlement/Q00654_JourneyToASettlement.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00654_JourneyToASettlement/Q00654_JourneyToASettlement.java
@@ -41,7 +41,7 @@ public class Q00654_JourneyToASettlement extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java
index 0c1331e541..0c3b288fc7 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java
@@ -42,7 +42,7 @@ public class Q00655_AGrandPlanForTamingWildBeasts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00659_IdRatherBeCollectingFairyBreath/Q00659_IdRatherBeCollectingFairyBreath.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00659_IdRatherBeCollectingFairyBreath/Q00659_IdRatherBeCollectingFairyBreath.java
index f75946011e..74f83dafa7 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00659_IdRatherBeCollectingFairyBreath/Q00659_IdRatherBeCollectingFairyBreath.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00659_IdRatherBeCollectingFairyBreath/Q00659_IdRatherBeCollectingFairyBreath.java
@@ -44,7 +44,7 @@ public class Q00659_IdRatherBeCollectingFairyBreath extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java
index e422df04b0..58134f9517 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java
@@ -55,7 +55,7 @@ public class Q00660_AidingTheFloranVillage extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00661_MakingTheHarvestGroundsSafe/Q00661_MakingTheHarvestGroundsSafe.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00661_MakingTheHarvestGroundsSafe/Q00661_MakingTheHarvestGroundsSafe.java
index 55d915207e..b99bdeb3e3 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00661_MakingTheHarvestGroundsSafe/Q00661_MakingTheHarvestGroundsSafe.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00661_MakingTheHarvestGroundsSafe/Q00661_MakingTheHarvestGroundsSafe.java
@@ -48,7 +48,7 @@ public class Q00661_MakingTheHarvestGroundsSafe extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
index 13adfb5e2b..065f102424 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
@@ -118,7 +118,7 @@ public class Q00662_AGameOfCards extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
index 73c5ef33ab..cad1f11bdf 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
@@ -125,7 +125,7 @@ public class Q00663_SeductiveWhispers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
index 8fc03532e2..af55dfb526 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
@@ -42,7 +42,7 @@ public class Q00688_DefeatTheElrokianRaiders extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00999_T0Tutorial/Q00999_T0Tutorial.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00999_T0Tutorial/Q00999_T0Tutorial.java
index b066b246c8..36a7c2fd1b 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00999_T0Tutorial/Q00999_T0Tutorial.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00999_T0Tutorial/Q00999_T0Tutorial.java
@@ -136,7 +136,7 @@ public class Q00999_T0Tutorial extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Config.DISABLE_TUTORIAL)
 		{
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/SagasSuperClass.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/SagasSuperClass.java
index e7aa7aa54a..409fa80875 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/SagasSuperClass.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/SagasSuperClass.java
@@ -227,7 +227,7 @@ public class SagasSuperClass extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = player.getQuestState(getName());
 		String htmltext = "";
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
index fadeaab50f..a4e1bd0387 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
@@ -48,7 +48,7 @@ public class AllianceMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!"9001-01.htm".equals(event) && (player.getClan() == null))
 		{
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
index 199b51fa4c..ce81ccff1c 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
@@ -66,7 +66,7 @@ public class ClanMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LEADER_REQUIRED.containsKey(event) && !player.isClanLeader())
 		{
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
index 472b265d19..7560171dd1 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
@@ -61,7 +61,7 @@ public class DarkElfChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
index 7ba0619564..f059b8666f 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
@@ -78,7 +78,7 @@ public class DarkElfChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
index 14f49ed1fd..816b96e4a9 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
@@ -51,7 +51,7 @@ public class DwarfBlacksmithChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
index 52812ad4a4..54a365faab 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
@@ -57,7 +57,7 @@ public class DwarfBlacksmithChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
index d372ba5b2a..daafa6d9bc 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
@@ -51,7 +51,7 @@ public class DwarfWarehouseChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
index 552b968cda..537fb2bd4f 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
@@ -57,7 +57,7 @@ public class DwarfWarehouseChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
index 07aac523db..fdd471c3ce 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
@@ -60,7 +60,7 @@ public class ElfHumanClericChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
index 7c238fc992..268027c600 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
@@ -60,7 +60,7 @@ public class ElfHumanFighterChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
index f7e3bba54a..a4f8bcecda 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
@@ -75,7 +75,7 @@ public class ElfHumanFighterChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
index b33e852f7c..1d016bc05a 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
@@ -59,7 +59,7 @@ public class ElfHumanWizardChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
index 90825aebb9..eda8996c5d 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
@@ -64,7 +64,7 @@ public class ElfHumanWizardChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
index acf6f9bc2f..1a231cd5d9 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
@@ -53,7 +53,7 @@ public class FirstClassTransferTalk extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return event;
 	}
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
index 3c595b9827..61020e2b22 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
@@ -52,7 +52,7 @@ public class OrcChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
index 151e59f21e..feb8847d2e 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
@@ -65,7 +65,7 @@ public class OrcChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java
index 5914ff8b3f..9eca36ca82 100644
--- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java
@@ -278,7 +278,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -300,7 +300,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -586,7 +586,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 		String res = null;
 		try
 		{
-			res = onAdvEvent(event, npc, player);
+			res = onEvent(event, npc, player);
 		}
 		catch (Exception e)
 		{
@@ -1025,12 +1025,11 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 */
 	public String onDeath(Creature killer, Creature victim, QuestState qs)
 	{
-		return onAdvEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
+		return onEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
 	}
 	
 	/**
 	 * This function is called whenever a player clicks on a link in a quest dialog and whenever a timer fires.<br>
-	 * If is not overridden by a subclass, then default to the returned value of the simpler (and older) {@link #onEvent(String, QuestState)} override.<br>
 	 * If the player has a quest state, use it as parameter in the next call, otherwise return null.
 	 * @param event this parameter contains a string identifier for the event.<br>
 	 *            Generally, this string is passed directly via the link.<br>
@@ -1049,35 +1048,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 *            This parameter may be {@code null} in certain circumstances.
 	 * @return the text returned by the event (may be {@code null}, a filename or just text)
 	 */
-	public String onAdvEvent(String event, Npc npc, Player player)
-	{
-		if (player != null)
-		{
-			final QuestState qs = player.getQuestState(getName());
-			if (qs != null)
-			{
-				return onEvent(event, qs);
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * This function is called in place of {@link #onAdvEvent(String, Npc, Player)} if the former is not implemented.<br>
-	 * If a script contains both {@link #onAdvEvent(String, Npc, Player)} and this implementation, then this method will never be called unless the script's {@link #onAdvEvent(String, Npc, Player)} explicitly calls this method.
-	 * @param event this parameter contains a string identifier for the event.<br>
-	 *            Generally, this string is passed directly via the link.<br>
-	 *            For example:<br>
-	 *            <code>
-	 *            &lt;a action="bypass -h Quest 626_ADarkTwilight 31517-01.htm"&gt;hello&lt;/a&gt;
-	 *            </code><br>
-	 *            The above link sets the event variable to "31517-01.htm" for the quest 626_ADarkTwilight.<br>
-	 *            In the case of timers, this will be the name of the timer.<br>
-	 *            This parameter serves as a sort of identifier.
-	 * @param qs this parameter contains a reference to the quest state of the player who used the link or started the timer.
-	 * @return the text returned by the event (may be {@code null}, a filename or just text)
-	 */
-	public String onEvent(String event, QuestState qs)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return null;
 	}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java
index 28f1d872dc..fb0fd507ef 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java
@@ -489,7 +489,7 @@ public class FeedableBeasts extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("polymorph Mad Cow") && (npc != null) && (player != null) && MAD_COW_POLYMORPH.containsKey(npc.getId()))
 		{
@@ -509,7 +509,7 @@ public class FeedableBeasts extends AbstractNpcAI
 			nextNpc.addDamageHate(player, 0, 99999);
 			nextNpc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
index 829a648ea6..086879818f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
@@ -44,7 +44,7 @@ public class Tunatun extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("Whip".equals(event))
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java
index 0cf266c1f5..10ef61db46 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java
@@ -48,7 +48,7 @@ public class Alarm extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Player player0 = npc.getVariables().getObject("player0", Player.class);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
index b30bc5df7c..0ce32e997a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
@@ -78,7 +78,7 @@ public class FrightenedRagnaOrc extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
index a26e6075fd..31fc2ba199 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
@@ -43,12 +43,12 @@ public class Toma extends AbstractNpcAI
 	private Toma()
 	{
 		addFirstTalkId(TOMA);
-		onAdvEvent("RESPAWN_TOMA", null, null);
+		onEvent("RESPAWN_TOMA", null, null);
 		startQuestTimer("RESPAWN_TOMA", TELEPORT_DELAY, null, null, true);
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("RESPAWN_TOMA"))
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
index d4a9137f8d..20aad104b0 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
@@ -41,7 +41,7 @@ public class KrateisCube extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
index aced8b0b46..3c5bf11089 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
@@ -359,7 +359,7 @@ public class TalentShow extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((event == null) || event.isEmpty())
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
index abc4e265d9..0ccd2abad4 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
@@ -41,7 +41,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -54,7 +54,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 				npc.deleteMe();
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_DAY_NIGHT_CHANGE)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
index 177b9e398c..741dd60f5a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
@@ -88,7 +88,7 @@ public class ForgeOfTheGods extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
index 8b1dba5b13..f65d38e761 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
@@ -84,7 +84,7 @@ public class Rooney extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport") && !npc.isDecayed())
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/FrozenLabyrinth/Rafforty/Rafforty.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/FrozenLabyrinth/Rafforty/Rafforty.java
index 7933bbb4c9..93c81b6573 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/FrozenLabyrinth/Rafforty/Rafforty.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/FrozenLabyrinth/Rafforty/Rafforty.java
@@ -35,7 +35,7 @@ public class Rafforty extends AbstractNpcAI
 	private static final int BOTTLE = 16027;
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
index 0add516652..de48e8880c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
@@ -45,7 +45,7 @@ public class GiantsCave extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("ATTACK") && (player != null) && (npc != null) && !npc.isDead())
 		{
@@ -70,7 +70,7 @@ public class GiantsCave extends AbstractNpcAI
 		{
 			npc.setScriptValue(0);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Giran/Alexandria/Alexandria.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Giran/Alexandria/Alexandria.java
index e1289f7db7..f1c410357c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Giran/Alexandria/Alexandria.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Giran/Alexandria/Alexandria.java
@@ -81,7 +81,7 @@ public class Alexandria extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("30098-02.html"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/EnergySeeds.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/EnergySeeds.java
index be59346dc9..5f4a9a1ef4 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/EnergySeeds.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/EnergySeeds.java
@@ -382,7 +382,7 @@ public class EnergySeeds extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("StartSoDAi"))
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/Lindvior.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/Lindvior.java
index 5903eee978..f754ce6b63 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/Lindvior.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/Lindvior.java
@@ -54,7 +54,7 @@ public class Lindvior extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -113,7 +113,7 @@ public class Lindvior extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public void scheduleNextLindviorVisit()
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/AbyssGaze/AbyssGaze.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/AbyssGaze/AbyssGaze.java
index 40bbcbebef..5ec9ef705d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/AbyssGaze/AbyssGaze.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/AbyssGaze/AbyssGaze.java
@@ -36,7 +36,7 @@ public class AbyssGaze extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		QuestState qs = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/EkimusMouth/EkimusMouth.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/EkimusMouth/EkimusMouth.java
index 777f4a6aa1..0856984393 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/EkimusMouth/EkimusMouth.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/EkimusMouth/EkimusMouth.java
@@ -36,7 +36,7 @@ public class EkimusMouth extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		QuestState qs = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/GeneralDilios/GeneralDilios.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/GeneralDilios/GeneralDilios.java
index ec0323dd41..12201d038f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/GeneralDilios/GeneralDilios.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/GeneralDilios/GeneralDilios.java
@@ -59,7 +59,7 @@ public class GeneralDilios extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("command_"))
 		{
@@ -88,7 +88,7 @@ public class GeneralDilios extends AbstractNpcAI
 				startQuestTimer("guard_animation_" + (value + 1), 1500, null, null);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Klemis/Klemis.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Klemis/Klemis.java
index 7b862a3a92..ba4d14e08f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Klemis/Klemis.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Klemis/Klemis.java
@@ -43,7 +43,7 @@ public class Klemis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("portInside"))
 		{
@@ -56,6 +56,6 @@ public class Klemis extends AbstractNpcAI
 				return "32734-01.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Lekon/Lekon.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Lekon/Lekon.java
index 767f1be34c..b65bbeb7ef 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Lekon/Lekon.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Lekon/Lekon.java
@@ -47,7 +47,7 @@ public class Lekon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Nottingale/Nottingale.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Nottingale/Nottingale.java
index 21a39ef80b..923683c1c3 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Nottingale/Nottingale.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Nottingale/Nottingale.java
@@ -58,7 +58,7 @@ public class Nottingale extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Seyo/Seyo.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Seyo/Seyo.java
index 26af0ccec2..ac23fd365a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Seyo/Seyo.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Seyo/Seyo.java
@@ -51,7 +51,7 @@ public class Seyo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (npc == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/ZealotOfShilen/ZealotOfShilen.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/ZealotOfShilen/ZealotOfShilen.java
index ea0398bfa0..1ec5539b85 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/ZealotOfShilen/ZealotOfShilen.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/ZealotOfShilen/ZealotOfShilen.java
@@ -47,7 +47,7 @@ public class ZealotOfShilen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -75,7 +75,7 @@ public class ZealotOfShilen extends AbstractNpcAI
 			}
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java
index 4cf48282f2..9d6dfaa061 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java
@@ -399,7 +399,7 @@ public class HallOfErosionAttack extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final InstanceWorld tmpworld = InstanceManager.getInstance().getPlayerWorld(player);
 		if (tmpworld instanceof HEAWorld)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java
index 5b164266e5..8a9a391559 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java
@@ -421,7 +421,7 @@ public class HallOfErosionDefence extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final InstanceWorld tmpworld = InstanceManager.getInstance().getPlayerWorld(player);
 		if (tmpworld instanceof HEDWorld)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java
index efb06b35ac..069a9a31f2 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java
@@ -369,7 +369,7 @@ public class HallOfSufferingAttack extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc);
 		if (tmpworld instanceof HSAWorld)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java
index dabf54de8d..2b129470ea 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java
@@ -369,7 +369,7 @@ public class HallOfSufferingDefence extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc);
 		if (tmpworld instanceof HSDWorld)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java
index bef02f1c5a..383c7b6527 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java
@@ -408,7 +408,7 @@ public class HeartInfinityAttack extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final InstanceWorld tmpworld = InstanceManager.getInstance().getPlayerWorld(player);
 		if (tmpworld instanceof HIAWorld)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java
index 52ba22b6ef..6966754d46 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java
@@ -455,7 +455,7 @@ public class HeartInfinityDefence extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final InstanceWorld tmpworld = InstanceManager.getInstance().getPlayerWorld(player);
 		if (tmpworld instanceof HIDWorld)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/SecretArea/SecretArea.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/SecretArea/SecretArea.java
index da4b76345e..8c82322f97 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/SecretArea/SecretArea.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/SecretArea/SecretArea.java
@@ -61,7 +61,7 @@ public class SecretArea extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = getNoQuestMsg(player);
 		if ((npc.getId() == GINBY) && event.equalsIgnoreCase("enter"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java
index 620a664a65..c3a4730679 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java
@@ -1197,7 +1197,7 @@ public class SeedOfDestruction extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc != null ? npc : player);
 		if (tmpworld instanceof SODWorld)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/vehicles/AirShipController.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/vehicles/AirShipController.java
index 088cd29e7d..91eb9d745f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/vehicles/AirShipController.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/vehicles/AirShipController.java
@@ -117,7 +117,7 @@ public abstract class AirShipController extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("summon".equalsIgnoreCase(event))
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/vehicles/AirShipGludioGracia/AirShipGludioGracia.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
index 389e0671d4..2c235ae782 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
@@ -162,7 +162,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player.isTransformed())
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Amaskari.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Amaskari.java
index cfa31deeda..dfebdb2372 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Amaskari.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Amaskari.java
@@ -71,7 +71,7 @@ public class Amaskari extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("stop_toggle"))
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/DemonPrince.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/DemonPrince.java
index 3458a10b76..2729e6334e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/DemonPrince.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/DemonPrince.java
@@ -54,13 +54,13 @@ public class DemonPrince extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("cast") && (npc != null) && (npc.getId() == FIEND) && !npc.isDead())
 		{
 			npc.doCast(getRandomEntry(AOE).getSkill());
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/HellboundCore.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/HellboundCore.java
index 10d918b6fc..12dee27015 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/HellboundCore.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/HellboundCore.java
@@ -43,7 +43,7 @@ public class HellboundCore extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("cast") && (HellboundEngine.getInstance().getLevel() <= 6))
 		{
@@ -57,7 +57,7 @@ public class HellboundCore extends AbstractNpcAI
 			});
 			startQuestTimer("cast", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Keltas.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Keltas.java
index 6f7236b253..4213bf1424 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Keltas.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Keltas.java
@@ -151,7 +151,7 @@ public class Keltas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("despawn"))
 		{
@@ -164,7 +164,7 @@ public class Keltas extends AbstractNpcAI
 				despawnMinions();
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Bernarde/Bernarde.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Bernarde/Bernarde.java
index e61c5c0674..cc78b071b9 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Bernarde/Bernarde.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Bernarde/Bernarde.java
@@ -45,7 +45,7 @@ public class Bernarde extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Budenka/Budenka.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Budenka/Budenka.java
index c561e23f27..f923752313 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Budenka/Budenka.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Budenka/Budenka.java
@@ -41,7 +41,7 @@ public class Budenka extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Buron/Buron.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Buron/Buron.java
index 4f378817ca..4f4d80b771 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Buron/Buron.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Buron/Buron.java
@@ -42,7 +42,7 @@ public class Buron extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext;
 		if ("Rumor".equalsIgnoreCase(event))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Deltuva/Deltuva.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Deltuva/Deltuva.java
index 755d724ae4..7886bd9710 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Deltuva/Deltuva.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Deltuva/Deltuva.java
@@ -42,7 +42,7 @@ public class Deltuva extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("teleport"))
 		{
@@ -53,6 +53,6 @@ public class Deltuva extends AbstractNpcAI
 			}
 			player.teleToLocation(TELEPORT);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Falk/Falk.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Falk/Falk.java
index 5db0d0875e..8173684576 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Falk/Falk.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Falk/Falk.java
@@ -63,7 +63,7 @@ public class Falk extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("badges") && !hasAtLeastOneQuestItem(player, BASIC_CERT, STANDART_CERT, PREMIUM_CERT))
 		{
@@ -75,6 +75,6 @@ public class Falk extends AbstractNpcAI
 			}
 			return "32297-02b.htm";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Hude/Hude.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Hude/Hude.java
index 1dec971702..9068edbc98 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Hude/Hude.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Hude/Hude.java
@@ -49,7 +49,7 @@ public class Hude extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -95,7 +95,7 @@ public class Hude extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Jude/Jude.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Jude/Jude.java
index 02826d4e78..10093457ee 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Jude/Jude.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Jude/Jude.java
@@ -41,7 +41,7 @@ public class Jude extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("TreasureSacks".equalsIgnoreCase(event))
 		{
@@ -53,7 +53,7 @@ public class Jude extends AbstractNpcAI
 			}
 			return "32356-02a.htm";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Kanaf/Kanaf.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Kanaf/Kanaf.java
index a7df123f04..f2793875f7 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Kanaf/Kanaf.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Kanaf/Kanaf.java
@@ -38,12 +38,12 @@ public class Kanaf extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("info"))
 		{
 			return "32346-0" + getRandom(1, 3) + ".htm";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Kief/Kief.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Kief/Kief.java
index 1d8a740b5b..25678c01dd 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Kief/Kief.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Kief/Kief.java
@@ -46,7 +46,7 @@ public class Kief extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Natives/Natives.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Natives/Natives.java
index 756d4564cc..8b4eb7f82f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Natives/Natives.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Natives/Natives.java
@@ -97,7 +97,7 @@ public class Natives extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (npc.getId() == TRAITOR)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Quarry/Quarry.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Quarry/Quarry.java
index 8360a8af03..cd2db12115 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Quarry/Quarry.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Quarry/Quarry.java
@@ -66,7 +66,7 @@ public class Quarry extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Shadai/Shadai.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Shadai/Shadai.java
index c081f09a6a..f2c0cdef3d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Shadai/Shadai.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Shadai/Shadai.java
@@ -41,7 +41,7 @@ public class Shadai extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("VALIDATE_POS") && (npc != null))
 		{
@@ -63,7 +63,7 @@ public class Shadai extends AbstractNpcAI
 				npc.teleToLocation(coords);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Warpgate/Warpgate.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Warpgate/Warpgate.java
index 73681024fa..94a09fde1e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Warpgate/Warpgate.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Warpgate/Warpgate.java
@@ -63,7 +63,7 @@ public class Warpgate extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter"))
 		{
@@ -80,7 +80,7 @@ public class Warpgate extends AbstractNpcAI
 		{
 			player.teleToLocation(REMOVE_LOC, true);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Ranku.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Ranku.java
index 11f0e82b40..81ca6cab52 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Ranku.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Ranku.java
@@ -50,7 +50,7 @@ public class Ranku extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("checkup") && (npc.getId() == RANKU) && !npc.isDead())
 		{
@@ -64,7 +64,7 @@ public class Ranku extends AbstractNpcAI
 			}
 			startQuestTimer("checkup", 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Typhoon.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Typhoon.java
index 00398b2444..23dd1f88c4 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Typhoon.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Typhoon.java
@@ -48,14 +48,14 @@ public class Typhoon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("CAST") && (npc != null) && !npc.isDead())
 		{
 			npc.doSimultaneousCast(STORM.getSkill());
 			startQuestTimer("CAST", 5000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/AnomicFoundry/AnomicFoundry.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/AnomicFoundry/AnomicFoundry.java
index 71978e6526..7b84018375 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/AnomicFoundry/AnomicFoundry.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/AnomicFoundry/AnomicFoundry.java
@@ -83,7 +83,7 @@ public class AnomicFoundry extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("make_spawn_1"))
 		{
@@ -116,7 +116,7 @@ public class AnomicFoundry extends AbstractNpcAI
 		{
 			respawnTime = 60000;
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/BaseTower/BaseTower.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/BaseTower/BaseTower.java
index df7d22679a..042085be9a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/BaseTower/BaseTower.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/BaseTower/BaseTower.java
@@ -63,13 +63,13 @@ public class BaseTower extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("CLOSE"))
 		{
 			DoorData.getInstance().getDoor(20260004).closeMe();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TowerOfInfinitum/TowerOfInfinitum.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TowerOfInfinitum/TowerOfInfinitum.java
index cd196c89c9..c3bd227901 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TowerOfInfinitum/TowerOfInfinitum.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TowerOfInfinitum/TowerOfInfinitum.java
@@ -101,7 +101,7 @@ public class TowerOfInfinitum extends AbstractNpcAI
 	private static final Location ENTER_LOCATION = new Location(-22204, 277056, -15023);
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final int npcId = npc.getId();
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java
index 772a983a68..d7d0a0d792 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java
@@ -404,7 +404,7 @@ public class TowerOfNaia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TullyWorkshop/TullyWorkshop.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TullyWorkshop/TullyWorkshop.java
index fc94c2afe7..42044409ee 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TullyWorkshop/TullyWorkshop.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TullyWorkshop/TullyWorkshop.java
@@ -694,7 +694,7 @@ public class TullyWorkshop extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("disable_zone"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/HellboundEngine.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/HellboundEngine.java
index 201fafb436..27210dbb30 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/HellboundEngine.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/HellboundEngine.java
@@ -68,7 +68,7 @@ public class HellboundEngine extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals(UPDATE_EVENT))
 		{
@@ -88,7 +88,7 @@ public class HellboundEngine extends AbstractNpcAI
 			}
 			startQuestTimer(UPDATE_EVENT, UPDATE_INTERVAL, null, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	/**
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/Instances/UrbanArea/UrbanArea.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/Instances/UrbanArea/UrbanArea.java
index d3cef9285c..94c40a75f9 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/Instances/UrbanArea/UrbanArea.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/Instances/UrbanArea/UrbanArea.java
@@ -170,7 +170,7 @@ public class UrbanArea extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final InstanceWorld world = InstanceManager.getInstance().getWorld(npc);
 		if ((world != null) && (npc.getId() == DOWNTOWN_NATIVE))
@@ -212,7 +212,7 @@ public class UrbanArea extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
index a6a8d85a58..3553713c6d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
@@ -63,7 +63,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -135,7 +135,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 				npc.reduceCurrentHp(500, npc, null); // poison kills Fafurion if he is not healed
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
index a4a9860485..edbd739eb1 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
@@ -46,7 +46,7 @@ public class Rignos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -88,7 +88,7 @@ public class Rignos extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
index bdd4ab193d..049d8710eb 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
@@ -108,7 +108,7 @@ public class KetraOrcSupport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
index 23b5c50033..c8498cbee5 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
@@ -49,7 +49,7 @@ public class MithrilMinesTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int index = Integer.parseInt(event) - 1;
 		if (LOCS.length > index)
@@ -57,7 +57,7 @@ public class MithrilMinesTeleporter extends AbstractNpcAI
 			final Location loc = LOCS[index];
 			player.teleToLocation(loc, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
index e82d2f133f..9e1d92cd23 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
@@ -62,7 +62,7 @@ public class PaganTeleporters extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
index e5c0de637f..fe9f0d5357 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
@@ -179,7 +179,7 @@ public class PrimevalIsle extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -239,7 +239,7 @@ public class PrimevalIsle extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
index fc9ca1bc2d..f959ca6dd4 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
@@ -145,7 +145,7 @@ public class Venom extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java
index a25dfe2fff..93f73f1af6 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java
@@ -70,7 +70,7 @@ public class SilentValley extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
index 4f131439de..8f3890450e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
@@ -196,7 +196,7 @@ public class StakatoNest extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || (player == null) || npc.isDead())
 		{
@@ -224,7 +224,7 @@ public class StakatoNest extends AbstractNpcAI
 			addAttackDesire(spawned, player);
 			npc.deleteMe();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private static Monster checkMinion(Npc npc)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
index 611b134c70..2469300cb4 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
@@ -49,7 +49,7 @@ public class StakatoNestTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int index = Integer.parseInt(event) - 1;
 		if (LOCS.length > index)
@@ -67,7 +67,7 @@ public class StakatoNestTeleporter extends AbstractNpcAI
 			}
 			player.teleToLocation(loc, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java
index 6f97a61ba2..ace31064f0 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java
@@ -86,7 +86,7 @@ public class ToIVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int npcId = npc.getId();
 		
@@ -132,7 +132,7 @@ public class ToIVortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
index 240db66f2f..15a124ce18 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
@@ -108,7 +108,7 @@ public class VarkaSilenosSupport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index b4f9c10b23..2271d337e5 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -192,7 +192,7 @@ public class Antharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -605,7 +605,7 @@ public class Antharas extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 939469c5cd..4e315948e2 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -163,7 +163,7 @@ public class Baium extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -477,7 +477,7 @@ public class Baium extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index 17c59e4d13..f4aad8b0bd 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -127,7 +127,7 @@ public class Beleth extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -537,7 +537,7 @@ public class Beleth extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Core/Core.java
index 7b6c38ef6e..cdb31e2e91 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -143,7 +143,7 @@ public class Core extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
@@ -162,7 +162,7 @@ public class Core extends AbstractNpcAI
 			_minions.forEach(Attackable::decayMe);
 			_minions.clear();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
index 53cf0d9b9f..ddd0eb3a5d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
@@ -112,7 +112,7 @@ public class DrChaos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -223,7 +223,7 @@ public class DrChaos extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Frintezza/Frintezza.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Frintezza/Frintezza.java
index 4f91194895..53f459711c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Frintezza/Frintezza.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Frintezza/Frintezza.java
@@ -317,7 +317,7 @@ public class Frintezza extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		long temp = 0;
 		if (event.equalsIgnoreCase("waiting"))
@@ -1290,7 +1290,7 @@ public class Frintezza extends AbstractNpcAI
 			_zone.oustAllPlayers();
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 59c52d5928..010953ceb3 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -169,7 +169,7 @@ public class Orfen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("orfen_unlock"))
 		{
@@ -232,7 +232,7 @@ public class Orfen extends AbstractNpcAI
 			mob.setIsRaidMinion(true);
 			MINIONS.add(mob);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 43a0e85ace..d04a936a65 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -146,7 +146,7 @@ public class QueenAnt extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -230,7 +230,7 @@ public class QueenAnt extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
index c26218a8f4..5a7174c8e0 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
@@ -51,7 +51,7 @@ public class QueenShyeed extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
index 4843e1b1c9..8300985ed2 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
@@ -80,7 +80,7 @@ public class Sailren extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -249,7 +249,7 @@ public class Sailren extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index 8edc4da52a..82f638645c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -191,7 +191,7 @@ public class Valakas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -380,7 +380,7 @@ public class Valakas extends AbstractNpcAI
 		{
 			BOSS_ZONE.oustAllPlayers();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index ed04cdb2b8..5388df8da2 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -62,7 +62,7 @@ public class ArenaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -128,7 +128,7 @@ public class ArenaManager extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Asamah/Asamah.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Asamah/Asamah.java
index 0b5f4da993..7d35f1914e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Asamah/Asamah.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Asamah/Asamah.java
@@ -39,7 +39,7 @@ public class Asamah extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("32115-03.htm") || event.equals("32115-04.htm"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Asher/Asher.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Asher/Asher.java
index efe2de77c8..8cf76c4f51 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Asher/Asher.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Asher/Asher.java
@@ -44,7 +44,7 @@ public class Asher extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
@@ -62,7 +62,7 @@ public class Asher extends AbstractNpcAI
 		{
 			return event;
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/AvantGarde/AvantGarde.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/AvantGarde/AvantGarde.java
index f73be5b59c..56eed9249e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/AvantGarde/AvantGarde.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/AvantGarde/AvantGarde.java
@@ -93,7 +93,7 @@ public class AvantGarde extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
index d31eb72af9..990e647d15 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
@@ -48,7 +48,7 @@ public class BlackJudge extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final int level = ((player.getExpertiseLevel() < 5) ? player.getExpertiseLevel() : 5);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
index 92ce24d8ee..459e9e5ff3 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
@@ -57,7 +57,7 @@ public class CastleAmbassador extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -117,7 +117,7 @@ public class CastleAmbassador extends AbstractNpcAI
 				player.sendPacket(packet);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
index 565ad1f2aa..feb10e7cb7 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
@@ -56,7 +56,7 @@ public class CastleBlacksmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return (event.equalsIgnoreCase(npc.getId() + "-02.html") && hasRights(player, npc)) ? event : null;
 	}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
index 664b9b9a38..e03ce7d413 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
@@ -462,7 +462,7 @@ public class CastleChamberlain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Castle castle = npc.getCastle();
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
index f00716eab0..3051a20476 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
@@ -123,7 +123,7 @@ public class CastleCourtMagician extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player.getClan() == null) && (player.getClanId() != npc.getCastle().getOwnerId()))
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
index e4ff45968e..5d4b54fc35 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
@@ -57,7 +57,7 @@ public class CastleMercenaryManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index 6237d80278..49f87eb678 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -55,7 +55,7 @@ public class CastleTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("teleporter-03.html"))
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
index 4b95b34215..9b304c6628 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
@@ -52,7 +52,7 @@ public class CastleWarehouse extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
index d6ab16eb9c..71ff559ebd 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
@@ -68,7 +68,7 @@ public class ClanTrader extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
index 99b9eb20e3..bf10146bb9 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
@@ -43,7 +43,7 @@ public class CrimsonHatuOtis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -69,7 +69,7 @@ public class CrimsonHatuOtis extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/DivineBeast.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/DivineBeast.java
index 8f7cac317a..bd7e944920 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/DivineBeast.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/DivineBeast.java
@@ -44,7 +44,7 @@ public class DivineBeast extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player == null) || !player.hasServitor())
 		{
@@ -55,7 +55,7 @@ public class DivineBeast extends AbstractNpcAI
 			cancelQuestTimer(event, npc, player);
 			player.getSummon().unSummon(player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Epidos.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Epidos.java
index c74e26413e..7530506140 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Epidos.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Epidos.java
@@ -66,7 +66,7 @@ public class Epidos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("check_minions"))
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/FameManager/FameManager.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/FameManager/FameManager.java
index 0aea3daf23..2b1c7ff399 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/FameManager/FameManager.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/FameManager/FameManager.java
@@ -49,7 +49,7 @@ public class FameManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
index 8e0a2a7ebb..0469dec792 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
@@ -69,7 +69,7 @@ public class FortressSiegeManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/GatekeeperSpirit/GatekeeperSpirit.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/GatekeeperSpirit/GatekeeperSpirit.java
index 3a9a0b5cf2..88e2f3809b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/GatekeeperSpirit/GatekeeperSpirit.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/GatekeeperSpirit/GatekeeperSpirit.java
@@ -51,7 +51,7 @@ public class GatekeeperSpirit extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
index d99ba2611f..cb3906f1f2 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
@@ -61,7 +61,7 @@ public class HealerTrainer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Katenar/Katenar.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Katenar/Katenar.java
index 059a0b77df..f7a25d9dea 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Katenar/Katenar.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Katenar/Katenar.java
@@ -45,7 +45,7 @@ public class Katenar extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Npc npc0 = npc.getVariables().getObject("npc0", Npc.class);
 		final String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
index b29402313d..45754c57a1 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
@@ -71,7 +71,7 @@ public class ManorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/MercenaryCaptain/MercenaryCaptain.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/MercenaryCaptain/MercenaryCaptain.java
index 191f248b18..741c349182 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/MercenaryCaptain/MercenaryCaptain.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/MercenaryCaptain/MercenaryCaptain.java
@@ -87,7 +87,7 @@ public class MercenaryCaptain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (player != null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
index f6c1489606..089f7a90d9 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
@@ -69,7 +69,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -126,7 +126,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/NewbieTravelToken/NewbieTravelToken.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/NewbieTravelToken/NewbieTravelToken.java
index db2b7c6bb9..cd3f8fd31e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/NewbieTravelToken/NewbieTravelToken.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/NewbieTravelToken/NewbieTravelToken.java
@@ -56,7 +56,7 @@ public class NewbieTravelToken extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
@@ -72,7 +72,7 @@ public class NewbieTravelToken extends AbstractNpcAI
 				{
 					player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT);
 				}
-				return super.onAdvEvent(event, npc, player);
+				return super.onEvent(event, npc, player);
 			}
 		}
 		return event;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/NoblesseTeleport/NoblesseTeleport.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/NoblesseTeleport/NoblesseTeleport.java
index d20384cd43..3567f291a0 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/NoblesseTeleport/NoblesseTeleport.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/NoblesseTeleport/NoblesseTeleport.java
@@ -61,7 +61,7 @@ public class NoblesseTeleport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("teleportWithToken".equals(event))
 		{
@@ -74,7 +74,7 @@ public class NoblesseTeleport extends AbstractNpcAI
 				return "noble-nopass.htm";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/OracleTeleport/OracleTeleport.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/OracleTeleport/OracleTeleport.java
index 72056e0797..921272fa33 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/OracleTeleport/OracleTeleport.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/OracleTeleport/OracleTeleport.java
@@ -152,7 +152,7 @@ public class OracleTeleport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = "";
 		final QuestState qs = getQuestState(player, true);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/PrisonGuards.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/PrisonGuards.java
index 74dddbdc35..e57dbf665c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/PrisonGuards.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/PrisonGuards.java
@@ -55,7 +55,7 @@ public class PrisonGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CLEAR_STATUS"))
 		{
@@ -69,7 +69,7 @@ public class PrisonGuards extends AbstractNpcAI
 			}
 			startQuestTimer("CHECK_HOME", 30000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Selina/Selina.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Selina/Selina.java
index 35f8bda220..0646f39485 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Selina/Selina.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Selina/Selina.java
@@ -61,7 +61,7 @@ public class Selina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final BuffHolder buff = BUFFS.get(event);
 		if (buff != null)
@@ -69,7 +69,7 @@ public class Selina extends AbstractNpcAI
 			if ((getQuestItemsCount(player, GOLDEN_RAM_COIN) >= buff.getCost()))
 			{
 				castSkill(npc, player, buff);
-				return super.onAdvEvent(event, npc, player);
+				return super.onEvent(event, npc, player);
 			}
 		}
 		else
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Servitors/SinEater.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Servitors/SinEater.java
index 48f0999dd6..8ac11b0adb 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Servitors/SinEater.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Servitors/SinEater.java
@@ -48,7 +48,7 @@ public class SinEater extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TALK") && (player != null) && (player.getSummon() != null))
 		{
@@ -79,7 +79,7 @@ public class SinEater extends AbstractNpcAI
 			}
 			startQuestTimer("TALK", 60000, null, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_CREATURE_DEATH)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SubclassCertification/SubclassCertification.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SubclassCertification/SubclassCertification.java
index 10189d5f21..a4e7c7a430 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SubclassCertification/SubclassCertification.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SubclassCertification/SubclassCertification.java
@@ -95,7 +95,7 @@ public class SubclassCertification extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
index ec177e537e..373c64200b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
@@ -128,7 +128,7 @@ public class SupportUnitCaptain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int fortOwner = npc.getFort().getOwnerClan() == null ? 0 : npc.getFort().getOwnerClan().getId();
 		if ((player.getClan() == null) || (player.getClanId() != fortOwner))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Survivor/Survivor.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Survivor/Survivor.java
index 2f371d6475..aeda9d7c26 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Survivor/Survivor.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Survivor/Survivor.java
@@ -44,7 +44,7 @@ public class Survivor extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("32632-2.htm".equals(event))
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
index f6d1e74529..a733b87dad 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
@@ -53,7 +53,7 @@ public class SymbolMaker extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
index f9cd32a0dd..82ec9274c2 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
@@ -94,7 +94,7 @@ public class TeleportToUndergroundColiseum extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.endsWith(".htm"))
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/TerritoryManagers/TerritoryManagers.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/TerritoryManagers/TerritoryManagers.java
index 2312d504fb..065284d4a7 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/TerritoryManagers/TerritoryManagers.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/TerritoryManagers/TerritoryManagers.java
@@ -82,7 +82,7 @@ public class TerritoryManagers extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final int npcId = npc.getId();
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/TownPets/TownPets.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/TownPets/TownPets.java
index dfb0cd77d1..c65d385f3a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/TownPets/TownPets.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/TownPets/TownPets.java
@@ -52,7 +52,7 @@ public class TownPets extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("move"))
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/TurekOrcs.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/TurekOrcs.java
index 6c877ef8fc..75fe5836ae 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/TurekOrcs.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/TurekOrcs.java
@@ -54,7 +54,7 @@ public class TurekOrcs extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("checkState") && !npc.isDead() && (npc.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK))
 		{
@@ -68,7 +68,7 @@ public class TurekOrcs extends AbstractNpcAI
 				npc.getVariables().remove("state");
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
index f8d5844f1e..3398510a18 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
@@ -63,7 +63,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = "";
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/WarriorFishingBlock.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
index 56b29fee5b..78e3d1c99e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
@@ -75,7 +75,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -104,7 +104,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
index 555e67db36..7038a09618 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
@@ -157,7 +157,7 @@ public class WeaverOlf extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.contains("_grade_"))
 		{
@@ -186,7 +186,7 @@ public class WeaverOlf extends AbstractNpcAI
 			}
 			else
 			{
-				return super.onAdvEvent(event, npc, player);
+				return super.onEvent(event, npc, player);
 			}
 			
 			if (hasQuestItems(player, itemIds[0]))
@@ -226,7 +226,7 @@ public class WeaverOlf extends AbstractNpcAI
 			{
 				return npc.getId() + "-no.htm";
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		return event;
 	}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index 2f36629e9e..4e54dfa40e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -221,7 +221,7 @@ public class WyvernManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
index 9bb03a27d8..769c7378d1 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
@@ -352,7 +352,7 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String html = event;
 		final Clan clan = player.getClan();
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java
index 9801b840d4..4c46bcefa1 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java
@@ -157,7 +157,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 	}
 	
 	@Override
-	public synchronized String onAdvEvent(String event, Npc npc, Player player)
+	public synchronized String onEvent(String event, Npc npc, Player player)
 	{
 		String html = event;
 		final Clan clan = player.getClan();
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
index 0c2e7586c9..c49be5297b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
@@ -36,7 +36,7 @@ public class DelevelManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.DELEVEL_MANAGER_ENABLED)
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java
index 55c8a86364..887467ce32 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java
@@ -99,7 +99,7 @@ public class EchoCrystals extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = "";
 		final QuestState qs = player.getQuestState(EchoCrystals.class.getSimpleName());
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
index ff6d40ec0e..4713803f1d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
@@ -54,7 +54,7 @@ public class FactionSystem extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class FactionSystem extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
index 8b9c676ad5..771c8a9058 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
@@ -34,7 +34,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -77,7 +77,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 				npc.broadcastInfo(); // update flag status
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/NewbieCoupons/NewbieCoupons.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/NewbieCoupons/NewbieCoupons.java
index 57cdac83ed..4aff2b8053 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/NewbieCoupons/NewbieCoupons.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/NewbieCoupons/NewbieCoupons.java
@@ -67,7 +67,7 @@ public class NewbieCoupons extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (!NEWBIE_COUPONS_ENABLED)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
index 669fcfc85c..ddf7e923eb 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
@@ -39,7 +39,7 @@ public class NoblessMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.NOBLESS_MASTER_ENABLED)
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
index e8b02a1e9c..d2b04e6bdb 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
@@ -268,7 +268,7 @@ public class NpcLocationInfo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (Util.isDigit(event))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java
index 3d390f0cd3..35b1c61744 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java
@@ -69,7 +69,7 @@ public class RaidbossInfo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (Util.isDigit(event))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
index 59b760d6f6..60d366d464 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
@@ -168,7 +168,7 @@ public class Deathmatch extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
index bab0ed569a..c336793685 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
@@ -209,7 +209,7 @@ public class Rabbits extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Race/Race.java
index 65b898b922..0270892afb 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Race/Race.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Race/Race.java
@@ -314,7 +314,7 @@ public class Race extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index e3a2e51384..d589f9b0d3 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -186,7 +186,7 @@ public class TvT extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Wedding/Wedding.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Wedding/Wedding.java
index 82d4e748bd..f6783a161c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Wedding/Wedding.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Wedding/Wedding.java
@@ -50,7 +50,7 @@ public class Wedding extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player.getPartnerId() == 0)
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
index 4d354fc43a..094bdec3dc 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
@@ -76,7 +76,7 @@ public class CharacterBirthday extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = "";
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
index 734cda5237..8e8a306a33 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
@@ -85,7 +85,7 @@ public class GiftOfVitality extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
index aa5419e179..76aaa4ab09 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
@@ -59,7 +59,7 @@ public class HeavyMedal extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		int level = checkLevel(player);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/L2Day/L2Day.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/L2Day/L2Day.java
index a76a9d35bc..34a09fb8f3 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/L2Day/L2Day.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/L2Day/L2Day.java
@@ -149,7 +149,7 @@ public class L2Day extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
index 4fa731a370..82a0d02944 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
@@ -49,7 +49,7 @@ public class LoveYourGatekeeper extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
index ae36cd8628..e4f9c0a591 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
@@ -68,7 +68,7 @@ public class MasterOfEnchanting extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("buy_staff"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
index 49e9402035..4bf22b09df 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
@@ -297,7 +297,7 @@ public class SavingSanta extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!isEventPeriod())
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/TheValentineEvent/TheValentineEvent.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/TheValentineEvent/TheValentineEvent.java
index c13d67110e..cd1040b620 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/TheValentineEvent/TheValentineEvent.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/TheValentineEvent/TheValentineEvent.java
@@ -42,7 +42,7 @@ public class TheValentineEvent extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("4301-3.htm"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
index b2c324c9ca..9bbbea7863 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
@@ -311,7 +311,7 @@ public class WatermelonNinja extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java
index 1e77bb0124..4b074f5934 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java
@@ -263,7 +263,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter60"))
 		{
@@ -346,7 +346,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java
index f0e5562b54..adf28c6a83 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java
@@ -353,7 +353,7 @@ public abstract class Chamber extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = "";
 		final InstanceWorld world = InstanceManager.getInstance().getWorld(npc);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
index 8689f70c86..2f683b8ca6 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
@@ -1108,7 +1108,7 @@ public class CrystalCaverns extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc);
 		if (tmpworld instanceof CCWorld)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
index 82e3b84b4b..533020ab65 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
@@ -873,7 +873,7 @@ public class DarkCloudMansion extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
index d90d5fb0c5..7ec288c00a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
@@ -732,7 +732,7 @@ public class Kamaloka extends AbstractInstance
 	 * Handles only player's enter, single parameter - integer kamaloka index
 	 */
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
index 54d48a449d..228726b819 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
@@ -481,7 +481,7 @@ public class NornilsGarden extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/NornilsGardenQuest/NornilsGardenQuest.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/NornilsGardenQuest/NornilsGardenQuest.java
index 5b4d636d01..e24b65cb82 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/NornilsGardenQuest/NornilsGardenQuest.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/NornilsGardenQuest/NornilsGardenQuest.java
@@ -55,7 +55,7 @@ public class NornilsGardenQuest extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState q236 = player.getQuestState(Q00236_SeedsOfChaos.class.getSimpleName());
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
index 84bc38a6d7..d7bd95eb9f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
@@ -97,7 +97,7 @@ public class PailakaDevilsLegacy extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final InstanceWorld world = InstanceManager.getInstance().getWorld(npc);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
index 6415cc2ab2..a0124ea656 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
@@ -73,7 +73,7 @@ public class PailakaSongOfIceAndFire extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -112,7 +112,7 @@ public class PailakaSongOfIceAndFire extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java
index 8583e4fd9c..5ff1c7e428 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java
@@ -196,7 +196,7 @@ public class SSQDisciplesNecropolisPast extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player);
 		if (world != null)
@@ -298,7 +298,7 @@ public class SSQDisciplesNecropolisPast extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/SSQHideoutOfTheDawn/SSQHideoutOfTheDawn.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/SSQHideoutOfTheDawn/SSQHideoutOfTheDawn.java
index 51da6e21ec..134afb3d6c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/SSQHideoutOfTheDawn/SSQHideoutOfTheDawn.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/SSQHideoutOfTheDawn/SSQHideoutOfTheDawn.java
@@ -46,7 +46,7 @@ public class SSQHideoutOfTheDawn extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/SSQSanctumOfTheLordsOfDawn/SSQSanctumOfTheLordsOfDawn.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/SSQSanctumOfTheLordsOfDawn/SSQSanctumOfTheLordsOfDawn.java
index 9f16972b4c..3f61407c88 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/SSQSanctumOfTheLordsOfDawn/SSQSanctumOfTheLordsOfDawn.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/SSQSanctumOfTheLordsOfDawn/SSQSanctumOfTheLordsOfDawn.java
@@ -75,7 +75,7 @@ public class SSQSanctumOfTheLordsOfDawn extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -161,7 +161,7 @@ public class SSQSanctumOfTheLordsOfDawn extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/AbstractSagaQuest.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/AbstractSagaQuest.java
index e565ac2159..a094f9a3cc 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/AbstractSagaQuest.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/AbstractSagaQuest.java
@@ -163,7 +163,7 @@ public abstract class AbstractSagaQuest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java
index 313fd655f2..5cf19ad33f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java
@@ -51,7 +51,7 @@ public class Q00001_LettersOfLove extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java
index 4ce5c8152d..0a04574220 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java
@@ -54,7 +54,7 @@ public class Q00002_WhatWomenWant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java
index 0132d8c19f..5c5071ef64 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java
@@ -57,7 +57,7 @@ public class Q00003_WillTheSealBeBroken extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java
index f8999d76d8..ad6a16f76f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java
@@ -59,7 +59,7 @@ public class Q00004_LongLiveThePaagrioLord extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java
index 066b57f446..7d70919727 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java
@@ -56,7 +56,7 @@ public class Q00005_MinersFavor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00006_StepIntoTheFuture/Q00006_StepIntoTheFuture.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00006_StepIntoTheFuture/Q00006_StepIntoTheFuture.java
index b3ead525b2..208b2a1df6 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00006_StepIntoTheFuture/Q00006_StepIntoTheFuture.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00006_StepIntoTheFuture/Q00006_StepIntoTheFuture.java
@@ -49,7 +49,7 @@ public class Q00006_StepIntoTheFuture extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00007_ATripBegins/Q00007_ATripBegins.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00007_ATripBegins/Q00007_ATripBegins.java
index 58b825ae0a..59b3d92dda 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00007_ATripBegins/Q00007_ATripBegins.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00007_ATripBegins/Q00007_ATripBegins.java
@@ -49,7 +49,7 @@ public class Q00007_ATripBegins extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00008_AnAdventureBegins/Q00008_AnAdventureBegins.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00008_AnAdventureBegins/Q00008_AnAdventureBegins.java
index ddc0ced603..1309fa2ccb 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00008_AnAdventureBegins/Q00008_AnAdventureBegins.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00008_AnAdventureBegins/Q00008_AnAdventureBegins.java
@@ -49,7 +49,7 @@ public class Q00008_AnAdventureBegins extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00009_IntoTheCityOfHumans/Q00009_IntoTheCityOfHumans.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00009_IntoTheCityOfHumans/Q00009_IntoTheCityOfHumans.java
index 9dcefd9c14..ded9bde838 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00009_IntoTheCityOfHumans/Q00009_IntoTheCityOfHumans.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00009_IntoTheCityOfHumans/Q00009_IntoTheCityOfHumans.java
@@ -47,7 +47,7 @@ public class Q00009_IntoTheCityOfHumans extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00010_IntoTheWorld/Q00010_IntoTheWorld.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00010_IntoTheWorld/Q00010_IntoTheWorld.java
index bfbbc368a6..742742cb47 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00010_IntoTheWorld/Q00010_IntoTheWorld.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00010_IntoTheWorld/Q00010_IntoTheWorld.java
@@ -49,7 +49,7 @@ public class Q00010_IntoTheWorld extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00011_SecretMeetingWithKetraOrcs/Q00011_SecretMeetingWithKetraOrcs.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00011_SecretMeetingWithKetraOrcs/Q00011_SecretMeetingWithKetraOrcs.java
index 91a4416d78..eddf533084 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00011_SecretMeetingWithKetraOrcs/Q00011_SecretMeetingWithKetraOrcs.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00011_SecretMeetingWithKetraOrcs/Q00011_SecretMeetingWithKetraOrcs.java
@@ -45,7 +45,7 @@ public class Q00011_SecretMeetingWithKetraOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00012_SecretMeetingWithVarkaSilenos/Q00012_SecretMeetingWithVarkaSilenos.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00012_SecretMeetingWithVarkaSilenos/Q00012_SecretMeetingWithVarkaSilenos.java
index 1fc11f794f..1fff0840f2 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00012_SecretMeetingWithVarkaSilenos/Q00012_SecretMeetingWithVarkaSilenos.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00012_SecretMeetingWithVarkaSilenos/Q00012_SecretMeetingWithVarkaSilenos.java
@@ -45,7 +45,7 @@ public class Q00012_SecretMeetingWithVarkaSilenos extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
index a54ecc0504..1206e700b7 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
@@ -44,7 +44,7 @@ public class Q00013_ParcelDelivery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00014_WhereaboutsOfTheArchaeologist/Q00014_WhereaboutsOfTheArchaeologist.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00014_WhereaboutsOfTheArchaeologist/Q00014_WhereaboutsOfTheArchaeologist.java
index c17cf4d170..727cd4866b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00014_WhereaboutsOfTheArchaeologist/Q00014_WhereaboutsOfTheArchaeologist.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00014_WhereaboutsOfTheArchaeologist/Q00014_WhereaboutsOfTheArchaeologist.java
@@ -44,7 +44,7 @@ public class Q00014_WhereaboutsOfTheArchaeologist extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
index 9a48cb60cf..27dd5c7524 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
@@ -42,7 +42,7 @@ public class Q00015_SweetWhispers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
index dd5778cdc7..ae148f2455 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
@@ -51,7 +51,7 @@ public class Q00016_TheComingDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
index e42937fc4d..bfc4a73837 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
@@ -49,7 +49,7 @@ public class Q00017_LightAndDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00018_MeetingWithTheGoldenRam/Q00018_MeetingWithTheGoldenRam.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00018_MeetingWithTheGoldenRam/Q00018_MeetingWithTheGoldenRam.java
index 9db31ac584..b5f3675ff6 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00018_MeetingWithTheGoldenRam/Q00018_MeetingWithTheGoldenRam.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00018_MeetingWithTheGoldenRam/Q00018_MeetingWithTheGoldenRam.java
@@ -45,7 +45,7 @@ public class Q00018_MeetingWithTheGoldenRam extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
index 80d69f3b7e..ed7d7456b0 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
@@ -43,7 +43,7 @@ public class Q00019_GoToThePastureland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
index 8467c0a18f..b161006570 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
@@ -44,7 +44,7 @@ public class Q00020_BringUpWithLove extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00021_HiddenTruth/Q00021_HiddenTruth.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00021_HiddenTruth/Q00021_HiddenTruth.java
index 92304371dd..e7aab41d4c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00021_HiddenTruth/Q00021_HiddenTruth.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00021_HiddenTruth/Q00021_HiddenTruth.java
@@ -73,7 +73,7 @@ public class Q00021_HiddenTruth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00022_TragedyInVonHellmannForest/Q00022_TragedyInVonHellmannForest.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00022_TragedyInVonHellmannForest/Q00022_TragedyInVonHellmannForest.java
index 968840a1eb..0bd0c0414c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00022_TragedyInVonHellmannForest/Q00022_TragedyInVonHellmannForest.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00022_TragedyInVonHellmannForest/Q00022_TragedyInVonHellmannForest.java
@@ -81,7 +81,7 @@ public class Q00022_TragedyInVonHellmannForest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00023_LidiasHeart/Q00023_LidiasHeart.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00023_LidiasHeart/Q00023_LidiasHeart.java
index f8eb9106e8..b2f7f69478 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00023_LidiasHeart/Q00023_LidiasHeart.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00023_LidiasHeart/Q00023_LidiasHeart.java
@@ -64,7 +64,7 @@ public class Q00023_LidiasHeart extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("DESPAWN".equals(event))
 		{
@@ -74,7 +74,7 @@ public class Q00023_LidiasHeart extends Quest
 				npc0.getVariables().set("SPAWNED", false);
 			}
 			npc.deleteMe();
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java
index 8c4cff66bd..c57cb2047e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java
@@ -60,7 +60,7 @@ public class Q00024_InhabitantsOfTheForestOfTheDead extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player, false);
 		if (st == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00025_HidingBehindTheTruth/Q00025_HidingBehindTheTruth.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00025_HidingBehindTheTruth/Q00025_HidingBehindTheTruth.java
index 167adcc43a..d319b821df 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00025_HidingBehindTheTruth/Q00025_HidingBehindTheTruth.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00025_HidingBehindTheTruth/Q00025_HidingBehindTheTruth.java
@@ -80,7 +80,7 @@ public class Q00025_HidingBehindTheTruth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = getNoQuestMsg(player);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java
index 78212af5d9..3878f2fe21 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java
@@ -48,7 +48,7 @@ public class Q00027_ChestCaughtWithABaitOfWind extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java
index 8d93cfdfed..e84a9ea63a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java
@@ -48,7 +48,7 @@ public class Q00028_ChestCaughtWithABaitOfIcyAir extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java
index 74267f3b75..e495dd3a17 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java
@@ -48,7 +48,7 @@ public class Q00029_ChestCaughtWithABaitOfEarth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java
index e105415c44..9502360860 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java
@@ -48,7 +48,7 @@ public class Q00030_ChestCaughtWithABaitOfFire extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
index 1510eec415..b91b134cb8 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
@@ -55,7 +55,7 @@ public class Q00031_SecretBuriedInTheSwamp extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
index ab85113705..02fd7814dd 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
@@ -64,7 +64,7 @@ public class Q00032_AnObviousLie extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
index a77ca75984..723e88fc12 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
@@ -53,7 +53,7 @@ public class Q00033_MakeAPairOfDressShoes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
index 7c195a9e2a..8e0a47fae1 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
@@ -61,7 +61,7 @@ public class Q00034_InSearchOfCloth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
index 2388709eeb..bf9d53dd45 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
@@ -57,7 +57,7 @@ public class Q00035_FindGlitteringJewelry extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
index 7d47ace67c..0271678ec4 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
@@ -53,7 +53,7 @@ public class Q00036_MakeASewingKit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
index f8fc987fb4..5038b2ae97 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
@@ -54,7 +54,7 @@ public class Q00037_MakeFormalWear extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java
index 202dbd78f4..eb329a2427 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java
@@ -61,7 +61,7 @@ public class Q00038_DragonFangs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00039_RedEyedInvaders/Q00039_RedEyedInvaders.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00039_RedEyedInvaders/Q00039_RedEyedInvaders.java
index a5f417238d..6c227fd80d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00039_RedEyedInvaders/Q00039_RedEyedInvaders.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00039_RedEyedInvaders/Q00039_RedEyedInvaders.java
@@ -58,7 +58,7 @@ public class Q00039_RedEyedInvaders extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
index 2120152d8e..82199b42b4 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
@@ -55,7 +55,7 @@ public class Q00040_ASpecialOrder extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
index a0ef24b254..0cb973af91 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
@@ -52,7 +52,7 @@ public class Q00042_HelpTheUncle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
index 8276b8f27c..a5c06fadec 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
@@ -52,7 +52,7 @@ public class Q00043_HelpTheSister extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
index 00a80ec952..66cace0c3d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
@@ -53,7 +53,7 @@ public class Q00044_HelpTheSon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00045_ToTalkingIsland/Q00045_ToTalkingIsland.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00045_ToTalkingIsland/Q00045_ToTalkingIsland.java
index c3ba1ca0d2..b6a88211e2 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00045_ToTalkingIsland/Q00045_ToTalkingIsland.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00045_ToTalkingIsland/Q00045_ToTalkingIsland.java
@@ -70,7 +70,7 @@ public class Q00045_ToTalkingIsland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00046_OnceMoreInTheArmsOfTheMotherTree/Q00046_OnceMoreInTheArmsOfTheMotherTree.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00046_OnceMoreInTheArmsOfTheMotherTree/Q00046_OnceMoreInTheArmsOfTheMotherTree.java
index a1eed273dd..3a843427cf 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00046_OnceMoreInTheArmsOfTheMotherTree/Q00046_OnceMoreInTheArmsOfTheMotherTree.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00046_OnceMoreInTheArmsOfTheMotherTree/Q00046_OnceMoreInTheArmsOfTheMotherTree.java
@@ -70,7 +70,7 @@ public class Q00046_OnceMoreInTheArmsOfTheMotherTree extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00047_IntoTheDarkElvenForest/Q00047_IntoTheDarkElvenForest.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00047_IntoTheDarkElvenForest/Q00047_IntoTheDarkElvenForest.java
index 9be0e8bd47..70d20b3d87 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00047_IntoTheDarkElvenForest/Q00047_IntoTheDarkElvenForest.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00047_IntoTheDarkElvenForest/Q00047_IntoTheDarkElvenForest.java
@@ -70,7 +70,7 @@ public class Q00047_IntoTheDarkElvenForest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00048_ToTheImmortalPlateau/Q00048_ToTheImmortalPlateau.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00048_ToTheImmortalPlateau/Q00048_ToTheImmortalPlateau.java
index 5eeccee079..5a0488a6b2 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00048_ToTheImmortalPlateau/Q00048_ToTheImmortalPlateau.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00048_ToTheImmortalPlateau/Q00048_ToTheImmortalPlateau.java
@@ -70,7 +70,7 @@ public class Q00048_ToTheImmortalPlateau extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00049_TheRoadHome/Q00049_TheRoadHome.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00049_TheRoadHome/Q00049_TheRoadHome.java
index a380ba552d..8871bfad4f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00049_TheRoadHome/Q00049_TheRoadHome.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00049_TheRoadHome/Q00049_TheRoadHome.java
@@ -70,7 +70,7 @@ public class Q00049_TheRoadHome extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java
index 5da91db752..7a0bd586cd 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java
@@ -48,7 +48,7 @@ public class Q00050_LanoscosSpecialBait extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java
index 93d625c545..b22d32f970 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java
@@ -48,7 +48,7 @@ public class Q00051_OFullesSpecialBait extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java
index 60c468fee3..84e30aa3d5 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java
@@ -48,7 +48,7 @@ public class Q00052_WilliesSpecialBait extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java
index a9f390a479..206477259e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java
@@ -48,7 +48,7 @@ public class Q00053_LinnaeusSpecialBait extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00060_GoodWorksReward/Q00060_GoodWorksReward.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00060_GoodWorksReward/Q00060_GoodWorksReward.java
index 2dfe7ef6cf..0676a114af 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00060_GoodWorksReward/Q00060_GoodWorksReward.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00060_GoodWorksReward/Q00060_GoodWorksReward.java
@@ -111,7 +111,7 @@ public class Q00060_GoodWorksReward extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("DESPAWN".equals(event))
 		{
@@ -122,7 +122,7 @@ public class Q00060_GoodWorksReward extends Quest
 				npc0.getVariables().set("SPAWNED", false);
 			}
 			npc.deleteMe();
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java
index 40f94bc778..f5e2c90ed0 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java
@@ -43,7 +43,7 @@ public class Q00061_LawEnforcement extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00062_PathOfTheTrooper/Q00062_PathOfTheTrooper.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00062_PathOfTheTrooper/Q00062_PathOfTheTrooper.java
index f6ab691df4..48bc79175f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00062_PathOfTheTrooper/Q00062_PathOfTheTrooper.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00062_PathOfTheTrooper/Q00062_PathOfTheTrooper.java
@@ -60,7 +60,7 @@ public class Q00062_PathOfTheTrooper extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00063_PathOfTheWarder/Q00063_PathOfTheWarder.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00063_PathOfTheWarder/Q00063_PathOfTheWarder.java
index 40ddcb1c62..a3219a7d2e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00063_PathOfTheWarder/Q00063_PathOfTheWarder.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00063_PathOfTheWarder/Q00063_PathOfTheWarder.java
@@ -71,7 +71,7 @@ public class Q00063_PathOfTheWarder extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00064_CertifiedBerserker/Q00064_CertifiedBerserker.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00064_CertifiedBerserker/Q00064_CertifiedBerserker.java
index f59f540685..9a36765cf1 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00064_CertifiedBerserker/Q00064_CertifiedBerserker.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00064_CertifiedBerserker/Q00064_CertifiedBerserker.java
@@ -76,7 +76,7 @@ public class Q00064_CertifiedBerserker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00065_CertifiedSoulBreaker/Q00065_CertifiedSoulBreaker.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00065_CertifiedSoulBreaker/Q00065_CertifiedSoulBreaker.java
index 14113ba87a..b1c0b672bd 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00065_CertifiedSoulBreaker/Q00065_CertifiedSoulBreaker.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00065_CertifiedSoulBreaker/Q00065_CertifiedSoulBreaker.java
@@ -82,7 +82,7 @@ public class Q00065_CertifiedSoulBreaker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("DESPAWN_5".equals(event))
 		{
@@ -90,7 +90,7 @@ public class Q00065_CertifiedSoulBreaker extends Quest
 			{
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		else if ("DESPAWN_70".equals(event))
 		{
@@ -105,7 +105,7 @@ public class Q00065_CertifiedSoulBreaker extends Quest
 				}
 			}
 			npc.deleteMe();
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00066_CertifiedArbalester/Q00066_CertifiedArbalester.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00066_CertifiedArbalester/Q00066_CertifiedArbalester.java
index 23c00843af..5050301401 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00066_CertifiedArbalester/Q00066_CertifiedArbalester.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00066_CertifiedArbalester/Q00066_CertifiedArbalester.java
@@ -88,7 +88,7 @@ public class Q00066_CertifiedArbalester extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java
index 1791e5091e..bdaf5c1a09 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java
@@ -73,7 +73,7 @@ public class Q00101_SwordOfSolidarity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java
index 198ca3e6ef..bfd576749c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java
@@ -85,7 +85,7 @@ public class Q00102_SeaOfSporesFever extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30284-02.htm"))
@@ -94,7 +94,7 @@ public class Q00102_SeaOfSporesFever extends Quest
 			giveItems(player, ALBERIUS_LETTER, 1);
 			return event;
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java
index 1ea60199f9..594adb3393 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java
@@ -76,7 +76,7 @@ public class Q00103_SpiritOfCraftsman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java
index 9c61811199..11d3b0344d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java
@@ -79,7 +79,7 @@ public class Q00104_SpiritOfMirrors extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30017-04.htm"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java
index 98f56d2bf4..cd090de276 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java
@@ -86,7 +86,7 @@ public class Q00105_SkirmishWithOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java
index 4f3e5cc007..7649f59f79 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java
@@ -72,7 +72,7 @@ public class Q00106_ForgottenTruth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java
index f8ec863a4c..6d3580cf41 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java
@@ -72,7 +72,7 @@ public class Q00107_MercilessPunishment extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java
index c46a2bfc27..f4d0fc546c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java
@@ -96,7 +96,7 @@ public class Q00108_JumbleTumbleDiamondFuss extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
index 0c18c2fac3..5216a7fd38 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
@@ -44,7 +44,7 @@ public class Q00109_InSearchOfTheNest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
index 2ae3a7e10c..144f6c55f6 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
@@ -43,7 +43,7 @@ public class Q00110_ToThePrimevalIsle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java
index 107f5789b6..f03064394b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java
@@ -85,7 +85,7 @@ public class Q00111_ElrokianHuntersProof extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00112_WalkOfFate/Q00112_WalkOfFate.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00112_WalkOfFate/Q00112_WalkOfFate.java
index f5d7718921..9b93648571 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00112_WalkOfFate/Q00112_WalkOfFate.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00112_WalkOfFate/Q00112_WalkOfFate.java
@@ -44,7 +44,7 @@ public class Q00112_WalkOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs == null) || (player.getLevel() < MIN_LEVEL))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java
index 9c7ae1554a..80cfe0c5b6 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java
@@ -45,7 +45,7 @@ public class Q00113_StatusOfTheBeaconTower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java
index 81b4f13f05..ef708b79f5 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java
@@ -66,7 +66,7 @@ public class Q00114_ResurrectionOfAnOldManager extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
index 61b544f2f0..6d23e5039b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
@@ -54,7 +54,7 @@ public class Q00115_TheOtherSideOfTruth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00116_BeyondTheHillsOfWinter/Q00116_BeyondTheHillsOfWinter.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00116_BeyondTheHillsOfWinter/Q00116_BeyondTheHillsOfWinter.java
index 2a9bfa38dc..a0c6deb8d5 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00116_BeyondTheHillsOfWinter/Q00116_BeyondTheHillsOfWinter.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00116_BeyondTheHillsOfWinter/Q00116_BeyondTheHillsOfWinter.java
@@ -51,7 +51,7 @@ public class Q00116_BeyondTheHillsOfWinter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00117_TheOceanOfDistantStars/Q00117_TheOceanOfDistantStars.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00117_TheOceanOfDistantStars/Q00117_TheOceanOfDistantStars.java
index d84af7fc96..87ac13b3db 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00117_TheOceanOfDistantStars/Q00117_TheOceanOfDistantStars.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00117_TheOceanOfDistantStars/Q00117_TheOceanOfDistantStars.java
@@ -63,7 +63,7 @@ public class Q00117_TheOceanOfDistantStars extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00118_ToLeadAndBeLed/Q00118_ToLeadAndBeLed.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00118_ToLeadAndBeLed/Q00118_ToLeadAndBeLed.java
index 06ff162063..4ddb489be5 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00118_ToLeadAndBeLed/Q00118_ToLeadAndBeLed.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00118_ToLeadAndBeLed/Q00118_ToLeadAndBeLed.java
@@ -70,7 +70,7 @@ public class Q00118_ToLeadAndBeLed extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		// Manage Sponsor's quest events.
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
index 99f5bd934d..e5453d872c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
@@ -44,7 +44,7 @@ public class Q00119_LastImperialPrince extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00120_PavelsLastResearch/Q00120_PavelsLastResearch.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00120_PavelsLastResearch/Q00120_PavelsLastResearch.java
index 774c83216e..8e60735033 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00120_PavelsLastResearch/Q00120_PavelsLastResearch.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00120_PavelsLastResearch/Q00120_PavelsLastResearch.java
@@ -66,12 +66,12 @@ public class Q00120_PavelsLastResearch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
 		{
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		String html = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java
index 37fc1fe3fc..625766186d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java
@@ -41,7 +41,7 @@ public class Q00121_PavelTheGiant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java
index b8d8fd521a..e688ef57d4 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java
@@ -41,7 +41,7 @@ public class Q00122_OminousNews extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00123_TheLeaderAndTheFollower/Q00123_TheLeaderAndTheFollower.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00123_TheLeaderAndTheFollower/Q00123_TheLeaderAndTheFollower.java
index bd0c6f6413..2c43e4ad50 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00123_TheLeaderAndTheFollower/Q00123_TheLeaderAndTheFollower.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00123_TheLeaderAndTheFollower/Q00123_TheLeaderAndTheFollower.java
@@ -68,7 +68,7 @@ public class Q00123_TheLeaderAndTheFollower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		// Manage Sponsor's quest events.
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
index 8b3f340b4a..8854b8fba5 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
@@ -46,7 +46,7 @@ public class Q00124_MeetingTheElroki extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
index 41e17ba8dd..ade81cae18 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
@@ -77,7 +77,7 @@ public class Q00125_TheNameOfEvil1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
index c880bfcd78..2cdaa0aa91 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
@@ -55,7 +55,7 @@ public class Q00126_TheNameOfEvil2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
index 0287d65c9b..af495e8918 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
@@ -82,7 +82,7 @@ public class Q00128_PailakaSongOfIceAndFire extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java
index 3039306aa8..de9946f1cb 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java
@@ -72,7 +72,7 @@ public class Q00129_PailakaDevilsLegacy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00130_PathToHellbound/Q00130_PathToHellbound.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00130_PathToHellbound/Q00130_PathToHellbound.java
index f094158f50..2f4929a057 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00130_PathToHellbound/Q00130_PathToHellbound.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00130_PathToHellbound/Q00130_PathToHellbound.java
@@ -47,7 +47,7 @@ public class Q00130_PathToHellbound extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00131_BirdInACage/Q00131_BirdInACage.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00131_BirdInACage/Q00131_BirdInACage.java
index 3755cdb942..81e790ac72 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00131_BirdInACage/Q00131_BirdInACage.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00131_BirdInACage/Q00131_BirdInACage.java
@@ -50,7 +50,7 @@ public class Q00131_BirdInACage extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00132_MatrasCuriosity/Q00132_MatrasCuriosity.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00132_MatrasCuriosity/Q00132_MatrasCuriosity.java
index 1ab48480fa..d13368abd7 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00132_MatrasCuriosity/Q00132_MatrasCuriosity.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00132_MatrasCuriosity/Q00132_MatrasCuriosity.java
@@ -52,7 +52,7 @@ public class Q00132_MatrasCuriosity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00133_ThatsBloodyHot/Q00133_ThatsBloodyHot.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00133_ThatsBloodyHot/Q00133_ThatsBloodyHot.java
index 9bc8c9a520..bed8442c56 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00133_ThatsBloodyHot/Q00133_ThatsBloodyHot.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00133_ThatsBloodyHot/Q00133_ThatsBloodyHot.java
@@ -48,7 +48,7 @@ public class Q00133_ThatsBloodyHot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player, false);
 		if (st == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
index d02e83fdc9..dd15a7621c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
@@ -72,7 +72,7 @@ public class Q00134_TempleMissionary extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
index c133b63ae4..829fb091fa 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
@@ -70,7 +70,7 @@ public class Q00135_TempleExecutor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
index 62a45e847c..7e8051404a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
@@ -82,7 +82,7 @@ public class Q00136_MoreThanMeetsTheEye extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
index e6102f64f4..bd0dee70b1 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
@@ -54,7 +54,7 @@ public class Q00137_TempleChampionPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
index 6a9e043fb3..06dd694a75 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
@@ -58,7 +58,7 @@ public class Q00138_TempleChampionPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
index 09a74b2b23..f7dac60531 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
@@ -59,7 +59,7 @@ public class Q00139_ShadowFoxPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
index 3ecaa8febe..2716250309 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
@@ -68,7 +68,7 @@ public class Q00140_ShadowFoxPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
index b0b0434b57..603e0b906a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
@@ -64,7 +64,7 @@ public class Q00141_ShadowFoxPart3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
index 64480f8bf4..d484d8ae14 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
@@ -73,7 +73,7 @@ public class Q00142_FallenAngelRequestOfDawn extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
index 789ae73b48..551a6754ce 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
@@ -52,7 +52,7 @@ public class Q00143_FallenAngelRequestOfDusk extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java
index c8caecc37b..c3c667778c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java
@@ -211,7 +211,7 @@ public class Q00144_PailakaInjuredDragon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java
index ad635e0fb9..b74329a88b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java
@@ -53,7 +53,7 @@ public class Q00146_TheZeroHour extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00147_PathtoBecominganEliteMercenary/Q00147_PathtoBecominganEliteMercenary.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00147_PathtoBecominganEliteMercenary/Q00147_PathtoBecominganEliteMercenary.java
index 9d832cf9c5..efb76542c8 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00147_PathtoBecominganEliteMercenary/Q00147_PathtoBecominganEliteMercenary.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00147_PathtoBecominganEliteMercenary/Q00147_PathtoBecominganEliteMercenary.java
@@ -54,7 +54,7 @@ public class Q00147_PathtoBecominganEliteMercenary extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00148_PathtoBecominganExaltedMercenary/Q00148_PathtoBecominganExaltedMercenary.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00148_PathtoBecominganExaltedMercenary/Q00148_PathtoBecominganExaltedMercenary.java
index 4c33ef3de9..b50119e5ea 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00148_PathtoBecominganExaltedMercenary/Q00148_PathtoBecominganExaltedMercenary.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00148_PathtoBecominganExaltedMercenary/Q00148_PathtoBecominganExaltedMercenary.java
@@ -56,7 +56,7 @@ public class Q00148_PathtoBecominganExaltedMercenary extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java
index a240da705e..d28e30d0f5 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java
@@ -57,7 +57,7 @@ public class Q00151_CureForFever extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30050-03.htm"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java
index 43fc3a219b..71756817db 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java
@@ -53,7 +53,7 @@ public class Q00152_ShardsOfGolem extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java
index 9344d7d729..b678ddd312 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java
@@ -56,7 +56,7 @@ public class Q00153_DeliverGoods extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (npc.getId() == ARNOLD_ID) && event.equalsIgnoreCase("30041-02.html"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java
index 94b22ef0a1..1cf170c291 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java
@@ -54,7 +54,7 @@ public class Q00154_SacrificeToTheSea extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30312-03.htm"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java
index c20c865df7..69262dab44 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java
@@ -46,7 +46,7 @@ public class Q00155_FindSirWindawood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30042-03.htm"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java
index 394cd0f249..035f23f1e2 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java
@@ -47,7 +47,7 @@ public class Q00156_MillenniumLove extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java
index f11efa7b02..5323786f9b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java
@@ -49,7 +49,7 @@ public class Q00157_RecoverSmuggledGoods extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java
index 3a56afa2bc..b812880fcb 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java
@@ -52,7 +52,7 @@ public class Q00158_SeedOfEvil extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30031-03.htm"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java
index 8a5cf7db64..b60bcbc93b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java
@@ -51,7 +51,7 @@ public class Q00159_ProtectTheWaterSource extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30154-04.htm"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java
index 9765b1f28f..28f138edd7 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java
@@ -53,7 +53,7 @@ public class Q00160_NerupasRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30370-04.htm"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java
index f1c59106c0..53243c9dd8 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java
@@ -47,7 +47,7 @@ public class Q00161_FruitOfTheMotherTree extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java
index 6b88e1e248..569b1bdd79 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java
@@ -66,7 +66,7 @@ public class Q00162_CurseOfTheUndergroundFortress extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java
index b6c1adcc44..dd91e12139 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java
@@ -56,7 +56,7 @@ public class Q00163_LegacyOfThePoet extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java
index 3e6b72d1e5..f3166b054e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java
@@ -51,7 +51,7 @@ public class Q00164_BloodFiend extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30149-04.htm"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java
index ba11493a6d..e879b21740 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java
@@ -61,7 +61,7 @@ public class Q00165_ShilensHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30348-03.htm"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java
index 8bf17e278c..393b7dc85f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java
@@ -62,7 +62,7 @@ public class Q00166_MassOfDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30130-03.htm"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java
index 58933ff7b5..b3fc495331 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java
@@ -47,7 +47,7 @@ public class Q00167_DwarvenKinship extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java
index c9473f0c6b..035a2f3dcc 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java
@@ -61,7 +61,7 @@ public class Q00168_DeliverSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30349-03.htm"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java
index a047aecf76..52a89940b2 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java
@@ -53,7 +53,7 @@ public class Q00169_OffspringOfNightmares extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java
index 72bebe7b84..c35fdfd9fc 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java
@@ -55,7 +55,7 @@ public class Q00170_DangerousSeduction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00171_ActsOfEvil/Q00171_ActsOfEvil.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00171_ActsOfEvil/Q00171_ActsOfEvil.java
index 435772675b..b0c0a3c978 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00171_ActsOfEvil/Q00171_ActsOfEvil.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00171_ActsOfEvil/Q00171_ActsOfEvil.java
@@ -77,7 +77,7 @@ public class Q00171_ActsOfEvil extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("DESPAWN".equals(event))
 		{
@@ -86,7 +86,7 @@ public class Q00171_ActsOfEvil extends Quest
 				npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.YOU_SHOULD_CONSIDER_GOING_BACK));
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00172_NewHorizons/Q00172_NewHorizons.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00172_NewHorizons/Q00172_NewHorizons.java
index 33ca902f59..3e1c5e5660 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00172_NewHorizons/Q00172_NewHorizons.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00172_NewHorizons/Q00172_NewHorizons.java
@@ -48,7 +48,7 @@ public class Q00172_NewHorizons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00173_ToTheIsleOfSouls/Q00173_ToTheIsleOfSouls.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00173_ToTheIsleOfSouls/Q00173_ToTheIsleOfSouls.java
index 2ea562ec76..8d76fc936c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00173_ToTheIsleOfSouls/Q00173_ToTheIsleOfSouls.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00173_ToTheIsleOfSouls/Q00173_ToTheIsleOfSouls.java
@@ -50,7 +50,7 @@ public class Q00173_ToTheIsleOfSouls extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player, false);
 		if (st == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00174_SupplyCheck/Q00174_SupplyCheck.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00174_SupplyCheck/Q00174_SupplyCheck.java
index 798cf723fe..4f0863cc53 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00174_SupplyCheck/Q00174_SupplyCheck.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00174_SupplyCheck/Q00174_SupplyCheck.java
@@ -58,7 +58,7 @@ public class Q00174_SupplyCheck extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00175_TheWayOfTheWarrior/Q00175_TheWayOfTheWarrior.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00175_TheWayOfTheWarrior/Q00175_TheWayOfTheWarrior.java
index 06ad6b05bd..af78e65c1d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00175_TheWayOfTheWarrior/Q00175_TheWayOfTheWarrior.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00175_TheWayOfTheWarrior/Q00175_TheWayOfTheWarrior.java
@@ -82,7 +82,7 @@ public class Q00175_TheWayOfTheWarrior extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00176_StepsForHonor/Q00176_StepsForHonor.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00176_StepsForHonor/Q00176_StepsForHonor.java
index 8ec3a4ad39..8935015a86 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00176_StepsForHonor/Q00176_StepsForHonor.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00176_StepsForHonor/Q00176_StepsForHonor.java
@@ -44,7 +44,7 @@ public class Q00176_StepsForHonor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("36479-04.html"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00178_IconicTrinity/Q00178_IconicTrinity.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00178_IconicTrinity/Q00178_IconicTrinity.java
index b0a6274b96..496e5a77cd 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00178_IconicTrinity/Q00178_IconicTrinity.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00178_IconicTrinity/Q00178_IconicTrinity.java
@@ -48,7 +48,7 @@ public class Q00178_IconicTrinity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java
index 07ecf7434c..e4201810b8 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java
@@ -47,7 +47,7 @@ public class Q00179_IntoTheLargeCavern extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00182_NewRecruits/Q00182_NewRecruits.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00182_NewRecruits/Q00182_NewRecruits.java
index f7dd82b895..34a5e05f20 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00182_NewRecruits/Q00182_NewRecruits.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00182_NewRecruits/Q00182_NewRecruits.java
@@ -42,7 +42,7 @@ public class Q00182_NewRecruits extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java
index 2c9337e950..cf6321781b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java
@@ -47,7 +47,7 @@ public class Q00183_RelicExploration extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java
index 56fa89ac7f..416ef1fbd8 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java
@@ -54,7 +54,7 @@ public class Q00184_ArtOfPersuasion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java
index f98dd20667..5a3e22a29c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java
@@ -54,7 +54,7 @@ public class Q00185_NikolasCooperation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java
index e02899fc82..bc04a591e4 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java
@@ -68,7 +68,7 @@ public class Q00186_ContractExecution extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java
index 9c540f6338..a2460cb6c8 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java
@@ -49,7 +49,7 @@ public class Q00187_NikolasHeart extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java
index 1c1777caec..47b0cf65fc 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java
@@ -52,7 +52,7 @@ public class Q00188_SealRemoval extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java
index 5af9afe0fd..68da52d09c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java
@@ -49,7 +49,7 @@ public class Q00189_ContractCompletion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java
index 898d20eee3..45237f5fde 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java
@@ -46,7 +46,7 @@ public class Q00190_LostDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java
index 51dcdb9b36..73aeff6756 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java
@@ -49,7 +49,7 @@ public class Q00191_VainConclusion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java
index 9dde99a2b2..ed1df833dd 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java
@@ -51,7 +51,7 @@ public class Q00192_SevenSignsSeriesOfDoubt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
index 8cc53024ec..3778a28ced 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
@@ -65,7 +65,7 @@ public class Q00193_SevenSignsDyingMessage extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == SHILENS_EVIL_THOUGHTS) && "despawn".equals(event))
 		{
@@ -75,7 +75,7 @@ public class Q00193_SevenSignsDyingMessage extends Quest
 				npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.NEXT_TIME_YOU_WILL_NOT_ESCAPE));
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
index 60d81b4d50..d01af7402f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
@@ -61,7 +61,7 @@ public class Q00194_SevenSignsMammonsContract extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java
index 5dc0abe00f..ea94075cf2 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java
@@ -60,7 +60,7 @@ public class Q00195_SevenSignsSecretRitualOfThePriests extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java
index 93e2fc75ce..09a6cac352 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java
@@ -59,14 +59,14 @@ public class Q00196_SevenSignsSealOfTheEmperor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == MERCHANT_OF_MAMMON) && "DESPAWN".equals(event))
 		{
 			isBusy = false;
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THE_ANCIENT_PROMISE_TO_THE_EMPEROR_HAS_BEEN_FULFILLED));
 			npc.deleteMe();
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
index c8b5573e3c..05a016d425 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
@@ -61,7 +61,7 @@ public class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == SHILENS_EVIL_THOUGHTS) && "despawn".equals(event))
 		{
@@ -71,7 +71,7 @@ public class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
 				npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.NEXT_TIME_YOU_WILL_NOT_ESCAPE));
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
index aa440c5fcc..f70c134b75 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
@@ -62,7 +62,7 @@ public class Q00198_SevenSignsEmbryo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == SHILENS_EVIL_THOUGHTS) && "despawn".equals(event))
 		{
@@ -72,7 +72,7 @@ public class Q00198_SevenSignsEmbryo extends Quest
 				npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.NEXT_TIME_YOU_WILL_NOT_ESCAPE));
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
index 815440aab6..f3a2519847 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
@@ -77,7 +77,7 @@ public class Q00211_TrialOfTheChallenger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
index ea0369655f..22ddca3be9 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
@@ -89,7 +89,7 @@ public class Q00212_TrialOfDuty extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
index bd86998524..c3d07faed5 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
@@ -93,7 +93,7 @@ public class Q00213_TrialOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
index c2b0547a63..5cf02ef0ea 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
@@ -121,7 +121,7 @@ public class Q00214_TrialOfTheScholar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
index c854c0907a..00442caafa 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
@@ -78,7 +78,7 @@ public class Q00215_TrialOfThePilgrim extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
index fcd69bf819..acb9b156d8 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
@@ -95,7 +95,7 @@ public class Q00216_TrialOfTheGuildsman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
index a5afc2b959..8c0e991653 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
@@ -108,7 +108,7 @@ public class Q00217_TestimonyOfTrust extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
index edbaff1a2c..48b612da55 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
@@ -105,7 +105,7 @@ public class Q00218_TestimonyOfLife extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
index ed78f8226d..2437d56625 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
@@ -108,7 +108,7 @@ public class Q00219_TestimonyOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
index f4fe1ec960..289b6fd358 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
@@ -122,7 +122,7 @@ public class Q00220_TestimonyOfGlory extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
index 769a00a789..43c68f93a8 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
@@ -125,7 +125,7 @@ public class Q00221_TestimonyOfProsperity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
index 7af8678236..6760a0ba5d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
@@ -89,7 +89,7 @@ public class Q00222_TestOfTheDuelist extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
index ea6344a844..e0e6960c39 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
@@ -86,7 +86,7 @@ public class Q00223_TestOfTheChampion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
index 6d636de9c0..e1ce8c3744 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
@@ -95,7 +95,7 @@ public class Q00224_TestOfSagittarius extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
index 890443423b..78246c87e3 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
@@ -92,7 +92,7 @@ public class Q00225_TestOfTheSearcher extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
index 50eb54694a..19311da0e3 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
@@ -83,7 +83,7 @@ public class Q00226_TestOfTheHealer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
index 5cd29dc7ec..f51f3c392e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
@@ -115,7 +115,7 @@ public class Q00227_TestOfTheReformer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("DESPAWN".equals(event))
 		{
@@ -128,7 +128,7 @@ public class Q00227_TestOfTheReformer extends Quest
 			{
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
index 4a81ed5272..a5db70327e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
@@ -100,7 +100,7 @@ public class Q00228_TestOfMagus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
index 5f6abc7ba1..35df28d2b1 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
@@ -116,7 +116,7 @@ public class Q00229_TestOfWitchcraft extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
index a24fce0d0c..bcfe0e45d5 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
@@ -164,7 +164,7 @@ public class Q00230_TestOfTheSummoner extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
index 63fa6d0a59..e18b4a29fa 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
@@ -82,7 +82,7 @@ public class Q00231_TestOfTheMaestro extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
index 3e974365a4..22efdd0ffa 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
@@ -107,7 +107,7 @@ public class Q00232_TestOfTheLord extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
index 58cc12c2fa..101e4a1a1c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
@@ -107,7 +107,7 @@ public class Q00233_TestOfTheWarSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00234_FatesWhisper/Q00234_FatesWhisper.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00234_FatesWhisper/Q00234_FatesWhisper.java
index b43478d4f9..282f86264e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00234_FatesWhisper/Q00234_FatesWhisper.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00234_FatesWhisper/Q00234_FatesWhisper.java
@@ -521,7 +521,7 @@ public class Q00234_FatesWhisper extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player == null)
 		{
@@ -529,7 +529,7 @@ public class Q00234_FatesWhisper extends Quest
 			{
 				npc.decayMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java
index 571fe61e80..16a7def3a3 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java
@@ -77,7 +77,7 @@ public class Q00235_MimirsElixir extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00236_SeedsOfChaos/Q00236_SeedsOfChaos.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00236_SeedsOfChaos/Q00236_SeedsOfChaos.java
index ee3badb2ec..3c7440a127 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00236_SeedsOfChaos/Q00236_SeedsOfChaos.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00236_SeedsOfChaos/Q00236_SeedsOfChaos.java
@@ -83,7 +83,7 @@ public class Q00236_SeedsOfChaos extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("KATENAR_120".equals(event))
 		{
@@ -98,7 +98,7 @@ public class Q00236_SeedsOfChaos extends Quest
 				}
 			}
 			npc.deleteMe();
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		else if ("HARKILGAMED_120".equals(event))
 		{
@@ -109,7 +109,7 @@ public class Q00236_SeedsOfChaos extends Quest
 				npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.GRAAAH_WE_RE_BEING_ATTACKED));
 			}
 			npc.deleteMe();
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		else if ("KATENAR_A_120".equals(event))
 		{
@@ -124,7 +124,7 @@ public class Q00236_SeedsOfChaos extends Quest
 				}
 			}
 			npc.deleteMe();
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		else if ("KATENAR_B_120".equals(event))
 		{
@@ -139,7 +139,7 @@ public class Q00236_SeedsOfChaos extends Quest
 				}
 			}
 			npc.deleteMe();
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		else if ("HARKILGAMED_A_120".equals(event))
 		{
@@ -150,7 +150,7 @@ public class Q00236_SeedsOfChaos extends Quest
 				npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.GRAAAH_WE_RE_BEING_ATTACKED));
 			}
 			npc.deleteMe();
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java
index 05f00b6b3e..82556b88f9 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java
@@ -57,7 +57,7 @@ public class Q00237_WindsOfChange extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java
index 740d2f70bc..605ce357c4 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java
@@ -59,7 +59,7 @@ public class Q00238_SuccessFailureOfBusiness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java
index 8c55af7cc8..b51f27b861 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java
@@ -59,7 +59,7 @@ public class Q00239_WontYouJoinUs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
index dcce59b42a..49900443cc 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
@@ -65,7 +65,7 @@ public class Q00240_ImTheOnlyOneYouCanTrust extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00241_PossessorOfAPreciousSoul1/Q00241_PossessorOfAPreciousSoul1.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00241_PossessorOfAPreciousSoul1/Q00241_PossessorOfAPreciousSoul1.java
index 872215e1d9..c47b8bcb41 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00241_PossessorOfAPreciousSoul1/Q00241_PossessorOfAPreciousSoul1.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00241_PossessorOfAPreciousSoul1/Q00241_PossessorOfAPreciousSoul1.java
@@ -83,7 +83,7 @@ public class Q00241_PossessorOfAPreciousSoul1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00242_PossessorOfAPreciousSoul2/Q00242_PossessorOfAPreciousSoul2.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00242_PossessorOfAPreciousSoul2/Q00242_PossessorOfAPreciousSoul2.java
index 9a8ebbcba2..eb1f1b49d9 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00242_PossessorOfAPreciousSoul2/Q00242_PossessorOfAPreciousSoul2.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00242_PossessorOfAPreciousSoul2/Q00242_PossessorOfAPreciousSoul2.java
@@ -64,7 +64,7 @@ public class Q00242_PossessorOfAPreciousSoul2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player, false);
 		if (st == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/Q00246_PossessorOfAPreciousSoul3.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/Q00246_PossessorOfAPreciousSoul3.java
index 32587a4ab1..560c175498 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/Q00246_PossessorOfAPreciousSoul3.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/Q00246_PossessorOfAPreciousSoul3.java
@@ -63,7 +63,7 @@ public class Q00246_PossessorOfAPreciousSoul3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java
index 4a5ae879c6..08f4f2f6a3 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java
@@ -53,7 +53,7 @@ public class Q00247_PossessorOfAPreciousSoul4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player, false);
 		if (st == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
index 40ba0e80cc..362f958893 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
@@ -167,7 +167,7 @@ public class Q00255_Tutorial extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (Config.DISABLE_TUTORIAL)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
index 4cace7d1a2..e01e9995cd 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
@@ -89,7 +89,7 @@ public class Q00257_TheGuardIsBusy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
index 349552a2d2..f29b1e58dc 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
@@ -67,7 +67,7 @@ public class Q00258_BringWolfPelts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30001-03.html"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
index b73a6d5434..89cccb77f7 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
@@ -69,7 +69,7 @@ public class Q00259_RequestFromTheFarmOwner extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
index 0204fc63a6..672bd43039 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
@@ -64,7 +64,7 @@ public class Q00260_OrcHunting extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
index 3d6c259a32..9b88efce3a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
@@ -60,7 +60,7 @@ public class Q00261_CollectorsDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30222-03.htm"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
index 72060b844a..911d5db955 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
@@ -58,7 +58,7 @@ public class Q00262_TradeWithTheIvoryTower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30137-03.htm"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
index 4c3a2994c4..8c024cb1b4 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
@@ -60,7 +60,7 @@ public class Q00263_OrcSubjugation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
index 4913af2ed7..d4f27c7859 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
@@ -71,7 +71,7 @@ public class Q00264_KeenClaws extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30136-03.htm"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
index 6c3b72ea52..d9a0dcc9fb 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
@@ -59,7 +59,7 @@ public class Q00265_BondsOfSlavery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
index 449d112ee5..530eb8ff66 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
@@ -71,7 +71,7 @@ public class Q00266_PleasOfPixies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("31852-04.htm"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
index e13d3cbc29..b10947fb13 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
@@ -51,7 +51,7 @@ public class Q00267_WrathOfVerdure extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00268_TracesOfEvil/Q00268_TracesOfEvil.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00268_TracesOfEvil/Q00268_TracesOfEvil.java
index 3cb6c30c09..3e5963bcce 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00268_TracesOfEvil/Q00268_TracesOfEvil.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00268_TracesOfEvil/Q00268_TracesOfEvil.java
@@ -53,7 +53,7 @@ public class Q00268_TracesOfEvil extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30559-03.htm"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00269_InventionAmbition/Q00269_InventionAmbition.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00269_InventionAmbition/Q00269_InventionAmbition.java
index 39c418004c..cedbe3be04 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00269_InventionAmbition/Q00269_InventionAmbition.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00269_InventionAmbition/Q00269_InventionAmbition.java
@@ -60,7 +60,7 @@ public class Q00269_InventionAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
index 5f3a7d1b59..e2c1a2370c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
@@ -53,7 +53,7 @@ public class Q00271_ProofOfValor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30577-04.htm"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
index c15555b8ee..e1169a3744 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
@@ -53,7 +53,7 @@ public class Q00272_WrathOfAncestors extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30572-04.htm"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
index e296ea9dcf..1791246d1e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
@@ -61,7 +61,7 @@ public class Q00273_InvadersOfTheHolyLand extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
index 0480cbcebc..883fbb09b5 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
@@ -56,7 +56,7 @@ public class Q00274_SkirmishWithTheWerewolves extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30569-04.htm"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
index dd3d36432f..b90eb32efb 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
@@ -58,7 +58,7 @@ public class Q00275_DarkWingedSpies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30567-03.htm"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
index f56e6c8c4b..db7ce6e965 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
@@ -73,7 +73,7 @@ public class Q00276_TotemOfTheHestui extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30571-03.htm"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
index 2e53cd451a..d52841a261 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
@@ -50,7 +50,7 @@ public class Q00277_GatekeepersOffering extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30576-03.htm"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00280_TheFoodChain/Q00280_TheFoodChain.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00280_TheFoodChain/Q00280_TheFoodChain.java
index 08a83016df..d9ad6998d9 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00280_TheFoodChain/Q00280_TheFoodChain.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00280_TheFoodChain/Q00280_TheFoodChain.java
@@ -80,7 +80,7 @@ public class Q00280_TheFoodChain extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00281_HeadForTheHills/Q00281_HeadForTheHills.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00281_HeadForTheHills/Q00281_HeadForTheHills.java
index 0c77fc2bdc..bdce4c5f31 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00281_HeadForTheHills/Q00281_HeadForTheHills.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00281_HeadForTheHills/Q00281_HeadForTheHills.java
@@ -82,7 +82,7 @@ public class Q00281_HeadForTheHills extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00283_TheFewTheProudTheBrave/Q00283_TheFewTheProudTheBrave.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00283_TheFewTheProudTheBrave/Q00283_TheFewTheProudTheBrave.java
index 94b0167b66..bfdb799bee 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00283_TheFewTheProudTheBrave/Q00283_TheFewTheProudTheBrave.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00283_TheFewTheProudTheBrave/Q00283_TheFewTheProudTheBrave.java
@@ -51,7 +51,7 @@ public class Q00283_TheFewTheProudTheBrave extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00284_MuertosFeather/Q00284_MuertosFeather.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00284_MuertosFeather/Q00284_MuertosFeather.java
index abdbbe15b0..938a8bacc5 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00284_MuertosFeather/Q00284_MuertosFeather.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00284_MuertosFeather/Q00284_MuertosFeather.java
@@ -58,7 +58,7 @@ public class Q00284_MuertosFeather extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00286_FabulousFeathers/Q00286_FabulousFeathers.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00286_FabulousFeathers/Q00286_FabulousFeathers.java
index 670e15dfb0..b22f4e91c8 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00286_FabulousFeathers/Q00286_FabulousFeathers.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00286_FabulousFeathers/Q00286_FabulousFeathers.java
@@ -58,7 +58,7 @@ public class Q00286_FabulousFeathers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java
index 8754cae8da..9948cc729a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java
@@ -55,7 +55,7 @@ public class Q00291_RevengeOfTheRedbonnet extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30553-03.htm"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
index 9e57902a97..7cb45dbf79 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
@@ -67,7 +67,7 @@ public class Q00292_BrigandsSweep extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
index cc505d68d9..65960e222d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
@@ -60,7 +60,7 @@ public class Q00293_TheHiddenVeins extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
index c1786e8ce1..41c4e86956 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
@@ -61,7 +61,7 @@ public class Q00294_CovertBusiness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && qs.isCreated() && event.equals("30534-03.htm"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
index 6654b224e3..f1878ade15 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
@@ -50,7 +50,7 @@ public class Q00295_DreamingOfTheSkies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && qs.isCreated() && event.equals("30536-03.htm"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
index 60fa141c6f..f961d5d6e9 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
@@ -57,7 +57,7 @@ public class Q00296_TarantulasSpiderSilk extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
index f590a64408..b02acb7619 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
@@ -50,7 +50,7 @@ public class Q00297_GatekeepersFavor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30540-03.htm"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00298_LizardmensConspiracy/Q00298_LizardmensConspiracy.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00298_LizardmensConspiracy/Q00298_LizardmensConspiracy.java
index 109abb2b77..22db6c8cfd 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00298_LizardmensConspiracy/Q00298_LizardmensConspiracy.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00298_LizardmensConspiracy/Q00298_LizardmensConspiracy.java
@@ -61,7 +61,7 @@ public class Q00298_LizardmensConspiracy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00299_GatherIngredientsForPie/Q00299_GatherIngredientsForPie.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00299_GatherIngredientsForPie/Q00299_GatherIngredientsForPie.java
index a4ffab6332..879ff2c81c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00299_GatherIngredientsForPie/Q00299_GatherIngredientsForPie.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00299_GatherIngredientsForPie/Q00299_GatherIngredientsForPie.java
@@ -69,7 +69,7 @@ public class Q00299_GatherIngredientsForPie extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
index 3943418fea..7c9deae4a0 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
@@ -65,7 +65,7 @@ public class Q00300_HuntingLetoLizardman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
index 21fef8b45e..216dcce123 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
@@ -48,7 +48,7 @@ public class Q00303_CollectArrowheads extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30029-04.htm"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
index 19e65e9bf2..778c7a5dc9 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
@@ -64,7 +64,7 @@ public class Q00306_CrystalOfFireAndIce extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java
index 3a4adf92be..766ab9c6e9 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java
@@ -56,7 +56,7 @@ public class Q00307_ControlDeviceOfTheGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java
index 9687e2ae81..17ec8074af 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java
@@ -126,7 +126,7 @@ public class Q00308_ReedFieldMaintenance extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java
index 2eaebcf4b7..904ec9d447 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java
@@ -126,7 +126,7 @@ public class Q00309_ForAGoodCause extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
index 785be8bf02..06d18eb341 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
@@ -74,7 +74,7 @@ public class Q00310_OnlyWhatRemains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java
index 8669a051f0..b8e5b6706f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java
@@ -113,7 +113,7 @@ public class Q00311_ExpulsionOfEvilSpirits extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("altarSpawn"))
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00312_TakeAdvantageOfTheCrisis/Q00312_TakeAdvantageOfTheCrisis.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00312_TakeAdvantageOfTheCrisis/Q00312_TakeAdvantageOfTheCrisis.java
index 4be108eb0f..fa748a7f09 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00312_TakeAdvantageOfTheCrisis/Q00312_TakeAdvantageOfTheCrisis.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00312_TakeAdvantageOfTheCrisis/Q00312_TakeAdvantageOfTheCrisis.java
@@ -67,7 +67,7 @@ public class Q00312_TakeAdvantageOfTheCrisis extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
index 6e19acd351..4fd45f8409 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
@@ -50,7 +50,7 @@ public class Q00313_CollectSpores extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
index c613b7c828..1cbb69afdc 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
@@ -69,7 +69,7 @@ public class Q00316_DestroyPlagueCarriers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
index d2db838ce7..e3d1c94b12 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
@@ -51,7 +51,7 @@ public class Q00317_CatchTheWind extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
index 2d4fbe620e..6c1a7bcaaf 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
@@ -55,7 +55,7 @@ public class Q00319_ScentOfDeath extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
index 774e1b3171..9993470d72 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
@@ -54,7 +54,7 @@ public class Q00320_BonesTellTheFuture extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30359-04.htm"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
index 6d1214f8b9..e28e631ab3 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
@@ -59,7 +59,7 @@ public class Q00324_SweetestVenom extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
index ceec5e89ef..0ed26a2bc0 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
@@ -79,7 +79,7 @@ public class Q00325_GrimCollector extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
index 83f7f45061..3aeacae982 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
@@ -68,7 +68,7 @@ public class Q00326_VanquishRemnants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
index d10d303014..d517ec9d48 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
@@ -104,7 +104,7 @@ public class Q00327_RecoverTheFarmland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
index b9d073f735..2325ba4a99 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
@@ -70,7 +70,7 @@ public class Q00328_SenseForBusiness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
index fc90718f84..84693f6838 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
@@ -61,7 +61,7 @@ public class Q00329_CuriosityOfADwarf extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00330_AdeptOfTaste/Q00330_AdeptOfTaste.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00330_AdeptOfTaste/Q00330_AdeptOfTaste.java
index 6e78cbebb5..732dc94d7e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00330_AdeptOfTaste/Q00330_AdeptOfTaste.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00330_AdeptOfTaste/Q00330_AdeptOfTaste.java
@@ -100,7 +100,7 @@ public class Q00330_AdeptOfTaste extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
index 0d0211ac6d..1931fa3185 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
@@ -64,7 +64,7 @@ public class Q00331_ArrowOfVengeance extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
index 41125ce007..52461364ce 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
@@ -120,7 +120,7 @@ public class Q00333_HuntOfTheBlackLion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		final int chance = getRandom(100);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00334_TheWishingPotion/Q00334_TheWishingPotion.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00334_TheWishingPotion/Q00334_TheWishingPotion.java
index 8bed894d71..4ecd1abdc7 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00334_TheWishingPotion/Q00334_TheWishingPotion.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00334_TheWishingPotion/Q00334_TheWishingPotion.java
@@ -377,7 +377,7 @@ public class Q00334_TheWishingPotion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (npc.getId())
 		{
@@ -698,7 +698,7 @@ public class Q00334_TheWishingPotion extends Quest
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java
index bf8ee18bed..082eb2e2bd 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java
@@ -600,7 +600,7 @@ public class Q00335_TheSongOfTheHunter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java
index 8148fc304c..8c50978043 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java
@@ -265,7 +265,7 @@ public class Q00336_CoinsOfMagic extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
index d726b24a3b..d803e38577 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
@@ -92,17 +92,17 @@ public class Q00337_AudienceWithTheLandDragon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("DESPAWN".equals(event))
 		{
 			npc.deleteMe();
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		else if ("DESPAWN_240".equals(event))
 		{
 			npc.deleteMe();
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java
index 6c33c83b9f..21af30f204 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java
@@ -53,7 +53,7 @@ public class Q00338_AlligatorHunter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/Q00340_SubjugationOfLizardmen.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/Q00340_SubjugationOfLizardmen.java
index b96a6e5dc7..be6e1f72d9 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/Q00340_SubjugationOfLizardmen.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/Q00340_SubjugationOfLizardmen.java
@@ -62,7 +62,7 @@ public class Q00340_SubjugationOfLizardmen extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java
index e4fff374d3..1afee42276 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java
@@ -60,7 +60,7 @@ public class Q00341_HuntingForWildBeasts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00343_UnderTheShadowOfTheIvoryTower/Q00343_UnderTheShadowOfTheIvoryTower.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00343_UnderTheShadowOfTheIvoryTower/Q00343_UnderTheShadowOfTheIvoryTower.java
index 6f8f282fd3..48275e5486 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00343_UnderTheShadowOfTheIvoryTower/Q00343_UnderTheShadowOfTheIvoryTower.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00343_UnderTheShadowOfTheIvoryTower/Q00343_UnderTheShadowOfTheIvoryTower.java
@@ -68,7 +68,7 @@ public class Q00343_UnderTheShadowOfTheIvoryTower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
index b686034d10..56d1080237 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
@@ -84,7 +84,7 @@ public class Q00344_1000YearsTheEndOfLamentation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00345_MethodToRaiseTheDead/Q00345_MethodToRaiseTheDead.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00345_MethodToRaiseTheDead/Q00345_MethodToRaiseTheDead.java
index a52d09e8a0..550d304632 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00345_MethodToRaiseTheDead/Q00345_MethodToRaiseTheDead.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00345_MethodToRaiseTheDead/Q00345_MethodToRaiseTheDead.java
@@ -62,7 +62,7 @@ public class Q00345_MethodToRaiseTheDead extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00347_GoGetTheCalculator/Q00347_GoGetTheCalculator.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00347_GoGetTheCalculator/Q00347_GoGetTheCalculator.java
index ae59704aea..d7a65900a2 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00347_GoGetTheCalculator/Q00347_GoGetTheCalculator.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00347_GoGetTheCalculator/Q00347_GoGetTheCalculator.java
@@ -55,7 +55,7 @@ public class Q00347_GoGetTheCalculator extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java
index dc6716c26b..ea1e9c4a18 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java
@@ -118,7 +118,7 @@ public class Q00348_AnArrogantSearch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (npc.getId())
 		{
@@ -129,7 +129,7 @@ public class Q00348_AnArrogantSearch extends Quest
 				if ("DESPAWN".equals(event))
 				{
 					npc.deleteMe();
-					return super.onAdvEvent(event, npc, player);
+					return super.onEvent(event, npc, player);
 				}
 			}
 		}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java
index bd5eee4b73..15223e15ab 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java
@@ -149,7 +149,7 @@ public class Q00350_EnhanceYourWeapon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00351_BlackSwan/Q00351_BlackSwan.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00351_BlackSwan/Q00351_BlackSwan.java
index 6aadb34694..d27e31af61 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00351_BlackSwan/Q00351_BlackSwan.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00351_BlackSwan/Q00351_BlackSwan.java
@@ -69,7 +69,7 @@ public class Q00351_BlackSwan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00352_HelpRoodRaiseANewPet/Q00352_HelpRoodRaiseANewPet.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00352_HelpRoodRaiseANewPet/Q00352_HelpRoodRaiseANewPet.java
index 741cf0b67d..fb6b64ef24 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00352_HelpRoodRaiseANewPet/Q00352_HelpRoodRaiseANewPet.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00352_HelpRoodRaiseANewPet/Q00352_HelpRoodRaiseANewPet.java
@@ -80,7 +80,7 @@ public class Q00352_HelpRoodRaiseANewPet extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
index 111b91d5d5..4260e24965 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
@@ -62,7 +62,7 @@ public class Q00354_ConquestOfAlligatorIsland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
index 3f3ae82983..18551926c1 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
@@ -86,7 +86,7 @@ public class Q00355_FamilyHonor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
index 59e09f8a1c..680784ec3e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
@@ -59,7 +59,7 @@ public class Q00356_DigUpTheSeaOfSpores extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00357_WarehouseKeepersAmbition/Q00357_WarehouseKeepersAmbition.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00357_WarehouseKeepersAmbition/Q00357_WarehouseKeepersAmbition.java
index 26cdd98b6e..550ba52e5f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00357_WarehouseKeepersAmbition/Q00357_WarehouseKeepersAmbition.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00357_WarehouseKeepersAmbition/Q00357_WarehouseKeepersAmbition.java
@@ -56,7 +56,7 @@ public class Q00357_WarehouseKeepersAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
index 91790c773b..6713ec63a8 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
@@ -67,7 +67,7 @@ public class Q00358_IllegitimateChildOfTheGoddess extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/Q00359_ForASleeplessDeadman.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/Q00359_ForASleeplessDeadman.java
index 7aa4b8230d..3fd92e9fd2 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/Q00359_ForASleeplessDeadman.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/Q00359_ForASleeplessDeadman.java
@@ -68,7 +68,7 @@ public class Q00359_ForASleeplessDeadman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
index 107381beb4..df600d4e34 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
@@ -60,7 +60,7 @@ public class Q00360_PlunderTheirSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00362_BardsMandolin/Q00362_BardsMandolin.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00362_BardsMandolin/Q00362_BardsMandolin.java
index f47937e589..cabcbce0a5 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00362_BardsMandolin/Q00362_BardsMandolin.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00362_BardsMandolin/Q00362_BardsMandolin.java
@@ -49,7 +49,7 @@ public class Q00362_BardsMandolin extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/Q00363_SorrowfulSoundOfFlute.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/Q00363_SorrowfulSoundOfFlute.java
index 78dcf46527..b2c56f0186 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/Q00363_SorrowfulSoundOfFlute.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/Q00363_SorrowfulSoundOfFlute.java
@@ -54,7 +54,7 @@ public class Q00363_SorrowfulSoundOfFlute extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00364_JovialAccordion/Q00364_JovialAccordion.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00364_JovialAccordion/Q00364_JovialAccordion.java
index e22ddba98c..a0070115a5 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00364_JovialAccordion/Q00364_JovialAccordion.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00364_JovialAccordion/Q00364_JovialAccordion.java
@@ -54,7 +54,7 @@ public class Q00364_JovialAccordion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00365_DevilsLegacy/Q00365_DevilsLegacy.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00365_DevilsLegacy/Q00365_DevilsLegacy.java
index 7bce7c1145..b63b62d4bb 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00365_DevilsLegacy/Q00365_DevilsLegacy.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00365_DevilsLegacy/Q00365_DevilsLegacy.java
@@ -73,7 +73,7 @@ public class Q00365_DevilsLegacy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00366_SilverHairedShaman/Q00366_SilverHairedShaman.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00366_SilverHairedShaman/Q00366_SilverHairedShaman.java
index 09c295ec3f..fd9a198de3 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00366_SilverHairedShaman/Q00366_SilverHairedShaman.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00366_SilverHairedShaman/Q00366_SilverHairedShaman.java
@@ -62,7 +62,7 @@ public class Q00366_SilverHairedShaman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00367_ElectrifyingRecharge/Q00367_ElectrifyingRecharge.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00367_ElectrifyingRecharge/Q00367_ElectrifyingRecharge.java
index f0b33abc5d..771f547da1 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00367_ElectrifyingRecharge/Q00367_ElectrifyingRecharge.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00367_ElectrifyingRecharge/Q00367_ElectrifyingRecharge.java
@@ -56,7 +56,7 @@ public class Q00367_ElectrifyingRecharge extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00368_TrespassingIntoTheHolyGround/Q00368_TrespassingIntoTheHolyGround.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00368_TrespassingIntoTheHolyGround/Q00368_TrespassingIntoTheHolyGround.java
index a758b7b060..27b1ac775a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00368_TrespassingIntoTheHolyGround/Q00368_TrespassingIntoTheHolyGround.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00368_TrespassingIntoTheHolyGround/Q00368_TrespassingIntoTheHolyGround.java
@@ -56,7 +56,7 @@ public class Q00368_TrespassingIntoTheHolyGround extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
index b64060d4a9..7cade314ff 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
@@ -67,7 +67,7 @@ public class Q00369_CollectorOfJewels extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
index 6548e9f525..e1a060c960 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
@@ -70,7 +70,7 @@ public class Q00370_AnElderSowsSeeds extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java
index ecafd068bc..cc64a9e94a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java
@@ -85,7 +85,7 @@ public class Q00371_ShrieksOfGhosts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00372_LegacyOfInsolence/Q00372_LegacyOfInsolence.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00372_LegacyOfInsolence/Q00372_LegacyOfInsolence.java
index 1bccc6f298..0a29fe3c57 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00372_LegacyOfInsolence/Q00372_LegacyOfInsolence.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00372_LegacyOfInsolence/Q00372_LegacyOfInsolence.java
@@ -125,13 +125,13 @@ public class Q00372_LegacyOfInsolence extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		final int chance = getRandom(100);
 		if (qs == null)
 		{
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java
index 128f361fc9..55a6ba1046 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java
@@ -155,7 +155,7 @@ public class Q00373_SupplierOfReagents extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java
index 6093a4ca76..a75c11571b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java
@@ -64,7 +64,7 @@ public class Q00376_ExplorationOfTheGiantsCavePart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java
index 44023b8d90..5c67a1bd39 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java
@@ -68,7 +68,7 @@ public class Q00377_ExplorationOfTheGiantsCavePart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00378_GrandFeast/Q00378_GrandFeast.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00378_GrandFeast/Q00378_GrandFeast.java
index 4088dab52d..73d386991f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00378_GrandFeast/Q00378_GrandFeast.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00378_GrandFeast/Q00378_GrandFeast.java
@@ -57,7 +57,7 @@ public class Q00378_GrandFeast extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00379_FantasyWine/Q00379_FantasyWine.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00379_FantasyWine/Q00379_FantasyWine.java
index 39eb315693..11a294a2fa 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00379_FantasyWine/Q00379_FantasyWine.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00379_FantasyWine/Q00379_FantasyWine.java
@@ -54,7 +54,7 @@ public class Q00379_FantasyWine extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00380_BringOutTheFlavorOfIngredients/Q00380_BringOutTheFlavorOfIngredients.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00380_BringOutTheFlavorOfIngredients/Q00380_BringOutTheFlavorOfIngredients.java
index 513ad963a8..c8881d12b3 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00380_BringOutTheFlavorOfIngredients/Q00380_BringOutTheFlavorOfIngredients.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00380_BringOutTheFlavorOfIngredients/Q00380_BringOutTheFlavorOfIngredients.java
@@ -64,7 +64,7 @@ public class Q00380_BringOutTheFlavorOfIngredients extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java
index aaa64cbee9..d7a4d19542 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java
@@ -56,7 +56,7 @@ public class Q00381_LetsBecomeARoyalMember extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00382_KailsMagicCoin/Q00382_KailsMagicCoin.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00382_KailsMagicCoin/Q00382_KailsMagicCoin.java
index 01879be71f..576196f002 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00382_KailsMagicCoin/Q00382_KailsMagicCoin.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00382_KailsMagicCoin/Q00382_KailsMagicCoin.java
@@ -67,7 +67,7 @@ public class Q00382_KailsMagicCoin extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00383_TreasureHunt/Q00383_TreasureHunt.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00383_TreasureHunt/Q00383_TreasureHunt.java
index bcb4c3f5e9..43e44178e0 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00383_TreasureHunt/Q00383_TreasureHunt.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00383_TreasureHunt/Q00383_TreasureHunt.java
@@ -73,7 +73,7 @@ public class Q00383_TreasureHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java
index fb04492f02..6b72e4a8d3 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java
@@ -137,7 +137,7 @@ public class Q00384_WarehouseKeepersPastime extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null))
@@ -332,7 +332,7 @@ public class Q00384_WarehouseKeepersPastime extends Quest
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private String takeHtml(Player player, QuestState qs, int num, int npcId)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00385_YokeOfThePast/Q00385_YokeOfThePast.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00385_YokeOfThePast/Q00385_YokeOfThePast.java
index a233ee52cb..d7cbfab3cc 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00385_YokeOfThePast/Q00385_YokeOfThePast.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00385_YokeOfThePast/Q00385_YokeOfThePast.java
@@ -106,7 +106,7 @@ public class Q00385_YokeOfThePast extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
index 52d23ae640..33309a5251 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
@@ -134,7 +134,7 @@ public class Q00386_StolenDignity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (npc.getId() == WAREHOUSE_KEEPER_ROMP))
@@ -269,7 +269,7 @@ public class Q00386_StolenDignity extends Quest
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private String takeHtml(Player player, QuestState qs, int num)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
index f1c0f1c51c..386614d570 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
@@ -65,7 +65,7 @@ public class Q00401_PathOfTheWarrior extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
index 92917c0f79..54988dc2bd 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
@@ -90,7 +90,7 @@ public class Q00402_PathOfTheHumanKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
index 96df9535e4..5a3cb474d6 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
@@ -93,7 +93,7 @@ public class Q00403_PathOfTheRogue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
index 16eb6d7a7f..2607758ac3 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
@@ -72,7 +72,7 @@ public class Q00404_PathOfTheHumanWizard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
index aa393026d9..5cc5457036 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
@@ -68,7 +68,7 @@ public class Q00405_PathOfTheCleric extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
index 7fea7e6aae..8d7be782d3 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
@@ -73,7 +73,7 @@ public class Q00406_PathOfTheElvenKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
index 248e27298e..51605f1851 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
@@ -67,7 +67,7 @@ public class Q00407_PathOfTheElvenScout extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
index 86e1180a03..2769e78748 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
@@ -70,7 +70,7 @@ public class Q00408_PathOfTheElvenWizard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
index 5ac126c170..1de79fa94f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
@@ -66,7 +66,7 @@ public class Q00409_PathOfTheElvenOracle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
index f76749bb55..445a1bf24e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
@@ -62,7 +62,7 @@ public class Q00410_PathOfThePalusKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
index b8b05acfb7..1d10d8515a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
@@ -62,7 +62,7 @@ public class Q00411_PathOfTheAssassin extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
index ea690a4132..f87eb94d47 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
@@ -69,7 +69,7 @@ public class Q00412_PathOfTheDarkWizard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
index 301e9df582..163d0f68f0 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
@@ -66,7 +66,7 @@ public class Q00413_PathOfTheShillienOracle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
index 5202f6f943..bba233ec8f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
@@ -65,7 +65,7 @@ public class Q00414_PathOfTheOrcRaider extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
index ebfc7d19db..61d591cda9 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
@@ -92,7 +92,7 @@ public class Q00415_PathOfTheOrcMonk extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
index 1cc968a42d..d03cf805c8 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
@@ -91,7 +91,7 @@ public class Q00416_PathOfTheOrcShaman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
index 3aa5b8e282..29711af625 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
@@ -86,7 +86,7 @@ public class Q00417_PathOfTheScavenger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
index 84c128e1b7..39ccc3ecb2 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
@@ -69,7 +69,7 @@ public class Q00418_PathOfTheArtisan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00419_GetAPet/Q00419_GetAPet.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00419_GetAPet/Q00419_GetAPet.java
index 8baa75a6c0..d150078a0c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00419_GetAPet/Q00419_GetAPet.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00419_GetAPet/Q00419_GetAPet.java
@@ -159,7 +159,7 @@ public class Q00419_GetAPet extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
index a5df1b36af..b96364d059 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
@@ -129,7 +129,7 @@ public class Q00420_LittleWing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
index 3cf86b0f08..d15d303e0c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
@@ -86,7 +86,7 @@ public class Q00421_LittleWingsBigAdventure extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("DESPAWN_GUARDIAN".equals(event))
 		{
@@ -94,7 +94,7 @@ public class Q00421_LittleWingsBigAdventure extends Quest
 			{
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java
index 24f72ee7db..ced6e9a1c4 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java
@@ -71,7 +71,7 @@ public class Q00422_RepentYourSins extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java
index 3f2f97d13b..2f049999bc 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java
@@ -352,7 +352,7 @@ public class Q00426_QuestForFishingShot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java
index d613c05f91..c830993f7d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java
@@ -55,7 +55,7 @@ public class Q00431_WeddingMarch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java
index 6cee1f8c34..c7fa82395d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java
@@ -49,7 +49,7 @@ public class Q00432_BirthdayPartySong extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
index 6a80076f67..f80d8c3aa8 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
@@ -55,7 +55,7 @@ public class Q00450_GraveRobberRescue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
index acc42d2006..e2d884c7d5 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
@@ -57,7 +57,7 @@ public class Q00451_LuciensAltar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java
index 02257e1329..3a123f2dfa 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java
@@ -106,7 +106,7 @@ public class Q00501_ProofOfClanAlliance extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java
index 1496baa0e7..fa050bef5e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java
@@ -85,7 +85,7 @@ public class Q00503_PursuitOfClanAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java
index 55a5f4b621..fcaaec140c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java
@@ -64,7 +64,7 @@ public class Q00504_CompetitionForTheBanditStronghold extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
index 865eb0b656..306dcf6bd0 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
@@ -74,7 +74,7 @@ public class Q00508_AClansReputation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
index 150c95ef9f..c204113005 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
@@ -69,7 +69,7 @@ public class Q00509_AClansFame extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
index ad478b5c25..f9373ef6ee 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
@@ -55,7 +55,7 @@ public class Q00510_AClansPrestige extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
index 80fd1e12b9..1db5bc0577 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
@@ -318,7 +318,7 @@ public class Q00511_AwlUnderFoot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		if (event.equalsIgnoreCase("enter"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
index 8a663cc71b..c240f04a79 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
@@ -113,7 +113,7 @@ public class Q00512_BladeUnderFoot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java
index 9de82dd8fc..c49c8a0c3c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java
@@ -79,7 +79,7 @@ public class Q00601_WatchingEyes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java
index e1e010dc93..94cc0e5ef5 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java
@@ -80,7 +80,7 @@ public class Q00602_ShadowOfLight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00603_DaimonTheWhiteEyedPart1/Q00603_DaimonTheWhiteEyedPart1.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00603_DaimonTheWhiteEyedPart1/Q00603_DaimonTheWhiteEyedPart1.java
index 66fe3736a5..a14e8907a1 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00603_DaimonTheWhiteEyedPart1/Q00603_DaimonTheWhiteEyedPart1.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00603_DaimonTheWhiteEyedPart1/Q00603_DaimonTheWhiteEyedPart1.java
@@ -64,7 +64,7 @@ public class Q00603_DaimonTheWhiteEyedPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java
index fbca15fd0e..26a50bd354 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java
@@ -69,7 +69,7 @@ public class Q00604_DaimonTheWhiteEyedPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("DESPAWN".equals(event))
 		{
@@ -78,7 +78,7 @@ public class Q00604_DaimonTheWhiteEyedPart2 extends Quest
 				npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getTemplate().getDisplayId(), NpcStringId.CAN_LIGHT_EXIST_WITHOUT_DARKNESS));
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java
index 413f9861ce..66664f1140 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java
@@ -189,7 +189,7 @@ public class Q00605_AllianceWithKetraOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java
index 959228be25..5c1a23e6d1 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java
@@ -71,7 +71,7 @@ public class Q00606_BattleAgainstVarkaSilenos extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00607_ProveYourCourageKetra/Q00607_ProveYourCourageKetra.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00607_ProveYourCourageKetra/Q00607_ProveYourCourageKetra.java
index 15eba2362e..4bcf994e80 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00607_ProveYourCourageKetra/Q00607_ProveYourCourageKetra.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00607_ProveYourCourageKetra/Q00607_ProveYourCourageKetra.java
@@ -62,7 +62,7 @@ public class Q00607_ProveYourCourageKetra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00608_SlayTheEnemyCommanderKetra/Q00608_SlayTheEnemyCommanderKetra.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00608_SlayTheEnemyCommanderKetra/Q00608_SlayTheEnemyCommanderKetra.java
index d172d7c670..abd7afb8fd 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00608_SlayTheEnemyCommanderKetra/Q00608_SlayTheEnemyCommanderKetra.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00608_SlayTheEnemyCommanderKetra/Q00608_SlayTheEnemyCommanderKetra.java
@@ -62,7 +62,7 @@ public class Q00608_SlayTheEnemyCommanderKetra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00609_MagicalPowerOfWaterPart1/Q00609_MagicalPowerOfWaterPart1.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00609_MagicalPowerOfWaterPart1/Q00609_MagicalPowerOfWaterPart1.java
index ce3357dbcc..c369c79051 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00609_MagicalPowerOfWaterPart1/Q00609_MagicalPowerOfWaterPart1.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00609_MagicalPowerOfWaterPart1/Q00609_MagicalPowerOfWaterPart1.java
@@ -91,7 +91,7 @@ public class Q00609_MagicalPowerOfWaterPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java
index cc7b7626d7..8abb7bd48c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java
@@ -95,7 +95,7 @@ public class Q00610_MagicalPowerOfWaterPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (player != null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java
index 2b2bea7316..888aad1b6b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java
@@ -189,7 +189,7 @@ public class Q00611_AllianceWithVarkaSilenos extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java
index 2e56c6bbb4..fbc7262bf6 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java
@@ -71,7 +71,7 @@ public class Q00612_BattleAgainstKetraOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00613_ProveYourCourageVarka/Q00613_ProveYourCourageVarka.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00613_ProveYourCourageVarka/Q00613_ProveYourCourageVarka.java
index d40bef609b..691782f40c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00613_ProveYourCourageVarka/Q00613_ProveYourCourageVarka.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00613_ProveYourCourageVarka/Q00613_ProveYourCourageVarka.java
@@ -62,7 +62,7 @@ public class Q00613_ProveYourCourageVarka extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00614_SlayTheEnemyCommanderVarka/Q00614_SlayTheEnemyCommanderVarka.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00614_SlayTheEnemyCommanderVarka/Q00614_SlayTheEnemyCommanderVarka.java
index 5a8abb0976..69db73b822 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00614_SlayTheEnemyCommanderVarka/Q00614_SlayTheEnemyCommanderVarka.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00614_SlayTheEnemyCommanderVarka/Q00614_SlayTheEnemyCommanderVarka.java
@@ -62,7 +62,7 @@ public class Q00614_SlayTheEnemyCommanderVarka extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00615_MagicalPowerOfFirePart1/Q00615_MagicalPowerOfFirePart1.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00615_MagicalPowerOfFirePart1/Q00615_MagicalPowerOfFirePart1.java
index f4b17d65d5..dc4cc878fc 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00615_MagicalPowerOfFirePart1/Q00615_MagicalPowerOfFirePart1.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00615_MagicalPowerOfFirePart1/Q00615_MagicalPowerOfFirePart1.java
@@ -91,7 +91,7 @@ public class Q00615_MagicalPowerOfFirePart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java
index 948f8e83cf..3766161454 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java
@@ -95,7 +95,7 @@ public class Q00616_MagicalPowerOfFirePart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (player != null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
index e3854ec567..6e77b4ed50 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
@@ -84,7 +84,7 @@ public class Q00617_GatherTheFlames extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
index cc4e121273..fc5922e189 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
@@ -65,7 +65,7 @@ public class Q00618_IntoTheFlame extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java
index f6a4097c1f..004af89c0c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java
@@ -222,7 +222,7 @@ public class Q00619_RelicsOfTheOldEmpire extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
index ea8df463c0..dd1bb965a0 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
@@ -283,7 +283,7 @@ public class Q00620_FourGoblets extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
index effc3c81e3..e473202bfa 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
@@ -62,7 +62,7 @@ public class Q00621_EggDelivery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
index 8a857ca301..0aa311db9e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
@@ -62,7 +62,7 @@ public class Q00622_SpecialtyLiquorDelivery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
index a464df7f99..a0ed4ec2a8 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
@@ -66,7 +66,7 @@ public class Q00623_TheFinestFood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java
index 5bc0f17027..fc16434fd0 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java
@@ -63,7 +63,7 @@ public class Q00624_TheFinestIngredientsPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java
index 7d92f54bf6..219df8edf6 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java
@@ -70,7 +70,7 @@ public class Q00625_TheFinestIngredientsPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java
index 46a5233f0c..9844404f75 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java
@@ -76,7 +76,7 @@ public class Q00626_ADarkTwilight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
index 3b46324c88..a1edaa2dc1 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
@@ -78,7 +78,7 @@ public class Q00627_HeartInSearchOfPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00628_HuntGoldenRam/Q00628_HuntGoldenRam.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00628_HuntGoldenRam/Q00628_HuntGoldenRam.java
index 1448942be1..bcbab02a87 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00628_HuntGoldenRam/Q00628_HuntGoldenRam.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00628_HuntGoldenRam/Q00628_HuntGoldenRam.java
@@ -68,7 +68,7 @@ public class Q00628_HuntGoldenRam extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00629_CleanUpTheSwampOfScreams/Q00629_CleanUpTheSwampOfScreams.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00629_CleanUpTheSwampOfScreams/Q00629_CleanUpTheSwampOfScreams.java
index 435517304b..9968e1db9f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00629_CleanUpTheSwampOfScreams/Q00629_CleanUpTheSwampOfScreams.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00629_CleanUpTheSwampOfScreams/Q00629_CleanUpTheSwampOfScreams.java
@@ -64,7 +64,7 @@ public class Q00629_CleanUpTheSwampOfScreams extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
index 8550dd3df1..02a41fc865 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
@@ -110,7 +110,7 @@ public class Q00631_DeliciousTopChoiceMeat extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00632_NecromancersRequest/Q00632_NecromancersRequest.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00632_NecromancersRequest/Q00632_NecromancersRequest.java
index 8c1168ca71..afa8bc9c7f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00632_NecromancersRequest/Q00632_NecromancersRequest.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00632_NecromancersRequest/Q00632_NecromancersRequest.java
@@ -86,7 +86,7 @@ public class Q00632_NecromancersRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00633_InTheForgottenVillage/Q00633_InTheForgottenVillage.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00633_InTheForgottenVillage/Q00633_InTheForgottenVillage.java
index 616403eb1b..fbd451dddd 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00633_InTheForgottenVillage/Q00633_InTheForgottenVillage.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00633_InTheForgottenVillage/Q00633_InTheForgottenVillage.java
@@ -82,7 +82,7 @@ public class Q00633_InTheForgottenVillage extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00634_InSearchOfFragmentsOfDimension/Q00634_InSearchOfFragmentsOfDimension.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00634_InSearchOfFragmentsOfDimension/Q00634_InSearchOfFragmentsOfDimension.java
index 05a3cc09db..7a93d78232 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00634_InSearchOfFragmentsOfDimension/Q00634_InSearchOfFragmentsOfDimension.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00634_InSearchOfFragmentsOfDimension/Q00634_InSearchOfFragmentsOfDimension.java
@@ -113,7 +113,7 @@ public class Q00634_InSearchOfFragmentsOfDimension extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00636_TruthBeyond/Q00636_TruthBeyond.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00636_TruthBeyond/Q00636_TruthBeyond.java
index 82c697eb13..6026cea784 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00636_TruthBeyond/Q00636_TruthBeyond.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00636_TruthBeyond/Q00636_TruthBeyond.java
@@ -47,7 +47,7 @@ public class Q00636_TruthBeyond extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java
index e685ece542..a647861153 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java
@@ -55,7 +55,7 @@ public class Q00637_ThroughOnceMore extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java
index 750958df2b..3331e52fb5 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java
@@ -144,7 +144,7 @@ public class Q00638_SeekersOfTheHolyGrail extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/Q00639_GuardiansOfTheHolyGrail.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/Q00639_GuardiansOfTheHolyGrail.java
index f4a521c6d8..b620e67e0f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/Q00639_GuardiansOfTheHolyGrail.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/Q00639_GuardiansOfTheHolyGrail.java
@@ -66,7 +66,7 @@ public class Q00639_GuardiansOfTheHolyGrail extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00640_TheZeroHour/Q00640_TheZeroHour.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00640_TheZeroHour/Q00640_TheZeroHour.java
index 4ae9fb1f3c..9b3566f774 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00640_TheZeroHour/Q00640_TheZeroHour.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00640_TheZeroHour/Q00640_TheZeroHour.java
@@ -67,7 +67,7 @@ public class Q00640_TheZeroHour extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
index 6ab1e34b5a..f7548f5322 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
@@ -57,7 +57,7 @@ public class Q00641_AttackSailren extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
index 6bfda3b650..6a5cece0b8 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
@@ -65,7 +65,7 @@ public class Q00642_APowerfulPrimevalCreature extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
index 41c5a83b2a..48d241ef82 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
@@ -103,7 +103,7 @@ public class Q00643_RiseAndFallOfTheElrokiTribe extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00644_GraveRobberAnnihilation/Q00644_GraveRobberAnnihilation.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00644_GraveRobberAnnihilation/Q00644_GraveRobberAnnihilation.java
index 5a7f3de9a9..a6520c95ab 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00644_GraveRobberAnnihilation/Q00644_GraveRobberAnnihilation.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00644_GraveRobberAnnihilation/Q00644_GraveRobberAnnihilation.java
@@ -69,7 +69,7 @@ public class Q00644_GraveRobberAnnihilation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
index 11380b346c..c0c41af2c2 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
@@ -59,7 +59,7 @@ public class Q00645_GhostsOfBatur extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java
index 8653add0bc..4466e08b07 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java
@@ -48,7 +48,7 @@ public class Q00647_InfluxOfMachines extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState st = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
index 6f6013cac1..ff2f3a5bfe 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
@@ -99,7 +99,7 @@ public class Q00648_AnIceMerchantsDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		final QuestState q115 = player.getQuestState(Q00115_TheOtherSideOfTruth.class.getSimpleName());
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java
index ed8a7098bd..12c3c895c2 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java
@@ -64,7 +64,7 @@ public class Q00649_ALooterAndARailroadMan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java
index f8ca72a5c6..ee4fd2ec82 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java
@@ -62,7 +62,7 @@ public class Q00650_ABrokenDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java
index 6a7f9e4d23..46ac78b78d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java
@@ -44,7 +44,7 @@ public class Q00651_RunawayYouth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java
index 3b7c5667cc..d7dc848522 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java
@@ -43,7 +43,7 @@ public class Q00652_AnAgedExAdventurer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java
index 166a837704..540054065f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java
@@ -44,7 +44,7 @@ public class Q00653_WildMaiden extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00654_JourneyToASettlement/Q00654_JourneyToASettlement.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00654_JourneyToASettlement/Q00654_JourneyToASettlement.java
index 13d9cec672..a1df7d8955 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00654_JourneyToASettlement/Q00654_JourneyToASettlement.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00654_JourneyToASettlement/Q00654_JourneyToASettlement.java
@@ -57,7 +57,7 @@ public class Q00654_JourneyToASettlement extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java
index 846079bb62..6ebe5e05b1 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java
@@ -57,7 +57,7 @@ public class Q00655_AGrandPlanForTamingWildBeasts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00659_IdRatherBeCollectingFairyBreath/Q00659_IdRatherBeCollectingFairyBreath.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00659_IdRatherBeCollectingFairyBreath/Q00659_IdRatherBeCollectingFairyBreath.java
index 30ced074ca..30a9c94b5e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00659_IdRatherBeCollectingFairyBreath/Q00659_IdRatherBeCollectingFairyBreath.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00659_IdRatherBeCollectingFairyBreath/Q00659_IdRatherBeCollectingFairyBreath.java
@@ -57,7 +57,7 @@ public class Q00659_IdRatherBeCollectingFairyBreath extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java
index 036b45a2e2..08710c0a44 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java
@@ -76,7 +76,7 @@ public class Q00660_AidingTheFloranVillage extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00661_MakingTheHarvestGroundsSafe/Q00661_MakingTheHarvestGroundsSafe.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00661_MakingTheHarvestGroundsSafe/Q00661_MakingTheHarvestGroundsSafe.java
index bc6d631b9f..355fdff359 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00661_MakingTheHarvestGroundsSafe/Q00661_MakingTheHarvestGroundsSafe.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00661_MakingTheHarvestGroundsSafe/Q00661_MakingTheHarvestGroundsSafe.java
@@ -59,7 +59,7 @@ public class Q00661_MakingTheHarvestGroundsSafe extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
index f006c781a8..d6cc0a545b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
@@ -96,7 +96,7 @@ public class Q00662_AGameOfCards extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
index 51e0b7e7e2..44bd41e890 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
@@ -215,7 +215,7 @@ public class Q00663_SeductiveWhispers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = getNoQuestMsg(player);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
index 1dfdc81b32..e1e41ba51e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
@@ -49,7 +49,7 @@ public class Q00688_DefeatTheElrokianRaiders extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java
index 82e4c5fb29..455a6f85a8 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java
@@ -71,7 +71,7 @@ public class Q00690_JudesRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java
index 18a550aa1f..1fb168dfa7 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java
@@ -65,7 +65,7 @@ public class Q00691_MatrasSuspiciousRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java
index 982fe5543c..aadb248ca8 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java
@@ -88,7 +88,7 @@ public class Q00692_HowtoOpposeEvil extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java
index 94e46438f6..cab77fdcae 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java
@@ -46,7 +46,7 @@ public class Q00694_BreakThroughTheHallOfSuffering extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00695_DefendTheHallOfSuffering/Q00695_DefendTheHallOfSuffering.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00695_DefendTheHallOfSuffering/Q00695_DefendTheHallOfSuffering.java
index 601a1b7347..f7f64feb58 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00695_DefendTheHallOfSuffering/Q00695_DefendTheHallOfSuffering.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00695_DefendTheHallOfSuffering/Q00695_DefendTheHallOfSuffering.java
@@ -46,7 +46,7 @@ public class Q00695_DefendTheHallOfSuffering extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00696_ConquerTheHallOfErosion/Q00696_ConquerTheHallOfErosion.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00696_ConquerTheHallOfErosion/Q00696_ConquerTheHallOfErosion.java
index 6a30a09252..b14b082086 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00696_ConquerTheHallOfErosion/Q00696_ConquerTheHallOfErosion.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00696_ConquerTheHallOfErosion/Q00696_ConquerTheHallOfErosion.java
@@ -36,7 +36,7 @@ public class Q00696_ConquerTheHallOfErosion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00697_DefendTheHallOfErosion/Q00697_DefendTheHallOfErosion.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00697_DefendTheHallOfErosion/Q00697_DefendTheHallOfErosion.java
index 5104113d9b..0799656316 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00697_DefendTheHallOfErosion/Q00697_DefendTheHallOfErosion.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00697_DefendTheHallOfErosion/Q00697_DefendTheHallOfErosion.java
@@ -36,7 +36,7 @@ public class Q00697_DefendTheHallOfErosion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00698_BlockTheLordsEscape/Q00698_BlockTheLordsEscape.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00698_BlockTheLordsEscape/Q00698_BlockTheLordsEscape.java
index ab1069cb99..4c80d00212 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00698_BlockTheLordsEscape/Q00698_BlockTheLordsEscape.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00698_BlockTheLordsEscape/Q00698_BlockTheLordsEscape.java
@@ -36,7 +36,7 @@ public class Q00698_BlockTheLordsEscape extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java
index 98017742e3..4248288d86 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java
@@ -64,7 +64,7 @@ public class Q00699_GuardianOfTheSkies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java
index ec2f7cfab2..861cf0287b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java
@@ -72,7 +72,7 @@ public class Q00700_CursedLife extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java
index 5408b7064b..99384aeb93 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java
@@ -65,7 +65,7 @@ public class Q00701_ProofOfExistence extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player, false);
 		if (st == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java
index 23ecdaf28c..4764cf132d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java
@@ -62,7 +62,7 @@ public class Q00702_ATrapForRevenge extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00708_PathToBecomingALordGludio/Q00708_PathToBecomingALordGludio.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00708_PathToBecomingALordGludio/Q00708_PathToBecomingALordGludio.java
index 3b56424b4f..0bec1da2f0 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00708_PathToBecomingALordGludio/Q00708_PathToBecomingALordGludio.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00708_PathToBecomingALordGludio/Q00708_PathToBecomingALordGludio.java
@@ -70,7 +70,7 @@ public class Q00708_PathToBecomingALordGludio extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00709_PathToBecomingALordDion/Q00709_PathToBecomingALordDion.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00709_PathToBecomingALordDion/Q00709_PathToBecomingALordDion.java
index 5b097b0c6a..0acf77c906 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00709_PathToBecomingALordDion/Q00709_PathToBecomingALordDion.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00709_PathToBecomingALordDion/Q00709_PathToBecomingALordDion.java
@@ -78,7 +78,7 @@ public class Q00709_PathToBecomingALordDion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00710_PathToBecomingALordGiran/Q00710_PathToBecomingALordGiran.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00710_PathToBecomingALordGiran/Q00710_PathToBecomingALordGiran.java
index 79b5611f3c..fe7f477228 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00710_PathToBecomingALordGiran/Q00710_PathToBecomingALordGiran.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00710_PathToBecomingALordGiran/Q00710_PathToBecomingALordGiran.java
@@ -73,7 +73,7 @@ public class Q00710_PathToBecomingALordGiran extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(getName());
 		final Castle castle = CastleManager.getInstance().getCastleById(GIRAN_CASTLE);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00711_PathToBecomingALordInnadril/Q00711_PathToBecomingALordInnadril.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00711_PathToBecomingALordInnadril/Q00711_PathToBecomingALordInnadril.java
index 7d1a8f5973..1951e20c19 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00711_PathToBecomingALordInnadril/Q00711_PathToBecomingALordInnadril.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00711_PathToBecomingALordInnadril/Q00711_PathToBecomingALordInnadril.java
@@ -64,7 +64,7 @@ public class Q00711_PathToBecomingALordInnadril extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00712_PathToBecomingALordOren/Q00712_PathToBecomingALordOren.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00712_PathToBecomingALordOren/Q00712_PathToBecomingALordOren.java
index ce7a568155..a7a158c242 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00712_PathToBecomingALordOren/Q00712_PathToBecomingALordOren.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00712_PathToBecomingALordOren/Q00712_PathToBecomingALordOren.java
@@ -64,7 +64,7 @@ public class Q00712_PathToBecomingALordOren extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(getName());
 		final Castle castle = CastleManager.getInstance().getCastleById(OREN_CASTLE);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00713_PathToBecomingALordAden/Q00713_PathToBecomingALordAden.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00713_PathToBecomingALordAden/Q00713_PathToBecomingALordAden.java
index d77f510be0..6f645c326c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00713_PathToBecomingALordAden/Q00713_PathToBecomingALordAden.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00713_PathToBecomingALordAden/Q00713_PathToBecomingALordAden.java
@@ -54,7 +54,7 @@ public class Q00713_PathToBecomingALordAden extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(getName());
 		final Castle castle = CastleManager.getInstance().getCastleById(ADEN_CASTLE);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00714_PathToBecomingALordSchuttgart/Q00714_PathToBecomingALordSchuttgart.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00714_PathToBecomingALordSchuttgart/Q00714_PathToBecomingALordSchuttgart.java
index 3616179062..c27a90efd8 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00714_PathToBecomingALordSchuttgart/Q00714_PathToBecomingALordSchuttgart.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00714_PathToBecomingALordSchuttgart/Q00714_PathToBecomingALordSchuttgart.java
@@ -76,7 +76,7 @@ public class Q00714_PathToBecomingALordSchuttgart extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(getName());
 		final Castle castle = CastleManager.getInstance().getCastleById(SCHUTTGART_CASTLE);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00715_PathToBecomingALordGoddard/Q00715_PathToBecomingALordGoddard.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00715_PathToBecomingALordGoddard/Q00715_PathToBecomingALordGoddard.java
index b729287928..137f3b7d07 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00715_PathToBecomingALordGoddard/Q00715_PathToBecomingALordGoddard.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00715_PathToBecomingALordGoddard/Q00715_PathToBecomingALordGoddard.java
@@ -50,7 +50,7 @@ public class Q00715_PathToBecomingALordGoddard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(getName());
 		final Castle castle = CastleManager.getInstance().getCastleById(GODDARD_CASTLE);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00716_PathToBecomingALordRune/Q00716_PathToBecomingALordRune.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00716_PathToBecomingALordRune/Q00716_PathToBecomingALordRune.java
index 7dd9096293..8f48fdace9 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00716_PathToBecomingALordRune/Q00716_PathToBecomingALordRune.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00716_PathToBecomingALordRune/Q00716_PathToBecomingALordRune.java
@@ -69,7 +69,7 @@ public class Q00716_PathToBecomingALordRune extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(getName());
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
index da5d37e3f3..c092203e9c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
@@ -121,7 +121,7 @@ public class Q00726_LightWithinTheDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(getName());
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
index 343f460924..62cfdf6454 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
@@ -207,7 +207,7 @@ public class Q00727_HopeWithinTheDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		if (event.equalsIgnoreCase("enter"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00998_FallenAngelSelect/Q00998_FallenAngelSelect.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00998_FallenAngelSelect/Q00998_FallenAngelSelect.java
index e0e86e1466..f6b444cc95 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00998_FallenAngelSelect/Q00998_FallenAngelSelect.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00998_FallenAngelSelect/Q00998_FallenAngelSelect.java
@@ -48,7 +48,7 @@ public class Q00998_FallenAngelSelect extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player, false);
 		if (st == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00999_T1Tutorial/Q00999_T1Tutorial.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00999_T1Tutorial/Q00999_T1Tutorial.java
index 79755893b3..1fe57fd34f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00999_T1Tutorial/Q00999_T1Tutorial.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00999_T1Tutorial/Q00999_T1Tutorial.java
@@ -142,7 +142,7 @@ public class Q00999_T1Tutorial extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Config.DISABLE_TUTORIAL)
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java
index 42da4579a7..81566d9533 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java
@@ -45,7 +45,7 @@ public class Q10267_JourneyToGracia extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java
index 25e706dda2..3c48fc0b74 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java
@@ -44,7 +44,7 @@ public class Q10268_ToTheSeedOfInfinity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java
index 7954905242..f7e830c95c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java
@@ -44,7 +44,7 @@ public class Q10269_ToTheSeedOfDestruction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10270_BirthOfTheSeed/Q10270_BirthOfTheSeed.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10270_BirthOfTheSeed/Q10270_BirthOfTheSeed.java
index b4739634e6..21cf330dd1 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10270_BirthOfTheSeed/Q10270_BirthOfTheSeed.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10270_BirthOfTheSeed/Q10270_BirthOfTheSeed.java
@@ -102,7 +102,7 @@ public class Q10270_BirthOfTheSeed extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10271_TheEnvelopingDarkness/Q10271_TheEnvelopingDarkness.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10271_TheEnvelopingDarkness/Q10271_TheEnvelopingDarkness.java
index e842d8b8a6..8c60fcd643 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10271_TheEnvelopingDarkness/Q10271_TheEnvelopingDarkness.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10271_TheEnvelopingDarkness/Q10271_TheEnvelopingDarkness.java
@@ -44,7 +44,7 @@ public class Q10271_TheEnvelopingDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java
index f9956cdce7..e68fd0b8e8 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java
@@ -71,7 +71,7 @@ public class Q10272_LightFragment extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
index 59e896c6bf..9af97f66dd 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
@@ -55,7 +55,7 @@ public class Q10273_GoodDayToFly extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
index 2463507ca9..f1639af403 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
@@ -67,7 +67,7 @@ public class Q10274_CollectingInTheAir extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
index f935b4b0d9..5d32a914ba 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
@@ -60,7 +60,7 @@ public class Q10275_ContainingTheAttributePower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java
index b63137816e..657551653f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java
@@ -52,7 +52,7 @@ public class Q10276_MutatedKaneusGludio extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java
index f4fa288aa9..0821c19c40 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java
@@ -52,7 +52,7 @@ public class Q10277_MutatedKaneusDion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java
index 352d827bfe..41a11c3bbd 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java
@@ -52,7 +52,7 @@ public class Q10278_MutatedKaneusHeine extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java
index 9f785e9521..e7622bdf90 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java
@@ -52,7 +52,7 @@ public class Q10279_MutatedKaneusOren extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java
index 5ef3f6390e..d8c2158528 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java
@@ -52,7 +52,7 @@ public class Q10280_MutatedKaneusSchuttgart extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
index feaf350c6c..fb71c26e05 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
@@ -50,7 +50,7 @@ public class Q10281_MutatedKaneusRune extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
index 7ff39fb0c0..8675a7ec2c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
@@ -51,7 +51,7 @@ public class AllianceMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!"9001-01.htm".equals(event) && (player.getClan() == null))
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
index 9bd56d50c3..eaa524cfef 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
@@ -69,7 +69,7 @@ public class ClanMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LEADER_REQUIRED.containsKey(event) && !player.isClanLeader())
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
index 1feeb34bdc..a83aac0754 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
@@ -62,7 +62,7 @@ public class DarkElfChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
index 7ba0619564..f059b8666f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
@@ -78,7 +78,7 @@ public class DarkElfChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
index 14f49ed1fd..816b96e4a9 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
@@ -51,7 +51,7 @@ public class DwarfBlacksmithChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
index 52812ad4a4..54a365faab 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
@@ -57,7 +57,7 @@ public class DwarfBlacksmithChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
index d372ba5b2a..daafa6d9bc 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
@@ -51,7 +51,7 @@ public class DwarfWarehouseChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
index 552b968cda..537fb2bd4f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
@@ -57,7 +57,7 @@ public class DwarfWarehouseChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
index 07aac523db..fdd471c3ce 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
@@ -60,7 +60,7 @@ public class ElfHumanClericChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
index 7c238fc992..268027c600 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
@@ -60,7 +60,7 @@ public class ElfHumanFighterChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
index f7e3bba54a..a4f8bcecda 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
@@ -75,7 +75,7 @@ public class ElfHumanFighterChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
index b33e852f7c..1d016bc05a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
@@ -59,7 +59,7 @@ public class ElfHumanWizardChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
index 90825aebb9..eda8996c5d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
@@ -64,7 +64,7 @@ public class ElfHumanWizardChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
index 0475e879b3..814097f932 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
@@ -62,7 +62,7 @@ public class FirstClassTransferTalk extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return event;
 	}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/KamaelChange1/KamaelChange1.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/KamaelChange1/KamaelChange1.java
index f59a64640e..4521543017 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/KamaelChange1/KamaelChange1.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/KamaelChange1/KamaelChange1.java
@@ -56,7 +56,7 @@ public class KamaelChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/KamaelChange2/KamaelChange2.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/KamaelChange2/KamaelChange2.java
index 7536d09ee4..8ebd8f8814 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/KamaelChange2/KamaelChange2.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/KamaelChange2/KamaelChange2.java
@@ -77,7 +77,7 @@ public class KamaelChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
index 3c595b9827..61020e2b22 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
@@ -52,7 +52,7 @@ public class OrcChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
index 151e59f21e..feb8847d2e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
@@ -65,7 +65,7 @@ public class OrcChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/Quest.java
index 4dbac0916b..70311c93ea 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/Quest.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/Quest.java
@@ -219,7 +219,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -241,7 +241,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -527,7 +527,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 		String res = null;
 		try
 		{
-			res = onAdvEvent(event, npc, player);
+			res = onEvent(event, npc, player);
 		}
 		catch (Exception e)
 		{
@@ -966,12 +966,11 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 */
 	public String onDeath(Creature killer, Creature victim, QuestState qs)
 	{
-		return onAdvEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
+		return onEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
 	}
 	
 	/**
 	 * This function is called whenever a player clicks on a link in a quest dialog and whenever a timer fires.<br>
-	 * If is not overridden by a subclass, then default to the returned value of the simpler (and older) {@link #onEvent(String, QuestState)} override.<br>
 	 * If the player has a quest state, use it as parameter in the next call, otherwise return null.
 	 * @param event this parameter contains a string identifier for the event.<br>
 	 *            Generally, this string is passed directly via the link.<br>
@@ -990,35 +989,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 *            This parameter may be {@code null} in certain circumstances.
 	 * @return the text returned by the event (may be {@code null}, a filename or just text)
 	 */
-	public String onAdvEvent(String event, Npc npc, Player player)
-	{
-		if (player != null)
-		{
-			final QuestState qs = player.getQuestState(getName());
-			if (qs != null)
-			{
-				return onEvent(event, qs);
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * This function is called in place of {@link #onAdvEvent(String, Npc, Player)} if the former is not implemented.<br>
-	 * If a script contains both {@link #onAdvEvent(String, Npc, Player)} and this implementation, then this method will never be called unless the script's {@link #onAdvEvent(String, Npc, Player)} explicitly calls this method.
-	 * @param event this parameter contains a string identifier for the event.<br>
-	 *            Generally, this string is passed directly via the link.<br>
-	 *            For example:<br>
-	 *            <code>
-	 *            &lt;a action="bypass -h Quest 626_ADarkTwilight 31517-01.htm"&gt;hello&lt;/a&gt;
-	 *            </code><br>
-	 *            The above link sets the event variable to "31517-01.htm" for the quest 626_ADarkTwilight.<br>
-	 *            In the case of timers, this will be the name of the timer.<br>
-	 *            This parameter serves as a sort of identifier.
-	 * @param qs this parameter contains a reference to the quest state of the player who used the link or started the timer.
-	 * @return the text returned by the event (may be {@code null}, a filename or just text)
-	 */
-	public String onEvent(String event, QuestState qs)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return null;
 	}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java
index 6d2160657a..44754decf0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java
@@ -492,7 +492,7 @@ public class FeedableBeasts extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("polymorph Mad Cow") && (npc != null) && (player != null) && MAD_COW_POLYMORPH.containsKey(npc.getId()))
 		{
@@ -512,7 +512,7 @@ public class FeedableBeasts extends AbstractNpcAI
 			nextNpc.addDamageHate(player, 0, 99999);
 			nextNpc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
index 829a648ea6..086879818f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
@@ -44,7 +44,7 @@ public class Tunatun extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("Whip".equals(event))
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java
index 0cf266c1f5..10ef61db46 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java
@@ -48,7 +48,7 @@ public class Alarm extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final Player player0 = npc.getVariables().getObject("player0", Player.class);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
index b30bc5df7c..0ce32e997a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
@@ -78,7 +78,7 @@ public class FrightenedRagnaOrc extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DragonValley/DragonValley.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DragonValley/DragonValley.java
index 33e9f312c9..7167e7c2ef 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DragonValley/DragonValley.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DragonValley/DragonValley.java
@@ -137,7 +137,7 @@ public class DragonValley extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("SELF_DESTRUCTION") && (npc != null) && !npc.isDead())
 		{
@@ -152,7 +152,7 @@ public class DragonValley extends AbstractNpcAI
 				startQuestTimer("SELF_DESTRUCTION", 3000, npc, null);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
index b706d61175..4a0e18e8ad 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DragonValley/DragonVortex/DragonVortex.java
@@ -57,7 +57,7 @@ public class DragonVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -145,7 +145,7 @@ public class DragonVortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
index 5b52ab654d..16e222e648 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java
@@ -53,7 +53,7 @@ public class LairOfAntharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CHECK_HOME") && (npc != null) && !npc.isDead())
 		{
@@ -67,7 +67,7 @@ public class LairOfAntharas extends AbstractNpcAI
 				npc.broadcastPacket(new ValidateLocation(npc));
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
index 53c6fac12d..33d4c4837e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DragonValley/SeparatedSoul/SeparatedSoul.java
@@ -71,7 +71,7 @@ public class SeparatedSoul extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LOCATIONS.containsKey(event))
 		{
@@ -97,7 +97,7 @@ public class SeparatedSoul extends AbstractNpcAI
 				return "no-items.htm";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
index a26e6075fd..31fc2ba199 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
@@ -43,12 +43,12 @@ public class Toma extends AbstractNpcAI
 	private Toma()
 	{
 		addFirstTalkId(TOMA);
-		onAdvEvent("RESPAWN_TOMA", null, null);
+		onEvent("RESPAWN_TOMA", null, null);
 		startQuestTimer("RESPAWN_TOMA", TELEPORT_DELAY, null, null, true);
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("RESPAWN_TOMA"))
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
index d4a9137f8d..20aad104b0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/KrateisCube/KrateisCube.java
@@ -41,7 +41,7 @@ public class KrateisCube extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
index aced8b0b46..3c5bf11089 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
@@ -359,7 +359,7 @@ public class TalentShow extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((event == null) || event.isEmpty())
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
index abc4e265d9..0ccd2abad4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
@@ -41,7 +41,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -54,7 +54,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 				npc.deleteMe();
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_DAY_NIGHT_CHANGE)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
index 177b9e398c..741dd60f5a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
@@ -88,7 +88,7 @@ public class ForgeOfTheGods extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
index 8b1dba5b13..f65d38e761 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/ForgeOfTheGods/Rooney.java
@@ -84,7 +84,7 @@ public class Rooney extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport") && !npc.isDecayed())
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FrozenLabyrinth/Jinia/Jinia.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FrozenLabyrinth/Jinia/Jinia.java
index 09bca8c7ef..9b5c508c55 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FrozenLabyrinth/Jinia/Jinia.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FrozenLabyrinth/Jinia/Jinia.java
@@ -45,7 +45,7 @@ public class Jinia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if ("check".equals(event))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FrozenLabyrinth/Rafforty/Rafforty.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FrozenLabyrinth/Rafforty/Rafforty.java
index 7933bbb4c9..93c81b6573 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FrozenLabyrinth/Rafforty/Rafforty.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FrozenLabyrinth/Rafforty/Rafforty.java
@@ -35,7 +35,7 @@ public class Rafforty extends AbstractNpcAI
 	private static final int BOTTLE = 16027;
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
index 0add516652..de48e8880c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/GiantsCave/GiantsCave.java
@@ -45,7 +45,7 @@ public class GiantsCave extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("ATTACK") && (player != null) && (npc != null) && !npc.isDead())
 		{
@@ -70,7 +70,7 @@ public class GiantsCave extends AbstractNpcAI
 		{
 			npc.setScriptValue(0);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Giran/Alexandria/Alexandria.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Giran/Alexandria/Alexandria.java
index 7598027575..6b8b7145ac 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Giran/Alexandria/Alexandria.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Giran/Alexandria/Alexandria.java
@@ -81,7 +81,7 @@ public class Alexandria extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("30098-02.html"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/EnergySeeds.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/EnergySeeds.java
index f13506914e..e5b4187f00 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/EnergySeeds.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/EnergySeeds.java
@@ -382,7 +382,7 @@ public class EnergySeeds extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("StartSoDAi"))
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/Lindvior.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/Lindvior.java
index 5903eee978..f754ce6b63 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/Lindvior.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/Lindvior.java
@@ -54,7 +54,7 @@ public class Lindvior extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -113,7 +113,7 @@ public class Lindvior extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public void scheduleNextLindviorVisit()
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/Maguen.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/Maguen.java
index 14bb18dc90..bb1dd7d054 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/Maguen.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/Maguen.java
@@ -83,7 +83,7 @@ public class Maguen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || (player == null))
 		{
@@ -168,7 +168,7 @@ public class Maguen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/AbyssGaze/AbyssGaze.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/AbyssGaze/AbyssGaze.java
index 40bbcbebef..5ec9ef705d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/AbyssGaze/AbyssGaze.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/AbyssGaze/AbyssGaze.java
@@ -36,7 +36,7 @@ public class AbyssGaze extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		QuestState qs = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/EkimusMouth/EkimusMouth.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/EkimusMouth/EkimusMouth.java
index 777f4a6aa1..0856984393 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/EkimusMouth/EkimusMouth.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/EkimusMouth/EkimusMouth.java
@@ -36,7 +36,7 @@ public class EkimusMouth extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		QuestState qs = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/GeneralDilios/GeneralDilios.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/GeneralDilios/GeneralDilios.java
index ec0323dd41..12201d038f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/GeneralDilios/GeneralDilios.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/GeneralDilios/GeneralDilios.java
@@ -59,7 +59,7 @@ public class GeneralDilios extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("command_"))
 		{
@@ -88,7 +88,7 @@ public class GeneralDilios extends AbstractNpcAI
 				startQuestTimer("guard_animation_" + (value + 1), 1500, null, null);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Klemis/Klemis.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Klemis/Klemis.java
index 7b862a3a92..ba4d14e08f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Klemis/Klemis.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Klemis/Klemis.java
@@ -43,7 +43,7 @@ public class Klemis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("portInside"))
 		{
@@ -56,6 +56,6 @@ public class Klemis extends AbstractNpcAI
 				return "32734-01.html";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Lekon/Lekon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Lekon/Lekon.java
index 767f1be34c..b65bbeb7ef 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Lekon/Lekon.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Lekon/Lekon.java
@@ -47,7 +47,7 @@ public class Lekon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Nemo/Nemo.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Nemo/Nemo.java
index f773264c96..613e02b256 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Nemo/Nemo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Nemo/Nemo.java
@@ -48,7 +48,7 @@ public class Nemo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Nottingale/Nottingale.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Nottingale/Nottingale.java
index 21a39ef80b..923683c1c3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Nottingale/Nottingale.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Nottingale/Nottingale.java
@@ -58,7 +58,7 @@ public class Nottingale extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Seyo/Seyo.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Seyo/Seyo.java
index 26af0ccec2..ac23fd365a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Seyo/Seyo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/Seyo/Seyo.java
@@ -51,7 +51,7 @@ public class Seyo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (npc == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/ZealotOfShilen/ZealotOfShilen.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/ZealotOfShilen/ZealotOfShilen.java
index ea0398bfa0..1ec5539b85 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/ZealotOfShilen/ZealotOfShilen.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/ZealotOfShilen/ZealotOfShilen.java
@@ -47,7 +47,7 @@ public class ZealotOfShilen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -75,7 +75,7 @@ public class ZealotOfShilen extends AbstractNpcAI
 			}
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java
index 1b76216e7c..fb737003a2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java
@@ -295,7 +295,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("ChangeSeedsStatus"))
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java
index 3413482b13..7a77b92f26 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java
@@ -399,7 +399,7 @@ public class HallOfErosionAttack extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final InstanceWorld tmpworld = InstanceManager.getInstance().getPlayerWorld(player);
 		if (tmpworld instanceof HEAWorld)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java
index 25e6c67678..2c766caab3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java
@@ -421,7 +421,7 @@ public class HallOfErosionDefence extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final InstanceWorld tmpworld = InstanceManager.getInstance().getPlayerWorld(player);
 		if (tmpworld instanceof HEDWorld)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java
index dc35a83890..03ac586c3f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java
@@ -369,7 +369,7 @@ public class HallOfSufferingAttack extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc);
 		if (tmpworld instanceof HSAWorld)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java
index e8873a334c..93d2c884cd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java
@@ -369,7 +369,7 @@ public class HallOfSufferingDefence extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc);
 		if (tmpworld instanceof HSDWorld)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java
index 54bcf427d5..0a978fd906 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java
@@ -408,7 +408,7 @@ public class HeartInfinityAttack extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final InstanceWorld tmpworld = InstanceManager.getInstance().getPlayerWorld(player);
 		if (tmpworld instanceof HIAWorld)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java
index da65b2e042..bb38f9dd63 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java
@@ -455,7 +455,7 @@ public class HeartInfinityDefence extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final InstanceWorld tmpworld = InstanceManager.getInstance().getPlayerWorld(player);
 		if (tmpworld instanceof HIDWorld)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SecretArea/SecretArea.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SecretArea/SecretArea.java
index da4b76345e..8c82322f97 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SecretArea/SecretArea.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SecretArea/SecretArea.java
@@ -61,7 +61,7 @@ public class SecretArea extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = getNoQuestMsg(player);
 		if ((npc.getId() == GINBY) && event.equalsIgnoreCase("enter"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java
index 7edde607be..d0bc897b43 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java
@@ -1197,7 +1197,7 @@ public class SeedOfDestruction extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc != null ? npc : player);
 		if (tmpworld instanceof SODWorld)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/vehicles/AirShipController.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/vehicles/AirShipController.java
index 5a747355cc..7abcf33695 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/vehicles/AirShipController.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/vehicles/AirShipController.java
@@ -117,7 +117,7 @@ public abstract class AirShipController extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("summon".equalsIgnoreCase(event))
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/vehicles/AirShipGludioGracia/AirShipGludioGracia.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
index 08af3f0f53..6be0e0015d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
@@ -162,7 +162,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player.isTransformed())
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Amaskari.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Amaskari.java
index cfa31deeda..dfebdb2372 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Amaskari.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Amaskari.java
@@ -71,7 +71,7 @@ public class Amaskari extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("stop_toggle"))
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/DemonPrince.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/DemonPrince.java
index 3458a10b76..2729e6334e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/DemonPrince.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/DemonPrince.java
@@ -54,13 +54,13 @@ public class DemonPrince extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("cast") && (npc != null) && (npc.getId() == FIEND) && !npc.isDead())
 		{
 			npc.doCast(getRandomEntry(AOE).getSkill());
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/HellboundCore.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/HellboundCore.java
index 10d918b6fc..12dee27015 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/HellboundCore.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/HellboundCore.java
@@ -43,7 +43,7 @@ public class HellboundCore extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("cast") && (HellboundEngine.getInstance().getLevel() <= 6))
 		{
@@ -57,7 +57,7 @@ public class HellboundCore extends AbstractNpcAI
 			});
 			startQuestTimer("cast", 10000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Keltas.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Keltas.java
index 6f7236b253..4213bf1424 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Keltas.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Keltas.java
@@ -151,7 +151,7 @@ public class Keltas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("despawn"))
 		{
@@ -164,7 +164,7 @@ public class Keltas extends AbstractNpcAI
 				despawnMinions();
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Bernarde/Bernarde.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Bernarde/Bernarde.java
index e61c5c0674..cc78b071b9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Bernarde/Bernarde.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Bernarde/Bernarde.java
@@ -45,7 +45,7 @@ public class Bernarde extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Budenka/Budenka.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Budenka/Budenka.java
index c561e23f27..f923752313 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Budenka/Budenka.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Budenka/Budenka.java
@@ -41,7 +41,7 @@ public class Budenka extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Buron/Buron.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Buron/Buron.java
index 4f378817ca..4f4d80b771 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Buron/Buron.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Buron/Buron.java
@@ -42,7 +42,7 @@ public class Buron extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext;
 		if ("Rumor".equalsIgnoreCase(event))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Deltuva/Deltuva.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Deltuva/Deltuva.java
index 755d724ae4..7886bd9710 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Deltuva/Deltuva.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Deltuva/Deltuva.java
@@ -42,7 +42,7 @@ public class Deltuva extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("teleport"))
 		{
@@ -53,6 +53,6 @@ public class Deltuva extends AbstractNpcAI
 			}
 			player.teleToLocation(TELEPORT);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Falk/Falk.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Falk/Falk.java
index 5db0d0875e..8173684576 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Falk/Falk.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Falk/Falk.java
@@ -63,7 +63,7 @@ public class Falk extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("badges") && !hasAtLeastOneQuestItem(player, BASIC_CERT, STANDART_CERT, PREMIUM_CERT))
 		{
@@ -75,6 +75,6 @@ public class Falk extends AbstractNpcAI
 			}
 			return "32297-02b.htm";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Hude/Hude.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Hude/Hude.java
index 1dec971702..9068edbc98 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Hude/Hude.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Hude/Hude.java
@@ -49,7 +49,7 @@ public class Hude extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -95,7 +95,7 @@ public class Hude extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Jude/Jude.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Jude/Jude.java
index 02826d4e78..10093457ee 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Jude/Jude.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Jude/Jude.java
@@ -41,7 +41,7 @@ public class Jude extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("TreasureSacks".equalsIgnoreCase(event))
 		{
@@ -53,7 +53,7 @@ public class Jude extends AbstractNpcAI
 			}
 			return "32356-02a.htm";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Kanaf/Kanaf.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Kanaf/Kanaf.java
index a7df123f04..f2793875f7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Kanaf/Kanaf.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Kanaf/Kanaf.java
@@ -38,12 +38,12 @@ public class Kanaf extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("info"))
 		{
 			return "32346-0" + getRandom(1, 3) + ".htm";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Kief/Kief.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Kief/Kief.java
index 1d8a740b5b..25678c01dd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Kief/Kief.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Kief/Kief.java
@@ -46,7 +46,7 @@ public class Kief extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Natives/Natives.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Natives/Natives.java
index 756d4564cc..8b4eb7f82f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Natives/Natives.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Natives/Natives.java
@@ -97,7 +97,7 @@ public class Natives extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (npc.getId() == TRAITOR)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Quarry/Quarry.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Quarry/Quarry.java
index 8360a8af03..cd2db12115 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Quarry/Quarry.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Quarry/Quarry.java
@@ -66,7 +66,7 @@ public class Quarry extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Shadai/Shadai.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Shadai/Shadai.java
index c081f09a6a..f2c0cdef3d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Shadai/Shadai.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Shadai/Shadai.java
@@ -41,7 +41,7 @@ public class Shadai extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("VALIDATE_POS") && (npc != null))
 		{
@@ -63,7 +63,7 @@ public class Shadai extends AbstractNpcAI
 				npc.teleToLocation(coords);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Warpgate/Warpgate.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Warpgate/Warpgate.java
index 73681024fa..94a09fde1e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Warpgate/Warpgate.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Warpgate/Warpgate.java
@@ -63,7 +63,7 @@ public class Warpgate extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter"))
 		{
@@ -80,7 +80,7 @@ public class Warpgate extends AbstractNpcAI
 		{
 			player.teleToLocation(REMOVE_LOC, true);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Ranku.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Ranku.java
index 11f0e82b40..81ca6cab52 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Ranku.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Ranku.java
@@ -50,7 +50,7 @@ public class Ranku extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("checkup") && (npc.getId() == RANKU) && !npc.isDead())
 		{
@@ -64,7 +64,7 @@ public class Ranku extends AbstractNpcAI
 			}
 			startQuestTimer("checkup", 1000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Typhoon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Typhoon.java
index 00398b2444..23dd1f88c4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Typhoon.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Typhoon.java
@@ -48,14 +48,14 @@ public class Typhoon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("CAST") && (npc != null) && !npc.isDead())
 		{
 			npc.doSimultaneousCast(STORM.getSkill());
 			startQuestTimer("CAST", 5000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/AnomicFoundry/AnomicFoundry.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/AnomicFoundry/AnomicFoundry.java
index 71978e6526..7b84018375 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/AnomicFoundry/AnomicFoundry.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/AnomicFoundry/AnomicFoundry.java
@@ -83,7 +83,7 @@ public class AnomicFoundry extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("make_spawn_1"))
 		{
@@ -116,7 +116,7 @@ public class AnomicFoundry extends AbstractNpcAI
 		{
 			respawnTime = 60000;
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/BaseTower/BaseTower.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/BaseTower/BaseTower.java
index df7d22679a..042085be9a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/BaseTower/BaseTower.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/BaseTower/BaseTower.java
@@ -63,13 +63,13 @@ public class BaseTower extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("CLOSE"))
 		{
 			DoorData.getInstance().getDoor(20260004).closeMe();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TowerOfInfinitum/TowerOfInfinitum.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TowerOfInfinitum/TowerOfInfinitum.java
index cd196c89c9..c3bd227901 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TowerOfInfinitum/TowerOfInfinitum.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TowerOfInfinitum/TowerOfInfinitum.java
@@ -101,7 +101,7 @@ public class TowerOfInfinitum extends AbstractNpcAI
 	private static final Location ENTER_LOCATION = new Location(-22204, 277056, -15023);
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final int npcId = npc.getId();
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java
index 9d1fed3975..0689599960 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java
@@ -404,7 +404,7 @@ public class TowerOfNaia extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TullyWorkshop/TullyWorkshop.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TullyWorkshop/TullyWorkshop.java
index 41c05efc84..4678f445e6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TullyWorkshop/TullyWorkshop.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TullyWorkshop/TullyWorkshop.java
@@ -694,7 +694,7 @@ public class TullyWorkshop extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("disable_zone"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/HellboundEngine.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/HellboundEngine.java
index 201fafb436..27210dbb30 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/HellboundEngine.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/HellboundEngine.java
@@ -68,7 +68,7 @@ public class HellboundEngine extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals(UPDATE_EVENT))
 		{
@@ -88,7 +88,7 @@ public class HellboundEngine extends AbstractNpcAI
 			}
 			startQuestTimer(UPDATE_EVENT, UPDATE_INTERVAL, null, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	/**
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/Instances/UrbanArea/UrbanArea.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/Instances/UrbanArea/UrbanArea.java
index 034a5af402..af490fa381 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/Instances/UrbanArea/UrbanArea.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/Instances/UrbanArea/UrbanArea.java
@@ -170,7 +170,7 @@ public class UrbanArea extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final InstanceWorld world = InstanceManager.getInstance().getWorld(npc);
 		if ((world != null) && (npc.getId() == DOWNTOWN_NATIVE))
@@ -212,7 +212,7 @@ public class UrbanArea extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
index a6a8d85a58..3553713c6d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
@@ -63,7 +63,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -135,7 +135,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 				npc.reduceCurrentHp(500, npc, null); // poison kills Fafurion if he is not healed
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
index a4a9860485..edbd739eb1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
@@ -46,7 +46,7 @@ public class Rignos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -88,7 +88,7 @@ public class Rignos extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
index bdd4ab193d..049d8710eb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
@@ -108,7 +108,7 @@ public class KetraOrcSupport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
index 23b5c50033..c8498cbee5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
@@ -49,7 +49,7 @@ public class MithrilMinesTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int index = Integer.parseInt(event) - 1;
 		if (LOCS.length > index)
@@ -57,7 +57,7 @@ public class MithrilMinesTeleporter extends AbstractNpcAI
 			final Location loc = LOCS[index];
 			player.teleToLocation(loc, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
index 73339f9d56..7898daea22 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
@@ -83,7 +83,7 @@ public class MonasteryOfSilence extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -131,7 +131,7 @@ public class MonasteryOfSilence extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
index e82d2f133f..9e1d92cd23 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
@@ -62,7 +62,7 @@ public class PaganTeleporters extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java
index 1cde37dc04..1748fca999 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java
@@ -95,7 +95,7 @@ public class PlainsOfLizardman extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("fantasy_mushroom") && (npc != null) && (player != null))
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
index e5c0de637f..fe9f0d5357 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
@@ -179,7 +179,7 @@ public class PrimevalIsle extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -239,7 +239,7 @@ public class PrimevalIsle extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
index fc9ca1bc2d..f959ca6dd4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
@@ -145,7 +145,7 @@ public class Venom extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
index f213bbec6c..f62aa835e8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
@@ -132,7 +132,7 @@ public class SelMahumDrill extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -188,7 +188,7 @@ public class SelMahumDrill extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
index 4a92e20778..a3899cf80e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
@@ -85,7 +85,7 @@ public class SelMahumSquad extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -183,7 +183,7 @@ public class SelMahumSquad extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java
index a25dfe2fff..93f73f1af6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java
@@ -70,7 +70,7 @@ public class SilentValley extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc != null) && !npc.isDead())
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
index 4f131439de..8f3890450e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
@@ -196,7 +196,7 @@ public class StakatoNest extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc == null) || (player == null) || npc.isDead())
 		{
@@ -224,7 +224,7 @@ public class StakatoNest extends AbstractNpcAI
 			addAttackDesire(spawned, player);
 			npc.deleteMe();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private static Monster checkMinion(Npc npc)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
index 611b134c70..2469300cb4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
@@ -49,7 +49,7 @@ public class StakatoNestTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int index = Integer.parseInt(event) - 1;
 		if (LOCS.length > index)
@@ -67,7 +67,7 @@ public class StakatoNestTeleporter extends AbstractNpcAI
 			}
 			player.teleToLocation(loc, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java
index ce57aa2a0d..e5158763b0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java
@@ -86,7 +86,7 @@ public class ToIVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int npcId = npc.getId();
 		
@@ -132,7 +132,7 @@ public class ToIVortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
index 240db66f2f..15a124ce18 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
@@ -108,7 +108,7 @@ public class VarkaSilenosSupport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Anais/Anais.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Anais/Anais.java
index 2aa0ab749e..fae212c3ef 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Anais/Anais.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Anais/Anais.java
@@ -74,7 +74,7 @@ public class Anais extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -133,7 +133,7 @@ public class Anais extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index 9ab1a6b7c5..173957347b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -192,7 +192,7 @@ public class Antharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -604,7 +604,7 @@ public class Antharas extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 939469c5cd..4e315948e2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -163,7 +163,7 @@ public class Baium extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -477,7 +477,7 @@ public class Baium extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index 17c59e4d13..f4aad8b0bd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -127,7 +127,7 @@ public class Beleth extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -537,7 +537,7 @@ public class Beleth extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Core/Core.java
index 7b6c38ef6e..cdb31e2e91 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -143,7 +143,7 @@ public class Core extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
@@ -162,7 +162,7 @@ public class Core extends AbstractNpcAI
 			_minions.forEach(Attackable::decayMe);
 			_minions.clear();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
index 53cf0d9b9f..ddd0eb3a5d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
@@ -112,7 +112,7 @@ public class DrChaos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -223,7 +223,7 @@ public class DrChaos extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 59c52d5928..010953ceb3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -169,7 +169,7 @@ public class Orfen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("orfen_unlock"))
 		{
@@ -232,7 +232,7 @@ public class Orfen extends AbstractNpcAI
 			mob.setIsRaidMinion(true);
 			MINIONS.add(mob);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 43a0e85ace..d04a936a65 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -146,7 +146,7 @@ public class QueenAnt extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -230,7 +230,7 @@ public class QueenAnt extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
index c26218a8f4..5a7174c8e0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
@@ -51,7 +51,7 @@ public class QueenShyeed extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
index 4843e1b1c9..8300985ed2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
@@ -80,7 +80,7 @@ public class Sailren extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -249,7 +249,7 @@ public class Sailren extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/SeerUgoros/SeerUgoros.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/SeerUgoros/SeerUgoros.java
index 0475497869..c598fbc8d0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/SeerUgoros/SeerUgoros.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/SeerUgoros/SeerUgoros.java
@@ -82,7 +82,7 @@ public class SeerUgoros extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -212,7 +212,7 @@ public class SeerUgoros extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index 8edc4da52a..82f638645c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -191,7 +191,7 @@ public class Valakas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -380,7 +380,7 @@ public class Valakas extends AbstractNpcAI
 		{
 			BOSS_ZONE.oustAllPlayers();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AltarsOfSacrifice.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AltarsOfSacrifice.java
index 2d3d411312..534d777a81 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AltarsOfSacrifice.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AltarsOfSacrifice.java
@@ -265,7 +265,7 @@ public class AltarsOfSacrifice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (isSpawnBossEvt(event))
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index ed04cdb2b8..5388df8da2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -62,7 +62,7 @@ public class ArenaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -128,7 +128,7 @@ public class ArenaManager extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Asamah/Asamah.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Asamah/Asamah.java
index 0b5f4da993..7d35f1914e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Asamah/Asamah.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Asamah/Asamah.java
@@ -39,7 +39,7 @@ public class Asamah extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("32115-03.htm") || event.equals("32115-04.htm"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Asher/Asher.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Asher/Asher.java
index efe2de77c8..8cf76c4f51 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Asher/Asher.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Asher/Asher.java
@@ -44,7 +44,7 @@ public class Asher extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
@@ -62,7 +62,7 @@ public class Asher extends AbstractNpcAI
 		{
 			return event;
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/AvantGarde.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/AvantGarde.java
index f73be5b59c..56eed9249e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/AvantGarde.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/AvantGarde.java
@@ -93,7 +93,7 @@ public class AvantGarde extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
index d31eb72af9..990e647d15 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
@@ -48,7 +48,7 @@ public class BlackJudge extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final int level = ((player.getExpertiseLevel() < 5) ? player.getExpertiseLevel() : 5);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
index f5db9709e1..da85ed71dd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
@@ -51,7 +51,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if ("exchange".equals(event))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackdaggerWing.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackdaggerWing.java
index 0647a89b59..17ef1cf0eb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackdaggerWing.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackdaggerWing.java
@@ -101,14 +101,14 @@ public class BlackdaggerWing extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (DAMAGE_TIMER.equals(event))
 		{
 			npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK);
 			startQuestTimer(DAMAGE_TIMER, 30000, npc, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BleedingFly.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BleedingFly.java
index eae419fe30..3282902d73 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BleedingFly.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BleedingFly.java
@@ -87,11 +87,11 @@ public class BleedingFly extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc.isDead())
 		{
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		if (TIMER_MID_HP.equals(event))
@@ -120,7 +120,7 @@ public class BleedingFly extends AbstractNpcAI
 				startQuestTimer(TIMER_LOW_HP, 80000, npc, null);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
index 92ce24d8ee..459e9e5ff3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
@@ -57,7 +57,7 @@ public class CastleAmbassador extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -117,7 +117,7 @@ public class CastleAmbassador extends AbstractNpcAI
 				player.sendPacket(packet);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
index 565ad1f2aa..feb10e7cb7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
@@ -56,7 +56,7 @@ public class CastleBlacksmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return (event.equalsIgnoreCase(npc.getId() + "-02.html") && hasRights(player, npc)) ? event : null;
 	}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
index 4ecba0bd69..d81b3b0406 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
@@ -462,7 +462,7 @@ public class CastleChamberlain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Castle castle = npc.getCastle();
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
index f00716eab0..3051a20476 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
@@ -123,7 +123,7 @@ public class CastleCourtMagician extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player.getClan() == null) && (player.getClanId() != npc.getCastle().getOwnerId()))
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
index e4ff45968e..5d4b54fc35 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
@@ -57,7 +57,7 @@ public class CastleMercenaryManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index 6237d80278..49f87eb678 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -55,7 +55,7 @@ public class CastleTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("teleporter-03.html"))
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
index 4b95b34215..9b304c6628 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
@@ -52,7 +52,7 @@ public class CastleWarehouse extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
index d6ab16eb9c..71ff559ebd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
@@ -68,7 +68,7 @@ public class ClanTrader extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
index 99b9eb20e3..bf10146bb9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
@@ -43,7 +43,7 @@ public class CrimsonHatuOtis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -69,7 +69,7 @@ public class CrimsonHatuOtis extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/DivineBeast.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/DivineBeast.java
index 8f7cac317a..bd7e944920 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/DivineBeast.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/DivineBeast.java
@@ -44,7 +44,7 @@ public class DivineBeast extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player == null) || !player.hasServitor())
 		{
@@ -55,7 +55,7 @@ public class DivineBeast extends AbstractNpcAI
 			cancelQuestTimer(event, npc, player);
 			player.getSummon().unSummon(player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/EmeraldHorn.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/EmeraldHorn.java
index 1beb0427f7..53faf220fb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/EmeraldHorn.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/EmeraldHorn.java
@@ -99,7 +99,7 @@ public class EmeraldHorn extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (DAMAGE_TIMER_15S.equals(event))
 		{
@@ -120,7 +120,7 @@ public class EmeraldHorn extends AbstractNpcAI
 			}
 			npc.getVariables().set(CAST_FLAG, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Epidos.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Epidos.java
index c74e26413e..7530506140 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Epidos.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Epidos.java
@@ -66,7 +66,7 @@ public class Epidos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("check_minions"))
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/FameManager.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/FameManager.java
index e4421faec4..90094fcb74 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/FameManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/FameManager.java
@@ -49,7 +49,7 @@ public class FameManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
index 8e0a2a7ebb..0469dec792 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
@@ -69,7 +69,7 @@ public class FortressSiegeManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GatekeeperSpirit/GatekeeperSpirit.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GatekeeperSpirit/GatekeeperSpirit.java
index 3a9a0b5cf2..88e2f3809b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GatekeeperSpirit/GatekeeperSpirit.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GatekeeperSpirit/GatekeeperSpirit.java
@@ -51,7 +51,7 @@ public class GatekeeperSpirit extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
index d99ba2611f..cb3906f1f2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
@@ -61,7 +61,7 @@ public class HealerTrainer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Katenar/Katenar.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Katenar/Katenar.java
index 059a0b77df..f7a25d9dea 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Katenar/Katenar.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Katenar/Katenar.java
@@ -45,7 +45,7 @@ public class Katenar extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Npc npc0 = npc.getVariables().getObject("npc0", Npc.class);
 		final String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
index b29402313d..45754c57a1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
@@ -71,7 +71,7 @@ public class ManorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/MercenaryCaptain.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/MercenaryCaptain.java
index 191f248b18..741c349182 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/MercenaryCaptain.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/MercenaryCaptain.java
@@ -87,7 +87,7 @@ public class MercenaryCaptain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (player != null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Minigame/Minigame.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Minigame/Minigame.java
index b086604319..cc19620a58 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Minigame/Minigame.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Minigame/Minigame.java
@@ -68,7 +68,7 @@ public class Minigame extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final MinigameRoom room = getRoomByManager(npc);
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
index bb86034c58..1851d9c7b4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
@@ -68,7 +68,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -109,7 +109,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MuscleBomber.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MuscleBomber.java
index 0639071c55..40abfec29f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MuscleBomber.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MuscleBomber.java
@@ -78,7 +78,7 @@ public class MuscleBomber extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -101,7 +101,7 @@ public class MuscleBomber extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NevitsHerald/NevitsHerald.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NevitsHerald/NevitsHerald.java
index 6fe1f47bd5..d131c944c3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NevitsHerald/NevitsHerald.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NevitsHerald/NevitsHerald.java
@@ -79,7 +79,7 @@ public class NevitsHerald extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc.getId() == NEVITS_HERALD)
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NewbieTravelToken/NewbieTravelToken.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NewbieTravelToken/NewbieTravelToken.java
index db2b7c6bb9..cd3f8fd31e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NewbieTravelToken/NewbieTravelToken.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NewbieTravelToken/NewbieTravelToken.java
@@ -56,7 +56,7 @@ public class NewbieTravelToken extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
@@ -72,7 +72,7 @@ public class NewbieTravelToken extends AbstractNpcAI
 				{
 					player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT);
 				}
-				return super.onAdvEvent(event, npc, player);
+				return super.onEvent(event, npc, player);
 			}
 		}
 		return event;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NoblesseTeleport/NoblesseTeleport.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NoblesseTeleport/NoblesseTeleport.java
index d20384cd43..3567f291a0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NoblesseTeleport/NoblesseTeleport.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NoblesseTeleport/NoblesseTeleport.java
@@ -61,7 +61,7 @@ public class NoblesseTeleport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("teleportWithToken".equals(event))
 		{
@@ -74,7 +74,7 @@ public class NoblesseTeleport extends AbstractNpcAI
 				return "noble-nopass.htm";
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/OracleTeleport.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/OracleTeleport.java
index 72056e0797..921272fa33 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/OracleTeleport.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/OracleTeleport.java
@@ -152,7 +152,7 @@ public class OracleTeleport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = "";
 		final QuestState qs = getQuestState(player, true);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PriestOfBlessing/PriestOfBlessing.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PriestOfBlessing/PriestOfBlessing.java
index 0a25e5fbf5..72092e257d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PriestOfBlessing/PriestOfBlessing.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PriestOfBlessing/PriestOfBlessing.java
@@ -101,7 +101,7 @@ public class PriestOfBlessing extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("buy_voice"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PrisonGuards.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PrisonGuards.java
index 74dddbdc35..e57dbf665c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PrisonGuards.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PrisonGuards.java
@@ -55,7 +55,7 @@ public class PrisonGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("CLEAR_STATUS"))
 		{
@@ -69,7 +69,7 @@ public class PrisonGuards extends AbstractNpcAI
 			}
 			startQuestTimer("CHECK_HOME", 30000, npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Selina/Selina.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Selina/Selina.java
index 35f8bda220..0646f39485 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Selina/Selina.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Selina/Selina.java
@@ -61,7 +61,7 @@ public class Selina extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final BuffHolder buff = BUFFS.get(event);
 		if (buff != null)
@@ -69,7 +69,7 @@ public class Selina extends AbstractNpcAI
 			if ((getQuestItemsCount(player, GOLDEN_RAM_COIN) >= buff.getCost()))
 			{
 				castSkill(npc, player, buff);
-				return super.onAdvEvent(event, npc, player);
+				return super.onEvent(event, npc, player);
 			}
 		}
 		else
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Servitors/SinEater.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Servitors/SinEater.java
index 48f0999dd6..8ac11b0adb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Servitors/SinEater.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Servitors/SinEater.java
@@ -48,7 +48,7 @@ public class SinEater extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TALK") && (player != null) && (player.getSummon() != null))
 		{
@@ -79,7 +79,7 @@ public class SinEater extends AbstractNpcAI
 			}
 			startQuestTimer("TALK", 60000, null, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_CREATURE_DEATH)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ShadowSummoner.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ShadowSummoner.java
index 1d043a6949..208917ec15 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ShadowSummoner.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ShadowSummoner.java
@@ -87,11 +87,11 @@ public class ShadowSummoner extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc.isDead())
 		{
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		if (SUMMON_TIMER.equals(event))
@@ -120,7 +120,7 @@ public class ShadowSummoner extends AbstractNpcAI
 			final Npc demonsBanquet = addSpawn(getRandom(2) < 1 ? DEMONS_BANQUET_1 : DEMONS_BANQUET_2, npc.getX() + 150, npc.getY() + 150, npc.getZ(), npc.getHeading(), false, 0);
 			addAttackDesire(demonsBanquet, player, 10000);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/SubclassCertification.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/SubclassCertification.java
index 10189d5f21..a4e7c7a430 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/SubclassCertification.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/SubclassCertification.java
@@ -95,7 +95,7 @@ public class SubclassCertification extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
index ec177e537e..373c64200b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
@@ -128,7 +128,7 @@ public class SupportUnitCaptain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int fortOwner = npc.getFort().getOwnerClan() == null ? 0 : npc.getFort().getOwnerClan().getId();
 		if ((player.getClan() == null) || (player.getClanId() != fortOwner))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Survivor/Survivor.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Survivor/Survivor.java
index 2f371d6475..aeda9d7c26 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Survivor/Survivor.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Survivor/Survivor.java
@@ -44,7 +44,7 @@ public class Survivor extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("32632-2.htm".equals(event))
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
index f6d1e74529..a733b87dad 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
@@ -53,7 +53,7 @@ public class SymbolMaker extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
index f9cd32a0dd..82ec9274c2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
@@ -94,7 +94,7 @@ public class TeleportToUndergroundColiseum extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.endsWith(".htm"))
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/TerritoryManagers.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/TerritoryManagers.java
index 2312d504fb..065284d4a7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/TerritoryManagers.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/TerritoryManagers.java
@@ -82,7 +82,7 @@ public class TerritoryManagers extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final int npcId = npc.getId();
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TownPets/TownPets.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TownPets/TownPets.java
index dfb0cd77d1..c65d385f3a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TownPets/TownPets.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TownPets/TownPets.java
@@ -52,7 +52,7 @@ public class TownPets extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("move"))
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TurekOrcs.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TurekOrcs.java
index 6c877ef8fc..75fe5836ae 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TurekOrcs.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TurekOrcs.java
@@ -54,7 +54,7 @@ public class TurekOrcs extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("checkState") && !npc.isDead() && (npc.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK))
 		{
@@ -68,7 +68,7 @@ public class TurekOrcs extends AbstractNpcAI
 				npc.getVariables().remove("state");
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
index f8d5844f1e..3398510a18 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
@@ -63,7 +63,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = "";
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WarriorFishingBlock.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
index 56b29fee5b..78e3d1c99e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
@@ -75,7 +75,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -104,7 +104,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
index 555e67db36..7038a09618 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
@@ -157,7 +157,7 @@ public class WeaverOlf extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.contains("_grade_"))
 		{
@@ -186,7 +186,7 @@ public class WeaverOlf extends AbstractNpcAI
 			}
 			else
 			{
-				return super.onAdvEvent(event, npc, player);
+				return super.onEvent(event, npc, player);
 			}
 			
 			if (hasQuestItems(player, itemIds[0]))
@@ -226,7 +226,7 @@ public class WeaverOlf extends AbstractNpcAI
 			{
 				return npc.getId() + "-no.htm";
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		return event;
 	}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index 2f36629e9e..4e54dfa40e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -221,7 +221,7 @@ public class WyvernManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
index 9bb03a27d8..769c7378d1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
@@ -352,7 +352,7 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String html = event;
 		final Clan clan = player.getClan();
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java
index 9801b840d4..4c46bcefa1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java
@@ -157,7 +157,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 	}
 	
 	@Override
-	public synchronized String onAdvEvent(String event, Npc npc, Player player)
+	public synchronized String onEvent(String event, Npc npc, Player player)
 	{
 		String html = event;
 		final Clan clan = player.getClan();
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
index 0c2e7586c9..c49be5297b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
@@ -36,7 +36,7 @@ public class DelevelManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.DELEVEL_MANAGER_ENABLED)
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java
index 55c8a86364..887467ce32 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java
@@ -99,7 +99,7 @@ public class EchoCrystals extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = "";
 		final QuestState qs = player.getQuestState(EchoCrystals.class.getSimpleName());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
index ff6d40ec0e..4713803f1d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
@@ -54,7 +54,7 @@ public class FactionSystem extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class FactionSystem extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
index 8b9c676ad5..771c8a9058 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
@@ -34,7 +34,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -77,7 +77,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 				npc.broadcastInfo(); // update flag status
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NewbieCoupons/NewbieCoupons.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NewbieCoupons/NewbieCoupons.java
index 57cdac83ed..4aff2b8053 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NewbieCoupons/NewbieCoupons.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NewbieCoupons/NewbieCoupons.java
@@ -67,7 +67,7 @@ public class NewbieCoupons extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (!NEWBIE_COUPONS_ENABLED)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
index 669fcfc85c..ddf7e923eb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
@@ -39,7 +39,7 @@ public class NoblessMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.NOBLESS_MASTER_ENABLED)
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
index e8b02a1e9c..d2b04e6bdb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
@@ -268,7 +268,7 @@ public class NpcLocationInfo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (Util.isDigit(event))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java
index 3d390f0cd3..35b1c61744 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java
@@ -69,7 +69,7 @@ public class RaidbossInfo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (Util.isDigit(event))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
index b3258b4f28..cc0501866e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
@@ -168,7 +168,7 @@ public class Deathmatch extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
index bab0ed569a..c336793685 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
@@ -209,7 +209,7 @@ public class Rabbits extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Race/Race.java
index 65b898b922..0270892afb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Race/Race.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Race/Race.java
@@ -314,7 +314,7 @@ public class Race extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index e81793775f..484c06ca67 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -186,7 +186,7 @@ public class TvT extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Wedding/Wedding.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Wedding/Wedding.java
index 82d4e748bd..f6783a161c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Wedding/Wedding.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Wedding/Wedding.java
@@ -50,7 +50,7 @@ public class Wedding extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player.getPartnerId() == 0)
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
index 9bc0ff9c55..87ac868dc7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
@@ -64,7 +64,7 @@ public class CharacterBirthday extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("despawn_npc"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
index 071a30e7e8..c0a03318eb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
@@ -75,7 +75,7 @@ public class FreyaCelebration extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("give_potion"))
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
index 734cda5237..8e8a306a33 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
@@ -85,7 +85,7 @@ public class GiftOfVitality extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
index aa5419e179..76aaa4ab09 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
@@ -59,7 +59,7 @@ public class HeavyMedal extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		int level = checkLevel(player);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/L2Day/L2Day.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/L2Day/L2Day.java
index a76a9d35bc..34a09fb8f3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/L2Day/L2Day.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/L2Day/L2Day.java
@@ -149,7 +149,7 @@ public class L2Day extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
index 4fa731a370..82a0d02944 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
@@ -49,7 +49,7 @@ public class LoveYourGatekeeper extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
index 52c8d0c693..059f9738b4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
@@ -68,7 +68,7 @@ public class MasterOfEnchanting extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("buy_staff"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
index 10dd206bf9..a54df021e4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
@@ -297,7 +297,7 @@ public class SavingSanta extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!isEventPeriod())
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/TheValentineEvent/TheValentineEvent.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/TheValentineEvent/TheValentineEvent.java
index c13d67110e..cd1040b620 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/TheValentineEvent/TheValentineEvent.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/TheValentineEvent/TheValentineEvent.java
@@ -42,7 +42,7 @@ public class TheValentineEvent extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (event.equalsIgnoreCase("4301-3.htm"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
index b2c324c9ca..9bbbea7863 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
@@ -311,7 +311,7 @@ public class WatermelonNinja extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java
index f380da8858..f7861a48df 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java
@@ -276,7 +276,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enter60"))
 		{
@@ -366,7 +366,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java
index 93496abb6e..a3ae5b1d46 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java
@@ -353,7 +353,7 @@ public abstract class Chamber extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = "";
 		final InstanceWorld world = InstanceManager.getInstance().getWorld(npc);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
index 20988a25ad..4ed7433162 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
@@ -1108,7 +1108,7 @@ public class CrystalCaverns extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc);
 		if (tmpworld instanceof CCWorld)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
index d1859cb792..be48479bf0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
@@ -873,7 +873,7 @@ public class DarkCloudMansion extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/ScarletVanHalisha.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/ScarletVanHalisha.java
index 467fc1416e..854b565cb7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/ScarletVanHalisha.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/ScarletVanHalisha.java
@@ -59,7 +59,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -77,7 +77,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastle/IceQueensCastle.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastle/IceQueensCastle.java
index 335fd6fd2a..909de6e4a7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastle/IceQueensCastle.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastle/IceQueensCastle.java
@@ -70,7 +70,7 @@ public class IceQueensCastle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -129,7 +129,7 @@ public class IceQueensCastle extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java
index ca5cb0de34..de424b6b48 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java
@@ -177,7 +177,7 @@ public class IceQueensCastleBattle extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("enterEasy"))
 		{
@@ -754,7 +754,7 @@ public class IceQueensCastleBattle extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
index 807f8ccc52..75e16a452c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
@@ -726,7 +726,7 @@ public class Kamaloka extends AbstractInstance
 	 * Handles only player's enter, single parameter - integer kamaloka index
 	 */
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java
index a65566c43c..7e077d6f28 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java
@@ -71,7 +71,7 @@ public class MithrilMine extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final InstanceWorld world = InstanceManager.getInstance().getWorld(npc);
 		
@@ -120,7 +120,7 @@ public class MithrilMine extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
index 4f953c7b10..cc0c978196 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
@@ -481,7 +481,7 @@ public class NornilsGarden extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGardenQuest/NornilsGardenQuest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGardenQuest/NornilsGardenQuest.java
index 5b4d636d01..e24b65cb82 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGardenQuest/NornilsGardenQuest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGardenQuest/NornilsGardenQuest.java
@@ -55,7 +55,7 @@ public class NornilsGardenQuest extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState q236 = player.getQuestState(Q00236_SeedsOfChaos.class.getSimpleName());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
index 84bc38a6d7..d7bd95eb9f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
@@ -97,7 +97,7 @@ public class PailakaDevilsLegacy extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final InstanceWorld world = InstanceManager.getInstance().getWorld(npc);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
index 6415cc2ab2..a0124ea656 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
@@ -73,7 +73,7 @@ public class PailakaSongOfIceAndFire extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -112,7 +112,7 @@ public class PailakaSongOfIceAndFire extends AbstractInstance
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java
index 8583e4fd9c..5ff1c7e428 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java
@@ -196,7 +196,7 @@ public class SSQDisciplesNecropolisPast extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player);
 		if (world != null)
@@ -298,7 +298,7 @@ public class SSQDisciplesNecropolisPast extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQHideoutOfTheDawn/SSQHideoutOfTheDawn.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQHideoutOfTheDawn/SSQHideoutOfTheDawn.java
index 51da6e21ec..134afb3d6c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQHideoutOfTheDawn/SSQHideoutOfTheDawn.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQHideoutOfTheDawn/SSQHideoutOfTheDawn.java
@@ -46,7 +46,7 @@ public class SSQHideoutOfTheDawn extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java
index 161abedf65..1ced74f493 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java
@@ -65,7 +65,7 @@ public class SSQLibraryOfSages extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player);
 		if (world != null)
@@ -102,7 +102,7 @@ public class SSQLibraryOfSages extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java
index 0076ac72e0..7cf1cffa1e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java
@@ -197,7 +197,7 @@ public class SSQMonasteryOfSilence extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final InstanceWorld world = InstanceManager.getInstance().getWorld(npc);
 		if (world != null)
@@ -443,7 +443,7 @@ public class SSQMonasteryOfSilence extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQSanctumOfTheLordsOfDawn/SSQSanctumOfTheLordsOfDawn.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQSanctumOfTheLordsOfDawn/SSQSanctumOfTheLordsOfDawn.java
index 9f16972b4c..3f61407c88 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQSanctumOfTheLordsOfDawn/SSQSanctumOfTheLordsOfDawn.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQSanctumOfTheLordsOfDawn/SSQSanctumOfTheLordsOfDawn.java
@@ -75,7 +75,7 @@ public class SSQSanctumOfTheLordsOfDawn extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -161,7 +161,7 @@ public class SSQSanctumOfTheLordsOfDawn extends AbstractInstance
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/AbstractSagaQuest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/AbstractSagaQuest.java
index e565ac2159..a094f9a3cc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/AbstractSagaQuest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/AbstractSagaQuest.java
@@ -163,7 +163,7 @@ public abstract class AbstractSagaQuest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java
index 313fd655f2..5cf19ad33f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java
@@ -51,7 +51,7 @@ public class Q00001_LettersOfLove extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java
index 4ce5c8152d..0a04574220 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java
@@ -54,7 +54,7 @@ public class Q00002_WhatWomenWant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java
index 0132d8c19f..5c5071ef64 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java
@@ -57,7 +57,7 @@ public class Q00003_WillTheSealBeBroken extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java
index f8999d76d8..ad6a16f76f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java
@@ -59,7 +59,7 @@ public class Q00004_LongLiveThePaagrioLord extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java
index 066b57f446..7d70919727 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java
@@ -56,7 +56,7 @@ public class Q00005_MinersFavor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00006_StepIntoTheFuture/Q00006_StepIntoTheFuture.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00006_StepIntoTheFuture/Q00006_StepIntoTheFuture.java
index b3ead525b2..208b2a1df6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00006_StepIntoTheFuture/Q00006_StepIntoTheFuture.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00006_StepIntoTheFuture/Q00006_StepIntoTheFuture.java
@@ -49,7 +49,7 @@ public class Q00006_StepIntoTheFuture extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00007_ATripBegins/Q00007_ATripBegins.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00007_ATripBegins/Q00007_ATripBegins.java
index 58b825ae0a..59b3d92dda 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00007_ATripBegins/Q00007_ATripBegins.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00007_ATripBegins/Q00007_ATripBegins.java
@@ -49,7 +49,7 @@ public class Q00007_ATripBegins extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00008_AnAdventureBegins/Q00008_AnAdventureBegins.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00008_AnAdventureBegins/Q00008_AnAdventureBegins.java
index ddc0ced603..1309fa2ccb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00008_AnAdventureBegins/Q00008_AnAdventureBegins.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00008_AnAdventureBegins/Q00008_AnAdventureBegins.java
@@ -49,7 +49,7 @@ public class Q00008_AnAdventureBegins extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00009_IntoTheCityOfHumans/Q00009_IntoTheCityOfHumans.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00009_IntoTheCityOfHumans/Q00009_IntoTheCityOfHumans.java
index 9dcefd9c14..ded9bde838 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00009_IntoTheCityOfHumans/Q00009_IntoTheCityOfHumans.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00009_IntoTheCityOfHumans/Q00009_IntoTheCityOfHumans.java
@@ -47,7 +47,7 @@ public class Q00009_IntoTheCityOfHumans extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00010_IntoTheWorld/Q00010_IntoTheWorld.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00010_IntoTheWorld/Q00010_IntoTheWorld.java
index bfbbc368a6..742742cb47 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00010_IntoTheWorld/Q00010_IntoTheWorld.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00010_IntoTheWorld/Q00010_IntoTheWorld.java
@@ -49,7 +49,7 @@ public class Q00010_IntoTheWorld extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00011_SecretMeetingWithKetraOrcs/Q00011_SecretMeetingWithKetraOrcs.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00011_SecretMeetingWithKetraOrcs/Q00011_SecretMeetingWithKetraOrcs.java
index 91a4416d78..eddf533084 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00011_SecretMeetingWithKetraOrcs/Q00011_SecretMeetingWithKetraOrcs.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00011_SecretMeetingWithKetraOrcs/Q00011_SecretMeetingWithKetraOrcs.java
@@ -45,7 +45,7 @@ public class Q00011_SecretMeetingWithKetraOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00012_SecretMeetingWithVarkaSilenos/Q00012_SecretMeetingWithVarkaSilenos.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00012_SecretMeetingWithVarkaSilenos/Q00012_SecretMeetingWithVarkaSilenos.java
index 1fc11f794f..1fff0840f2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00012_SecretMeetingWithVarkaSilenos/Q00012_SecretMeetingWithVarkaSilenos.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00012_SecretMeetingWithVarkaSilenos/Q00012_SecretMeetingWithVarkaSilenos.java
@@ -45,7 +45,7 @@ public class Q00012_SecretMeetingWithVarkaSilenos extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
index a54ecc0504..1206e700b7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
@@ -44,7 +44,7 @@ public class Q00013_ParcelDelivery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00014_WhereaboutsOfTheArchaeologist/Q00014_WhereaboutsOfTheArchaeologist.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00014_WhereaboutsOfTheArchaeologist/Q00014_WhereaboutsOfTheArchaeologist.java
index c17cf4d170..727cd4866b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00014_WhereaboutsOfTheArchaeologist/Q00014_WhereaboutsOfTheArchaeologist.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00014_WhereaboutsOfTheArchaeologist/Q00014_WhereaboutsOfTheArchaeologist.java
@@ -44,7 +44,7 @@ public class Q00014_WhereaboutsOfTheArchaeologist extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
index 9a48cb60cf..27dd5c7524 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
@@ -42,7 +42,7 @@ public class Q00015_SweetWhispers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
index dd5778cdc7..ae148f2455 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
@@ -51,7 +51,7 @@ public class Q00016_TheComingDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
index e42937fc4d..bfc4a73837 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
@@ -49,7 +49,7 @@ public class Q00017_LightAndDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00018_MeetingWithTheGoldenRam/Q00018_MeetingWithTheGoldenRam.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00018_MeetingWithTheGoldenRam/Q00018_MeetingWithTheGoldenRam.java
index 9db31ac584..b5f3675ff6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00018_MeetingWithTheGoldenRam/Q00018_MeetingWithTheGoldenRam.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00018_MeetingWithTheGoldenRam/Q00018_MeetingWithTheGoldenRam.java
@@ -45,7 +45,7 @@ public class Q00018_MeetingWithTheGoldenRam extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
index 9b6c00dbf6..6f3d38954a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
@@ -45,7 +45,7 @@ public class Q00019_GoToThePastureland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
index 8467c0a18f..b161006570 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
@@ -44,7 +44,7 @@ public class Q00020_BringUpWithLove extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00021_HiddenTruth/Q00021_HiddenTruth.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00021_HiddenTruth/Q00021_HiddenTruth.java
index 92304371dd..e7aab41d4c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00021_HiddenTruth/Q00021_HiddenTruth.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00021_HiddenTruth/Q00021_HiddenTruth.java
@@ -73,7 +73,7 @@ public class Q00021_HiddenTruth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00022_TragedyInVonHellmannForest/Q00022_TragedyInVonHellmannForest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00022_TragedyInVonHellmannForest/Q00022_TragedyInVonHellmannForest.java
index 968840a1eb..0bd0c0414c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00022_TragedyInVonHellmannForest/Q00022_TragedyInVonHellmannForest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00022_TragedyInVonHellmannForest/Q00022_TragedyInVonHellmannForest.java
@@ -81,7 +81,7 @@ public class Q00022_TragedyInVonHellmannForest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00023_LidiasHeart/Q00023_LidiasHeart.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00023_LidiasHeart/Q00023_LidiasHeart.java
index f8eb9106e8..b2f7f69478 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00023_LidiasHeart/Q00023_LidiasHeart.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00023_LidiasHeart/Q00023_LidiasHeart.java
@@ -64,7 +64,7 @@ public class Q00023_LidiasHeart extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("DESPAWN".equals(event))
 		{
@@ -74,7 +74,7 @@ public class Q00023_LidiasHeart extends Quest
 				npc0.getVariables().set("SPAWNED", false);
 			}
 			npc.deleteMe();
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java
index 8c4cff66bd..c57cb2047e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java
@@ -60,7 +60,7 @@ public class Q00024_InhabitantsOfTheForestOfTheDead extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player, false);
 		if (st == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00025_HidingBehindTheTruth/Q00025_HidingBehindTheTruth.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00025_HidingBehindTheTruth/Q00025_HidingBehindTheTruth.java
index 167adcc43a..d319b821df 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00025_HidingBehindTheTruth/Q00025_HidingBehindTheTruth.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00025_HidingBehindTheTruth/Q00025_HidingBehindTheTruth.java
@@ -80,7 +80,7 @@ public class Q00025_HidingBehindTheTruth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = getNoQuestMsg(player);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java
index 90e021142a..bf816b4619 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java
@@ -52,7 +52,7 @@ public class Q00026_TiredOfWaiting extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java
index 78212af5d9..3878f2fe21 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java
@@ -48,7 +48,7 @@ public class Q00027_ChestCaughtWithABaitOfWind extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java
index 8d93cfdfed..e84a9ea63a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java
@@ -48,7 +48,7 @@ public class Q00028_ChestCaughtWithABaitOfIcyAir extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java
index 74267f3b75..e495dd3a17 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java
@@ -48,7 +48,7 @@ public class Q00029_ChestCaughtWithABaitOfEarth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java
index e105415c44..9502360860 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java
@@ -48,7 +48,7 @@ public class Q00030_ChestCaughtWithABaitOfFire extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
index 1510eec415..b91b134cb8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
@@ -55,7 +55,7 @@ public class Q00031_SecretBuriedInTheSwamp extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
index ab85113705..02fd7814dd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
@@ -64,7 +64,7 @@ public class Q00032_AnObviousLie extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
index a77ca75984..723e88fc12 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
@@ -53,7 +53,7 @@ public class Q00033_MakeAPairOfDressShoes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
index 7c195a9e2a..8e0a47fae1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
@@ -61,7 +61,7 @@ public class Q00034_InSearchOfCloth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
index 2388709eeb..bf9d53dd45 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
@@ -57,7 +57,7 @@ public class Q00035_FindGlitteringJewelry extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
index 7d47ace67c..0271678ec4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
@@ -53,7 +53,7 @@ public class Q00036_MakeASewingKit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
index f8fc987fb4..5038b2ae97 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
@@ -54,7 +54,7 @@ public class Q00037_MakeFormalWear extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java
index 202dbd78f4..eb329a2427 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java
@@ -61,7 +61,7 @@ public class Q00038_DragonFangs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00039_RedEyedInvaders/Q00039_RedEyedInvaders.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00039_RedEyedInvaders/Q00039_RedEyedInvaders.java
index a5f417238d..6c227fd80d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00039_RedEyedInvaders/Q00039_RedEyedInvaders.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00039_RedEyedInvaders/Q00039_RedEyedInvaders.java
@@ -58,7 +58,7 @@ public class Q00039_RedEyedInvaders extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
index 2120152d8e..82199b42b4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
@@ -55,7 +55,7 @@ public class Q00040_ASpecialOrder extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
index a0ef24b254..0cb973af91 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
@@ -52,7 +52,7 @@ public class Q00042_HelpTheUncle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
index 8276b8f27c..a5c06fadec 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
@@ -52,7 +52,7 @@ public class Q00043_HelpTheSister extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
index 00a80ec952..66cace0c3d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
@@ -53,7 +53,7 @@ public class Q00044_HelpTheSon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00045_ToTalkingIsland/Q00045_ToTalkingIsland.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00045_ToTalkingIsland/Q00045_ToTalkingIsland.java
index c3ba1ca0d2..b6a88211e2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00045_ToTalkingIsland/Q00045_ToTalkingIsland.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00045_ToTalkingIsland/Q00045_ToTalkingIsland.java
@@ -70,7 +70,7 @@ public class Q00045_ToTalkingIsland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00046_OnceMoreInTheArmsOfTheMotherTree/Q00046_OnceMoreInTheArmsOfTheMotherTree.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00046_OnceMoreInTheArmsOfTheMotherTree/Q00046_OnceMoreInTheArmsOfTheMotherTree.java
index a1eed273dd..3a843427cf 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00046_OnceMoreInTheArmsOfTheMotherTree/Q00046_OnceMoreInTheArmsOfTheMotherTree.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00046_OnceMoreInTheArmsOfTheMotherTree/Q00046_OnceMoreInTheArmsOfTheMotherTree.java
@@ -70,7 +70,7 @@ public class Q00046_OnceMoreInTheArmsOfTheMotherTree extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00047_IntoTheDarkElvenForest/Q00047_IntoTheDarkElvenForest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00047_IntoTheDarkElvenForest/Q00047_IntoTheDarkElvenForest.java
index 9be0e8bd47..70d20b3d87 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00047_IntoTheDarkElvenForest/Q00047_IntoTheDarkElvenForest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00047_IntoTheDarkElvenForest/Q00047_IntoTheDarkElvenForest.java
@@ -70,7 +70,7 @@ public class Q00047_IntoTheDarkElvenForest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00048_ToTheImmortalPlateau/Q00048_ToTheImmortalPlateau.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00048_ToTheImmortalPlateau/Q00048_ToTheImmortalPlateau.java
index 5eeccee079..5a0488a6b2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00048_ToTheImmortalPlateau/Q00048_ToTheImmortalPlateau.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00048_ToTheImmortalPlateau/Q00048_ToTheImmortalPlateau.java
@@ -70,7 +70,7 @@ public class Q00048_ToTheImmortalPlateau extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00049_TheRoadHome/Q00049_TheRoadHome.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00049_TheRoadHome/Q00049_TheRoadHome.java
index a380ba552d..8871bfad4f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00049_TheRoadHome/Q00049_TheRoadHome.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00049_TheRoadHome/Q00049_TheRoadHome.java
@@ -70,7 +70,7 @@ public class Q00049_TheRoadHome extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java
index 5da91db752..7a0bd586cd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java
@@ -48,7 +48,7 @@ public class Q00050_LanoscosSpecialBait extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java
index 93d625c545..b22d32f970 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java
@@ -48,7 +48,7 @@ public class Q00051_OFullesSpecialBait extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java
index 60c468fee3..84e30aa3d5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java
@@ -48,7 +48,7 @@ public class Q00052_WilliesSpecialBait extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java
index a9f390a479..206477259e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java
@@ -48,7 +48,7 @@ public class Q00053_LinnaeusSpecialBait extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00060_GoodWorksReward/Q00060_GoodWorksReward.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00060_GoodWorksReward/Q00060_GoodWorksReward.java
index 2dfe7ef6cf..0676a114af 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00060_GoodWorksReward/Q00060_GoodWorksReward.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00060_GoodWorksReward/Q00060_GoodWorksReward.java
@@ -111,7 +111,7 @@ public class Q00060_GoodWorksReward extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("DESPAWN".equals(event))
 		{
@@ -122,7 +122,7 @@ public class Q00060_GoodWorksReward extends Quest
 				npc0.getVariables().set("SPAWNED", false);
 			}
 			npc.deleteMe();
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java
index 40f94bc778..f5e2c90ed0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java
@@ -43,7 +43,7 @@ public class Q00061_LawEnforcement extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00062_PathOfTheTrooper/Q00062_PathOfTheTrooper.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00062_PathOfTheTrooper/Q00062_PathOfTheTrooper.java
index f6ab691df4..48bc79175f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00062_PathOfTheTrooper/Q00062_PathOfTheTrooper.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00062_PathOfTheTrooper/Q00062_PathOfTheTrooper.java
@@ -60,7 +60,7 @@ public class Q00062_PathOfTheTrooper extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00063_PathOfTheWarder/Q00063_PathOfTheWarder.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00063_PathOfTheWarder/Q00063_PathOfTheWarder.java
index 40ddcb1c62..a3219a7d2e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00063_PathOfTheWarder/Q00063_PathOfTheWarder.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00063_PathOfTheWarder/Q00063_PathOfTheWarder.java
@@ -71,7 +71,7 @@ public class Q00063_PathOfTheWarder extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00064_CertifiedBerserker/Q00064_CertifiedBerserker.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00064_CertifiedBerserker/Q00064_CertifiedBerserker.java
index f59f540685..9a36765cf1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00064_CertifiedBerserker/Q00064_CertifiedBerserker.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00064_CertifiedBerserker/Q00064_CertifiedBerserker.java
@@ -76,7 +76,7 @@ public class Q00064_CertifiedBerserker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00065_CertifiedSoulBreaker/Q00065_CertifiedSoulBreaker.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00065_CertifiedSoulBreaker/Q00065_CertifiedSoulBreaker.java
index 14113ba87a..b1c0b672bd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00065_CertifiedSoulBreaker/Q00065_CertifiedSoulBreaker.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00065_CertifiedSoulBreaker/Q00065_CertifiedSoulBreaker.java
@@ -82,7 +82,7 @@ public class Q00065_CertifiedSoulBreaker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("DESPAWN_5".equals(event))
 		{
@@ -90,7 +90,7 @@ public class Q00065_CertifiedSoulBreaker extends Quest
 			{
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		else if ("DESPAWN_70".equals(event))
 		{
@@ -105,7 +105,7 @@ public class Q00065_CertifiedSoulBreaker extends Quest
 				}
 			}
 			npc.deleteMe();
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00066_CertifiedArbalester/Q00066_CertifiedArbalester.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00066_CertifiedArbalester/Q00066_CertifiedArbalester.java
index 23c00843af..5050301401 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00066_CertifiedArbalester/Q00066_CertifiedArbalester.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00066_CertifiedArbalester/Q00066_CertifiedArbalester.java
@@ -88,7 +88,7 @@ public class Q00066_CertifiedArbalester extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java
index 1791e5091e..bdaf5c1a09 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java
@@ -73,7 +73,7 @@ public class Q00101_SwordOfSolidarity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java
index 198ca3e6ef..bfd576749c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java
@@ -85,7 +85,7 @@ public class Q00102_SeaOfSporesFever extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30284-02.htm"))
@@ -94,7 +94,7 @@ public class Q00102_SeaOfSporesFever extends Quest
 			giveItems(player, ALBERIUS_LETTER, 1);
 			return event;
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java
index 1ea60199f9..594adb3393 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java
@@ -76,7 +76,7 @@ public class Q00103_SpiritOfCraftsman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java
index 9c61811199..11d3b0344d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java
@@ -79,7 +79,7 @@ public class Q00104_SpiritOfMirrors extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30017-04.htm"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java
index 98f56d2bf4..cd090de276 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java
@@ -86,7 +86,7 @@ public class Q00105_SkirmishWithOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java
index 4f3e5cc007..7649f59f79 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java
@@ -72,7 +72,7 @@ public class Q00106_ForgottenTruth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java
index f8ec863a4c..6d3580cf41 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java
@@ -72,7 +72,7 @@ public class Q00107_MercilessPunishment extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java
index c46a2bfc27..f4d0fc546c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java
@@ -96,7 +96,7 @@ public class Q00108_JumbleTumbleDiamondFuss extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
index 0c18c2fac3..5216a7fd38 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
@@ -44,7 +44,7 @@ public class Q00109_InSearchOfTheNest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
index 2ae3a7e10c..144f6c55f6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
@@ -43,7 +43,7 @@ public class Q00110_ToThePrimevalIsle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java
index 107f5789b6..f03064394b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java
@@ -85,7 +85,7 @@ public class Q00111_ElrokianHuntersProof extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00112_WalkOfFate/Q00112_WalkOfFate.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00112_WalkOfFate/Q00112_WalkOfFate.java
index f5d7718921..9b93648571 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00112_WalkOfFate/Q00112_WalkOfFate.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00112_WalkOfFate/Q00112_WalkOfFate.java
@@ -44,7 +44,7 @@ public class Q00112_WalkOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs == null) || (player.getLevel() < MIN_LEVEL))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java
index 9c7ae1554a..80cfe0c5b6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java
@@ -45,7 +45,7 @@ public class Q00113_StatusOfTheBeaconTower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java
index 81b4f13f05..ef708b79f5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java
@@ -66,7 +66,7 @@ public class Q00114_ResurrectionOfAnOldManager extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
index 61b544f2f0..6d23e5039b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
@@ -54,7 +54,7 @@ public class Q00115_TheOtherSideOfTruth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00116_BeyondTheHillsOfWinter/Q00116_BeyondTheHillsOfWinter.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00116_BeyondTheHillsOfWinter/Q00116_BeyondTheHillsOfWinter.java
index 2a9bfa38dc..a0c6deb8d5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00116_BeyondTheHillsOfWinter/Q00116_BeyondTheHillsOfWinter.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00116_BeyondTheHillsOfWinter/Q00116_BeyondTheHillsOfWinter.java
@@ -51,7 +51,7 @@ public class Q00116_BeyondTheHillsOfWinter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00117_TheOceanOfDistantStars/Q00117_TheOceanOfDistantStars.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00117_TheOceanOfDistantStars/Q00117_TheOceanOfDistantStars.java
index d84af7fc96..87ac13b3db 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00117_TheOceanOfDistantStars/Q00117_TheOceanOfDistantStars.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00117_TheOceanOfDistantStars/Q00117_TheOceanOfDistantStars.java
@@ -63,7 +63,7 @@ public class Q00117_TheOceanOfDistantStars extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00118_ToLeadAndBeLed/Q00118_ToLeadAndBeLed.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00118_ToLeadAndBeLed/Q00118_ToLeadAndBeLed.java
index 06ff162063..4ddb489be5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00118_ToLeadAndBeLed/Q00118_ToLeadAndBeLed.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00118_ToLeadAndBeLed/Q00118_ToLeadAndBeLed.java
@@ -70,7 +70,7 @@ public class Q00118_ToLeadAndBeLed extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		// Manage Sponsor's quest events.
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
index 99f5bd934d..e5453d872c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
@@ -44,7 +44,7 @@ public class Q00119_LastImperialPrince extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00120_PavelsLastResearch/Q00120_PavelsLastResearch.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00120_PavelsLastResearch/Q00120_PavelsLastResearch.java
index 774c83216e..8e60735033 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00120_PavelsLastResearch/Q00120_PavelsLastResearch.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00120_PavelsLastResearch/Q00120_PavelsLastResearch.java
@@ -66,12 +66,12 @@ public class Q00120_PavelsLastResearch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
 		{
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		String html = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java
index 37fc1fe3fc..625766186d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java
@@ -41,7 +41,7 @@ public class Q00121_PavelTheGiant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java
index b8d8fd521a..e688ef57d4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java
@@ -41,7 +41,7 @@ public class Q00122_OminousNews extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00123_TheLeaderAndTheFollower/Q00123_TheLeaderAndTheFollower.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00123_TheLeaderAndTheFollower/Q00123_TheLeaderAndTheFollower.java
index bd0c6f6413..2c43e4ad50 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00123_TheLeaderAndTheFollower/Q00123_TheLeaderAndTheFollower.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00123_TheLeaderAndTheFollower/Q00123_TheLeaderAndTheFollower.java
@@ -68,7 +68,7 @@ public class Q00123_TheLeaderAndTheFollower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		// Manage Sponsor's quest events.
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
index 8b3f340b4a..8854b8fba5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
@@ -46,7 +46,7 @@ public class Q00124_MeetingTheElroki extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
index 41e17ba8dd..ade81cae18 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
@@ -77,7 +77,7 @@ public class Q00125_TheNameOfEvil1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
index c880bfcd78..2cdaa0aa91 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
@@ -55,7 +55,7 @@ public class Q00126_TheNameOfEvil2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
index 0287d65c9b..af495e8918 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
@@ -82,7 +82,7 @@ public class Q00128_PailakaSongOfIceAndFire extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java
index 3039306aa8..de9946f1cb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java
@@ -72,7 +72,7 @@ public class Q00129_PailakaDevilsLegacy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00130_PathToHellbound/Q00130_PathToHellbound.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00130_PathToHellbound/Q00130_PathToHellbound.java
index f094158f50..2f4929a057 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00130_PathToHellbound/Q00130_PathToHellbound.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00130_PathToHellbound/Q00130_PathToHellbound.java
@@ -47,7 +47,7 @@ public class Q00130_PathToHellbound extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00131_BirdInACage/Q00131_BirdInACage.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00131_BirdInACage/Q00131_BirdInACage.java
index 3755cdb942..81e790ac72 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00131_BirdInACage/Q00131_BirdInACage.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00131_BirdInACage/Q00131_BirdInACage.java
@@ -50,7 +50,7 @@ public class Q00131_BirdInACage extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00132_MatrasCuriosity/Q00132_MatrasCuriosity.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00132_MatrasCuriosity/Q00132_MatrasCuriosity.java
index 1ab48480fa..d13368abd7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00132_MatrasCuriosity/Q00132_MatrasCuriosity.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00132_MatrasCuriosity/Q00132_MatrasCuriosity.java
@@ -52,7 +52,7 @@ public class Q00132_MatrasCuriosity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00133_ThatsBloodyHot/Q00133_ThatsBloodyHot.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00133_ThatsBloodyHot/Q00133_ThatsBloodyHot.java
index 9bc8c9a520..bed8442c56 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00133_ThatsBloodyHot/Q00133_ThatsBloodyHot.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00133_ThatsBloodyHot/Q00133_ThatsBloodyHot.java
@@ -48,7 +48,7 @@ public class Q00133_ThatsBloodyHot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player, false);
 		if (st == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
index d02e83fdc9..dd15a7621c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
@@ -72,7 +72,7 @@ public class Q00134_TempleMissionary extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
index c133b63ae4..829fb091fa 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
@@ -70,7 +70,7 @@ public class Q00135_TempleExecutor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
index 62a45e847c..7e8051404a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
@@ -82,7 +82,7 @@ public class Q00136_MoreThanMeetsTheEye extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
index e6102f64f4..bd0dee70b1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
@@ -54,7 +54,7 @@ public class Q00137_TempleChampionPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
index 6a9e043fb3..06dd694a75 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
@@ -58,7 +58,7 @@ public class Q00138_TempleChampionPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
index 09a74b2b23..f7dac60531 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
@@ -59,7 +59,7 @@ public class Q00139_ShadowFoxPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
index 3ecaa8febe..2716250309 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
@@ -68,7 +68,7 @@ public class Q00140_ShadowFoxPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
index b0b0434b57..603e0b906a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
@@ -64,7 +64,7 @@ public class Q00141_ShadowFoxPart3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
index 64480f8bf4..d484d8ae14 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
@@ -73,7 +73,7 @@ public class Q00142_FallenAngelRequestOfDawn extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
index 789ae73b48..551a6754ce 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
@@ -52,7 +52,7 @@ public class Q00143_FallenAngelRequestOfDusk extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java
index c8caecc37b..c3c667778c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java
@@ -211,7 +211,7 @@ public class Q00144_PailakaInjuredDragon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java
index ad635e0fb9..b74329a88b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java
@@ -53,7 +53,7 @@ public class Q00146_TheZeroHour extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00147_PathtoBecominganEliteMercenary/Q00147_PathtoBecominganEliteMercenary.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00147_PathtoBecominganEliteMercenary/Q00147_PathtoBecominganEliteMercenary.java
index 9d832cf9c5..efb76542c8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00147_PathtoBecominganEliteMercenary/Q00147_PathtoBecominganEliteMercenary.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00147_PathtoBecominganEliteMercenary/Q00147_PathtoBecominganEliteMercenary.java
@@ -54,7 +54,7 @@ public class Q00147_PathtoBecominganEliteMercenary extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00148_PathtoBecominganExaltedMercenary/Q00148_PathtoBecominganExaltedMercenary.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00148_PathtoBecominganExaltedMercenary/Q00148_PathtoBecominganExaltedMercenary.java
index 4c33ef3de9..b50119e5ea 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00148_PathtoBecominganExaltedMercenary/Q00148_PathtoBecominganExaltedMercenary.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00148_PathtoBecominganExaltedMercenary/Q00148_PathtoBecominganExaltedMercenary.java
@@ -56,7 +56,7 @@ public class Q00148_PathtoBecominganExaltedMercenary extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java
index a240da705e..d28e30d0f5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java
@@ -57,7 +57,7 @@ public class Q00151_CureForFever extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30050-03.htm"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java
index 43fc3a219b..71756817db 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java
@@ -53,7 +53,7 @@ public class Q00152_ShardsOfGolem extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java
index 9344d7d729..b678ddd312 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java
@@ -56,7 +56,7 @@ public class Q00153_DeliverGoods extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (npc.getId() == ARNOLD_ID) && event.equalsIgnoreCase("30041-02.html"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java
index 94b22ef0a1..1cf170c291 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java
@@ -54,7 +54,7 @@ public class Q00154_SacrificeToTheSea extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30312-03.htm"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java
index c20c865df7..69262dab44 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java
@@ -46,7 +46,7 @@ public class Q00155_FindSirWindawood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30042-03.htm"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java
index 394cd0f249..035f23f1e2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java
@@ -47,7 +47,7 @@ public class Q00156_MillenniumLove extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java
index f11efa7b02..5323786f9b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java
@@ -49,7 +49,7 @@ public class Q00157_RecoverSmuggledGoods extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java
index 3a56afa2bc..b812880fcb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java
@@ -52,7 +52,7 @@ public class Q00158_SeedOfEvil extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30031-03.htm"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java
index 8a5cf7db64..b60bcbc93b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java
@@ -51,7 +51,7 @@ public class Q00159_ProtectTheWaterSource extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30154-04.htm"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java
index 9765b1f28f..28f138edd7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java
@@ -53,7 +53,7 @@ public class Q00160_NerupasRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30370-04.htm"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java
index f1c59106c0..53243c9dd8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java
@@ -47,7 +47,7 @@ public class Q00161_FruitOfTheMotherTree extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java
index 6b88e1e248..569b1bdd79 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java
@@ -66,7 +66,7 @@ public class Q00162_CurseOfTheUndergroundFortress extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java
index b6c1adcc44..dd91e12139 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java
@@ -56,7 +56,7 @@ public class Q00163_LegacyOfThePoet extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java
index 3e6b72d1e5..f3166b054e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java
@@ -51,7 +51,7 @@ public class Q00164_BloodFiend extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30149-04.htm"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java
index ba11493a6d..e879b21740 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java
@@ -61,7 +61,7 @@ public class Q00165_ShilensHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30348-03.htm"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java
index 8bf17e278c..393b7dc85f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java
@@ -62,7 +62,7 @@ public class Q00166_MassOfDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30130-03.htm"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java
index 58933ff7b5..b3fc495331 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java
@@ -47,7 +47,7 @@ public class Q00167_DwarvenKinship extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java
index c9473f0c6b..035a2f3dcc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java
@@ -61,7 +61,7 @@ public class Q00168_DeliverSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30349-03.htm"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java
index a047aecf76..52a89940b2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java
@@ -53,7 +53,7 @@ public class Q00169_OffspringOfNightmares extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java
index 72bebe7b84..c35fdfd9fc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java
@@ -55,7 +55,7 @@ public class Q00170_DangerousSeduction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00171_ActsOfEvil/Q00171_ActsOfEvil.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00171_ActsOfEvil/Q00171_ActsOfEvil.java
index 435772675b..b0c0a3c978 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00171_ActsOfEvil/Q00171_ActsOfEvil.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00171_ActsOfEvil/Q00171_ActsOfEvil.java
@@ -77,7 +77,7 @@ public class Q00171_ActsOfEvil extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("DESPAWN".equals(event))
 		{
@@ -86,7 +86,7 @@ public class Q00171_ActsOfEvil extends Quest
 				npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.YOU_SHOULD_CONSIDER_GOING_BACK));
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00172_NewHorizons/Q00172_NewHorizons.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00172_NewHorizons/Q00172_NewHorizons.java
index 33ca902f59..3e1c5e5660 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00172_NewHorizons/Q00172_NewHorizons.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00172_NewHorizons/Q00172_NewHorizons.java
@@ -48,7 +48,7 @@ public class Q00172_NewHorizons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00173_ToTheIsleOfSouls/Q00173_ToTheIsleOfSouls.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00173_ToTheIsleOfSouls/Q00173_ToTheIsleOfSouls.java
index 2ea562ec76..8d76fc936c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00173_ToTheIsleOfSouls/Q00173_ToTheIsleOfSouls.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00173_ToTheIsleOfSouls/Q00173_ToTheIsleOfSouls.java
@@ -50,7 +50,7 @@ public class Q00173_ToTheIsleOfSouls extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player, false);
 		if (st == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00174_SupplyCheck/Q00174_SupplyCheck.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00174_SupplyCheck/Q00174_SupplyCheck.java
index 798cf723fe..4f0863cc53 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00174_SupplyCheck/Q00174_SupplyCheck.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00174_SupplyCheck/Q00174_SupplyCheck.java
@@ -58,7 +58,7 @@ public class Q00174_SupplyCheck extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00175_TheWayOfTheWarrior/Q00175_TheWayOfTheWarrior.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00175_TheWayOfTheWarrior/Q00175_TheWayOfTheWarrior.java
index 06ad6b05bd..af78e65c1d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00175_TheWayOfTheWarrior/Q00175_TheWayOfTheWarrior.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00175_TheWayOfTheWarrior/Q00175_TheWayOfTheWarrior.java
@@ -82,7 +82,7 @@ public class Q00175_TheWayOfTheWarrior extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00176_StepsForHonor/Q00176_StepsForHonor.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00176_StepsForHonor/Q00176_StepsForHonor.java
index 8ec3a4ad39..8935015a86 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00176_StepsForHonor/Q00176_StepsForHonor.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00176_StepsForHonor/Q00176_StepsForHonor.java
@@ -44,7 +44,7 @@ public class Q00176_StepsForHonor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("36479-04.html"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00178_IconicTrinity/Q00178_IconicTrinity.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00178_IconicTrinity/Q00178_IconicTrinity.java
index b0a6274b96..496e5a77cd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00178_IconicTrinity/Q00178_IconicTrinity.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00178_IconicTrinity/Q00178_IconicTrinity.java
@@ -48,7 +48,7 @@ public class Q00178_IconicTrinity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java
index 07ecf7434c..e4201810b8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java
@@ -47,7 +47,7 @@ public class Q00179_IntoTheLargeCavern extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00182_NewRecruits/Q00182_NewRecruits.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00182_NewRecruits/Q00182_NewRecruits.java
index f7dd82b895..34a5e05f20 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00182_NewRecruits/Q00182_NewRecruits.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00182_NewRecruits/Q00182_NewRecruits.java
@@ -42,7 +42,7 @@ public class Q00182_NewRecruits extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java
index 2c9337e950..cf6321781b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java
@@ -47,7 +47,7 @@ public class Q00183_RelicExploration extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java
index 56fa89ac7f..416ef1fbd8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java
@@ -54,7 +54,7 @@ public class Q00184_ArtOfPersuasion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java
index f98dd20667..5a3e22a29c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java
@@ -54,7 +54,7 @@ public class Q00185_NikolasCooperation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java
index e02899fc82..bc04a591e4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java
@@ -68,7 +68,7 @@ public class Q00186_ContractExecution extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java
index 9c540f6338..a2460cb6c8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java
@@ -49,7 +49,7 @@ public class Q00187_NikolasHeart extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java
index 1c1777caec..47b0cf65fc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java
@@ -52,7 +52,7 @@ public class Q00188_SealRemoval extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java
index 5af9afe0fd..68da52d09c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java
@@ -49,7 +49,7 @@ public class Q00189_ContractCompletion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java
index 898d20eee3..45237f5fde 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java
@@ -46,7 +46,7 @@ public class Q00190_LostDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java
index 51dcdb9b36..73aeff6756 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java
@@ -49,7 +49,7 @@ public class Q00191_VainConclusion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java
index 9dde99a2b2..ed1df833dd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java
@@ -51,7 +51,7 @@ public class Q00192_SevenSignsSeriesOfDoubt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
index 8cc53024ec..3778a28ced 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
@@ -65,7 +65,7 @@ public class Q00193_SevenSignsDyingMessage extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == SHILENS_EVIL_THOUGHTS) && "despawn".equals(event))
 		{
@@ -75,7 +75,7 @@ public class Q00193_SevenSignsDyingMessage extends Quest
 				npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.NEXT_TIME_YOU_WILL_NOT_ESCAPE));
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
index 60d81b4d50..d01af7402f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
@@ -61,7 +61,7 @@ public class Q00194_SevenSignsMammonsContract extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java
index 5dc0abe00f..ea94075cf2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java
@@ -60,7 +60,7 @@ public class Q00195_SevenSignsSecretRitualOfThePriests extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java
index 93e2fc75ce..09a6cac352 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java
@@ -59,14 +59,14 @@ public class Q00196_SevenSignsSealOfTheEmperor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == MERCHANT_OF_MAMMON) && "DESPAWN".equals(event))
 		{
 			isBusy = false;
 			npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THE_ANCIENT_PROMISE_TO_THE_EMPEROR_HAS_BEEN_FULFILLED));
 			npc.deleteMe();
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
index c8b5573e3c..05a016d425 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
@@ -61,7 +61,7 @@ public class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == SHILENS_EVIL_THOUGHTS) && "despawn".equals(event))
 		{
@@ -71,7 +71,7 @@ public class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
 				npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.NEXT_TIME_YOU_WILL_NOT_ESCAPE));
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
index aa440c5fcc..f70c134b75 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
@@ -62,7 +62,7 @@ public class Q00198_SevenSignsEmbryo extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == SHILENS_EVIL_THOUGHTS) && "despawn".equals(event))
 		{
@@ -72,7 +72,7 @@ public class Q00198_SevenSignsEmbryo extends Quest
 				npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.NEXT_TIME_YOU_WILL_NOT_ESCAPE));
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
index 815440aab6..f3a2519847 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
@@ -77,7 +77,7 @@ public class Q00211_TrialOfTheChallenger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
index ea0369655f..22ddca3be9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
@@ -89,7 +89,7 @@ public class Q00212_TrialOfDuty extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
index bd86998524..c3d07faed5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
@@ -93,7 +93,7 @@ public class Q00213_TrialOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
index c2b0547a63..5cf02ef0ea 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
@@ -121,7 +121,7 @@ public class Q00214_TrialOfTheScholar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
index c854c0907a..00442caafa 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
@@ -78,7 +78,7 @@ public class Q00215_TrialOfThePilgrim extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
index fcd69bf819..acb9b156d8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
@@ -95,7 +95,7 @@ public class Q00216_TrialOfTheGuildsman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
index a5afc2b959..8c0e991653 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
@@ -108,7 +108,7 @@ public class Q00217_TestimonyOfTrust extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
index edbaff1a2c..48b612da55 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
@@ -105,7 +105,7 @@ public class Q00218_TestimonyOfLife extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
index ed78f8226d..2437d56625 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
@@ -108,7 +108,7 @@ public class Q00219_TestimonyOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
index f4fe1ec960..289b6fd358 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
@@ -122,7 +122,7 @@ public class Q00220_TestimonyOfGlory extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
index 769a00a789..43c68f93a8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
@@ -125,7 +125,7 @@ public class Q00221_TestimonyOfProsperity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
index 7af8678236..6760a0ba5d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
@@ -89,7 +89,7 @@ public class Q00222_TestOfTheDuelist extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
index ea6344a844..e0e6960c39 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
@@ -86,7 +86,7 @@ public class Q00223_TestOfTheChampion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
index 6d636de9c0..e1ce8c3744 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
@@ -95,7 +95,7 @@ public class Q00224_TestOfSagittarius extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
index 890443423b..78246c87e3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
@@ -92,7 +92,7 @@ public class Q00225_TestOfTheSearcher extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
index 50eb54694a..19311da0e3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
@@ -83,7 +83,7 @@ public class Q00226_TestOfTheHealer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
index 5cd29dc7ec..f51f3c392e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
@@ -115,7 +115,7 @@ public class Q00227_TestOfTheReformer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("DESPAWN".equals(event))
 		{
@@ -128,7 +128,7 @@ public class Q00227_TestOfTheReformer extends Quest
 			{
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
index 4a81ed5272..a5db70327e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
@@ -100,7 +100,7 @@ public class Q00228_TestOfMagus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
index 5f6abc7ba1..35df28d2b1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
@@ -116,7 +116,7 @@ public class Q00229_TestOfWitchcraft extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
index a24fce0d0c..bcfe0e45d5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
@@ -164,7 +164,7 @@ public class Q00230_TestOfTheSummoner extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
index 63fa6d0a59..e18b4a29fa 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
@@ -82,7 +82,7 @@ public class Q00231_TestOfTheMaestro extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
index 3e974365a4..22efdd0ffa 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
@@ -107,7 +107,7 @@ public class Q00232_TestOfTheLord extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
index 58cc12c2fa..101e4a1a1c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
@@ -107,7 +107,7 @@ public class Q00233_TestOfTheWarSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00234_FatesWhisper/Q00234_FatesWhisper.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00234_FatesWhisper/Q00234_FatesWhisper.java
index b43478d4f9..282f86264e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00234_FatesWhisper/Q00234_FatesWhisper.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00234_FatesWhisper/Q00234_FatesWhisper.java
@@ -521,7 +521,7 @@ public class Q00234_FatesWhisper extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player == null)
 		{
@@ -529,7 +529,7 @@ public class Q00234_FatesWhisper extends Quest
 			{
 				npc.decayMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java
index 571fe61e80..16a7def3a3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java
@@ -77,7 +77,7 @@ public class Q00235_MimirsElixir extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00236_SeedsOfChaos/Q00236_SeedsOfChaos.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00236_SeedsOfChaos/Q00236_SeedsOfChaos.java
index ee3badb2ec..3c7440a127 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00236_SeedsOfChaos/Q00236_SeedsOfChaos.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00236_SeedsOfChaos/Q00236_SeedsOfChaos.java
@@ -83,7 +83,7 @@ public class Q00236_SeedsOfChaos extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("KATENAR_120".equals(event))
 		{
@@ -98,7 +98,7 @@ public class Q00236_SeedsOfChaos extends Quest
 				}
 			}
 			npc.deleteMe();
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		else if ("HARKILGAMED_120".equals(event))
 		{
@@ -109,7 +109,7 @@ public class Q00236_SeedsOfChaos extends Quest
 				npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.GRAAAH_WE_RE_BEING_ATTACKED));
 			}
 			npc.deleteMe();
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		else if ("KATENAR_A_120".equals(event))
 		{
@@ -124,7 +124,7 @@ public class Q00236_SeedsOfChaos extends Quest
 				}
 			}
 			npc.deleteMe();
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		else if ("KATENAR_B_120".equals(event))
 		{
@@ -139,7 +139,7 @@ public class Q00236_SeedsOfChaos extends Quest
 				}
 			}
 			npc.deleteMe();
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		else if ("HARKILGAMED_A_120".equals(event))
 		{
@@ -150,7 +150,7 @@ public class Q00236_SeedsOfChaos extends Quest
 				npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.GRAAAH_WE_RE_BEING_ATTACKED));
 			}
 			npc.deleteMe();
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java
index 05f00b6b3e..82556b88f9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java
@@ -57,7 +57,7 @@ public class Q00237_WindsOfChange extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java
index 740d2f70bc..605ce357c4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java
@@ -59,7 +59,7 @@ public class Q00238_SuccessFailureOfBusiness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java
index 8c55af7cc8..b51f27b861 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java
@@ -59,7 +59,7 @@ public class Q00239_WontYouJoinUs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
index dcce59b42a..49900443cc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
@@ -65,7 +65,7 @@ public class Q00240_ImTheOnlyOneYouCanTrust extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00241_PossessorOfAPreciousSoul1/Q00241_PossessorOfAPreciousSoul1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00241_PossessorOfAPreciousSoul1/Q00241_PossessorOfAPreciousSoul1.java
index 7e6c7e2d0b..128002d593 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00241_PossessorOfAPreciousSoul1/Q00241_PossessorOfAPreciousSoul1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00241_PossessorOfAPreciousSoul1/Q00241_PossessorOfAPreciousSoul1.java
@@ -70,7 +70,7 @@ public class Q00241_PossessorOfAPreciousSoul1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00242_PossessorOfAPreciousSoul2/Q00242_PossessorOfAPreciousSoul2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00242_PossessorOfAPreciousSoul2/Q00242_PossessorOfAPreciousSoul2.java
index 9a8ebbcba2..eb1f1b49d9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00242_PossessorOfAPreciousSoul2/Q00242_PossessorOfAPreciousSoul2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00242_PossessorOfAPreciousSoul2/Q00242_PossessorOfAPreciousSoul2.java
@@ -64,7 +64,7 @@ public class Q00242_PossessorOfAPreciousSoul2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player, false);
 		if (st == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/Q00246_PossessorOfAPreciousSoul3.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/Q00246_PossessorOfAPreciousSoul3.java
index 0a481fbc77..9b970ccf3e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/Q00246_PossessorOfAPreciousSoul3.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/Q00246_PossessorOfAPreciousSoul3.java
@@ -73,7 +73,7 @@ public class Q00246_PossessorOfAPreciousSoul3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player, false);
 		if (st == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java
index 4a5ae879c6..08f4f2f6a3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java
@@ -53,7 +53,7 @@ public class Q00247_PossessorOfAPreciousSoul4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player, false);
 		if (st == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00249_PoisonedPlainsOfTheLizardmen/Q00249_PoisonedPlainsOfTheLizardmen.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00249_PoisonedPlainsOfTheLizardmen/Q00249_PoisonedPlainsOfTheLizardmen.java
index 2e9a802972..d8560e1ea7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00249_PoisonedPlainsOfTheLizardmen/Q00249_PoisonedPlainsOfTheLizardmen.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00249_PoisonedPlainsOfTheLizardmen/Q00249_PoisonedPlainsOfTheLizardmen.java
@@ -41,7 +41,7 @@ public class Q00249_PoisonedPlainsOfTheLizardmen extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00250_WatchWhatYouEat/Q00250_WatchWhatYouEat.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00250_WatchWhatYouEat/Q00250_WatchWhatYouEat.java
index fed0b08aa4..8052eaaa0d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00250_WatchWhatYouEat/Q00250_WatchWhatYouEat.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00250_WatchWhatYouEat/Q00250_WatchWhatYouEat.java
@@ -63,7 +63,7 @@ public class Q00250_WatchWhatYouEat extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00251_NoSecrets/Q00251_NoSecrets.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00251_NoSecrets/Q00251_NoSecrets.java
index dbcdf85dda..369784cb24 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00251_NoSecrets/Q00251_NoSecrets.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00251_NoSecrets/Q00251_NoSecrets.java
@@ -61,7 +61,7 @@ public class Q00251_NoSecrets extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00252_ItSmellsDelicious/Q00252_ItSmellsDelicious.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00252_ItSmellsDelicious/Q00252_ItSmellsDelicious.java
index e09358958e..31308e1249 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00252_ItSmellsDelicious/Q00252_ItSmellsDelicious.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00252_ItSmellsDelicious/Q00252_ItSmellsDelicious.java
@@ -58,7 +58,7 @@ public class Q00252_ItSmellsDelicious extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java
index 1dbf5983b6..18e963d2d4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java
@@ -100,7 +100,7 @@ public class Q00254_LegendaryTales extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
index 40ba0e80cc..362f958893 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
@@ -167,7 +167,7 @@ public class Q00255_Tutorial extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (Config.DISABLE_TUTORIAL)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
index 4cace7d1a2..e01e9995cd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
@@ -89,7 +89,7 @@ public class Q00257_TheGuardIsBusy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
index 349552a2d2..f29b1e58dc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
@@ -67,7 +67,7 @@ public class Q00258_BringWolfPelts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30001-03.html"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
index b73a6d5434..89cccb77f7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
@@ -69,7 +69,7 @@ public class Q00259_RequestFromTheFarmOwner extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
index 0204fc63a6..672bd43039 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
@@ -64,7 +64,7 @@ public class Q00260_OrcHunting extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
index 3d6c259a32..9b88efce3a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
@@ -60,7 +60,7 @@ public class Q00261_CollectorsDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30222-03.htm"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
index 72060b844a..911d5db955 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
@@ -58,7 +58,7 @@ public class Q00262_TradeWithTheIvoryTower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30137-03.htm"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
index 4c3a2994c4..8c024cb1b4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
@@ -60,7 +60,7 @@ public class Q00263_OrcSubjugation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
index 4913af2ed7..d4f27c7859 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
@@ -71,7 +71,7 @@ public class Q00264_KeenClaws extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30136-03.htm"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
index 6c3b72ea52..d9a0dcc9fb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
@@ -59,7 +59,7 @@ public class Q00265_BondsOfSlavery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
index 449d112ee5..530eb8ff66 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
@@ -71,7 +71,7 @@ public class Q00266_PleasOfPixies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("31852-04.htm"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
index e13d3cbc29..b10947fb13 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
@@ -51,7 +51,7 @@ public class Q00267_WrathOfVerdure extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00268_TracesOfEvil/Q00268_TracesOfEvil.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00268_TracesOfEvil/Q00268_TracesOfEvil.java
index 3cb6c30c09..3e5963bcce 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00268_TracesOfEvil/Q00268_TracesOfEvil.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00268_TracesOfEvil/Q00268_TracesOfEvil.java
@@ -53,7 +53,7 @@ public class Q00268_TracesOfEvil extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30559-03.htm"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00269_InventionAmbition/Q00269_InventionAmbition.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00269_InventionAmbition/Q00269_InventionAmbition.java
index 39c418004c..cedbe3be04 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00269_InventionAmbition/Q00269_InventionAmbition.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00269_InventionAmbition/Q00269_InventionAmbition.java
@@ -60,7 +60,7 @@ public class Q00269_InventionAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java
index 5ff293f59c..69d9549a06 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java
@@ -61,7 +61,7 @@ public class Q00270_TheOneWhoEndsSilence extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
index 5f3a7d1b59..e2c1a2370c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
@@ -53,7 +53,7 @@ public class Q00271_ProofOfValor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30577-04.htm"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
index c15555b8ee..e1169a3744 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
@@ -53,7 +53,7 @@ public class Q00272_WrathOfAncestors extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30572-04.htm"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
index e296ea9dcf..1791246d1e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
@@ -61,7 +61,7 @@ public class Q00273_InvadersOfTheHolyLand extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
index 0480cbcebc..883fbb09b5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
@@ -56,7 +56,7 @@ public class Q00274_SkirmishWithTheWerewolves extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30569-04.htm"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
index dd3d36432f..b90eb32efb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
@@ -58,7 +58,7 @@ public class Q00275_DarkWingedSpies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30567-03.htm"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
index f56e6c8c4b..db7ce6e965 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
@@ -73,7 +73,7 @@ public class Q00276_TotemOfTheHestui extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30571-03.htm"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
index 2e53cd451a..d52841a261 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
@@ -50,7 +50,7 @@ public class Q00277_GatekeepersOffering extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30576-03.htm"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java
index d00a0af0e1..2e78d46d8a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java
@@ -50,7 +50,7 @@ public class Q00278_HomeSecurity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java
index 2ca3a97e1e..db24203faf 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java
@@ -65,7 +65,7 @@ public class Q00279_TargetOfOpportunity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00280_TheFoodChain/Q00280_TheFoodChain.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00280_TheFoodChain/Q00280_TheFoodChain.java
index 08a83016df..d9ad6998d9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00280_TheFoodChain/Q00280_TheFoodChain.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00280_TheFoodChain/Q00280_TheFoodChain.java
@@ -80,7 +80,7 @@ public class Q00280_TheFoodChain extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00281_HeadForTheHills/Q00281_HeadForTheHills.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00281_HeadForTheHills/Q00281_HeadForTheHills.java
index 0c77fc2bdc..bdce4c5f31 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00281_HeadForTheHills/Q00281_HeadForTheHills.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00281_HeadForTheHills/Q00281_HeadForTheHills.java
@@ -82,7 +82,7 @@ public class Q00281_HeadForTheHills extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00283_TheFewTheProudTheBrave/Q00283_TheFewTheProudTheBrave.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00283_TheFewTheProudTheBrave/Q00283_TheFewTheProudTheBrave.java
index 94b0167b66..bfdb799bee 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00283_TheFewTheProudTheBrave/Q00283_TheFewTheProudTheBrave.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00283_TheFewTheProudTheBrave/Q00283_TheFewTheProudTheBrave.java
@@ -51,7 +51,7 @@ public class Q00283_TheFewTheProudTheBrave extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00284_MuertosFeather/Q00284_MuertosFeather.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00284_MuertosFeather/Q00284_MuertosFeather.java
index abdbbe15b0..938a8bacc5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00284_MuertosFeather/Q00284_MuertosFeather.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00284_MuertosFeather/Q00284_MuertosFeather.java
@@ -58,7 +58,7 @@ public class Q00284_MuertosFeather extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00286_FabulousFeathers/Q00286_FabulousFeathers.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00286_FabulousFeathers/Q00286_FabulousFeathers.java
index 670e15dfb0..b22f4e91c8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00286_FabulousFeathers/Q00286_FabulousFeathers.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00286_FabulousFeathers/Q00286_FabulousFeathers.java
@@ -58,7 +58,7 @@ public class Q00286_FabulousFeathers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00287_FiguringItOut/Q00287_FiguringItOut.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00287_FiguringItOut/Q00287_FiguringItOut.java
index f3bb231fcb..9cdd5c73d4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00287_FiguringItOut/Q00287_FiguringItOut.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00287_FiguringItOut/Q00287_FiguringItOut.java
@@ -94,7 +94,7 @@ public class Q00287_FiguringItOut extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00288_HandleWithCare/Q00288_HandleWithCare.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00288_HandleWithCare/Q00288_HandleWithCare.java
index cf28f7571c..f776c174aa 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00288_HandleWithCare/Q00288_HandleWithCare.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00288_HandleWithCare/Q00288_HandleWithCare.java
@@ -64,7 +64,7 @@ public class Q00288_HandleWithCare extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00289_NoMoreSoupForYou/Q00289_NoMoreSoupForYou.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00289_NoMoreSoupForYou/Q00289_NoMoreSoupForYou.java
index a1760b0279..1a3a33152c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00289_NoMoreSoupForYou/Q00289_NoMoreSoupForYou.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00289_NoMoreSoupForYou/Q00289_NoMoreSoupForYou.java
@@ -165,7 +165,7 @@ public class Q00289_NoMoreSoupForYou extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00290_ThreatRemoval/Q00290_ThreatRemoval.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00290_ThreatRemoval/Q00290_ThreatRemoval.java
index 9e62821bd3..5e6c481965 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00290_ThreatRemoval/Q00290_ThreatRemoval.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00290_ThreatRemoval/Q00290_ThreatRemoval.java
@@ -70,7 +70,7 @@ public class Q00290_ThreatRemoval extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java
index 8754cae8da..9948cc729a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java
@@ -55,7 +55,7 @@ public class Q00291_RevengeOfTheRedbonnet extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30553-03.htm"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
index 9e57902a97..7cb45dbf79 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
@@ -67,7 +67,7 @@ public class Q00292_BrigandsSweep extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
index cc505d68d9..65960e222d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
@@ -60,7 +60,7 @@ public class Q00293_TheHiddenVeins extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
index c1786e8ce1..41c4e86956 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
@@ -61,7 +61,7 @@ public class Q00294_CovertBusiness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && qs.isCreated() && event.equals("30534-03.htm"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
index 6654b224e3..f1878ade15 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
@@ -50,7 +50,7 @@ public class Q00295_DreamingOfTheSkies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && qs.isCreated() && event.equals("30536-03.htm"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
index 60fa141c6f..f961d5d6e9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
@@ -57,7 +57,7 @@ public class Q00296_TarantulasSpiderSilk extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
index f590a64408..b02acb7619 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
@@ -50,7 +50,7 @@ public class Q00297_GatekeepersFavor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30540-03.htm"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00298_LizardmensConspiracy/Q00298_LizardmensConspiracy.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00298_LizardmensConspiracy/Q00298_LizardmensConspiracy.java
index 109abb2b77..22db6c8cfd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00298_LizardmensConspiracy/Q00298_LizardmensConspiracy.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00298_LizardmensConspiracy/Q00298_LizardmensConspiracy.java
@@ -61,7 +61,7 @@ public class Q00298_LizardmensConspiracy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00299_GatherIngredientsForPie/Q00299_GatherIngredientsForPie.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00299_GatherIngredientsForPie/Q00299_GatherIngredientsForPie.java
index a4ffab6332..879ff2c81c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00299_GatherIngredientsForPie/Q00299_GatherIngredientsForPie.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00299_GatherIngredientsForPie/Q00299_GatherIngredientsForPie.java
@@ -69,7 +69,7 @@ public class Q00299_GatherIngredientsForPie extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
index 3943418fea..7c9deae4a0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
@@ -65,7 +65,7 @@ public class Q00300_HuntingLetoLizardman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
index 21fef8b45e..216dcce123 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
@@ -48,7 +48,7 @@ public class Q00303_CollectArrowheads extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30029-04.htm"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
index 19e65e9bf2..778c7a5dc9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
@@ -64,7 +64,7 @@ public class Q00306_CrystalOfFireAndIce extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java
index 3a4adf92be..766ab9c6e9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java
@@ -56,7 +56,7 @@ public class Q00307_ControlDeviceOfTheGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java
index 9687e2ae81..17ec8074af 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java
@@ -126,7 +126,7 @@ public class Q00308_ReedFieldMaintenance extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java
index 2eaebcf4b7..904ec9d447 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java
@@ -126,7 +126,7 @@ public class Q00309_ForAGoodCause extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
index 785be8bf02..06d18eb341 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
@@ -74,7 +74,7 @@ public class Q00310_OnlyWhatRemains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java
index 8669a051f0..b8e5b6706f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java
@@ -113,7 +113,7 @@ public class Q00311_ExpulsionOfEvilSpirits extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("altarSpawn"))
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00312_TakeAdvantageOfTheCrisis/Q00312_TakeAdvantageOfTheCrisis.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00312_TakeAdvantageOfTheCrisis/Q00312_TakeAdvantageOfTheCrisis.java
index 4be108eb0f..fa748a7f09 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00312_TakeAdvantageOfTheCrisis/Q00312_TakeAdvantageOfTheCrisis.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00312_TakeAdvantageOfTheCrisis/Q00312_TakeAdvantageOfTheCrisis.java
@@ -67,7 +67,7 @@ public class Q00312_TakeAdvantageOfTheCrisis extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
index 6e19acd351..4fd45f8409 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
@@ -50,7 +50,7 @@ public class Q00313_CollectSpores extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
index c613b7c828..1cbb69afdc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
@@ -69,7 +69,7 @@ public class Q00316_DestroyPlagueCarriers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
index d2db838ce7..e3d1c94b12 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
@@ -51,7 +51,7 @@ public class Q00317_CatchTheWind extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
index 2d4fbe620e..6c1a7bcaaf 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
@@ -55,7 +55,7 @@ public class Q00319_ScentOfDeath extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
index 774e1b3171..9993470d72 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
@@ -54,7 +54,7 @@ public class Q00320_BonesTellTheFuture extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30359-04.htm"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
index 6d1214f8b9..e28e631ab3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
@@ -59,7 +59,7 @@ public class Q00324_SweetestVenom extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
index ceec5e89ef..0ed26a2bc0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
@@ -79,7 +79,7 @@ public class Q00325_GrimCollector extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
index 83f7f45061..3aeacae982 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
@@ -68,7 +68,7 @@ public class Q00326_VanquishRemnants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
index d10d303014..d517ec9d48 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
@@ -104,7 +104,7 @@ public class Q00327_RecoverTheFarmland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
index b9d073f735..2325ba4a99 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
@@ -70,7 +70,7 @@ public class Q00328_SenseForBusiness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
index fc90718f84..84693f6838 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
@@ -61,7 +61,7 @@ public class Q00329_CuriosityOfADwarf extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00330_AdeptOfTaste/Q00330_AdeptOfTaste.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00330_AdeptOfTaste/Q00330_AdeptOfTaste.java
index 6e78cbebb5..732dc94d7e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00330_AdeptOfTaste/Q00330_AdeptOfTaste.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00330_AdeptOfTaste/Q00330_AdeptOfTaste.java
@@ -100,7 +100,7 @@ public class Q00330_AdeptOfTaste extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
index 0d0211ac6d..1931fa3185 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
@@ -64,7 +64,7 @@ public class Q00331_ArrowOfVengeance extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
index 41125ce007..52461364ce 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
@@ -120,7 +120,7 @@ public class Q00333_HuntOfTheBlackLion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		final int chance = getRandom(100);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00334_TheWishingPotion/Q00334_TheWishingPotion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00334_TheWishingPotion/Q00334_TheWishingPotion.java
index 8bed894d71..4ecd1abdc7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00334_TheWishingPotion/Q00334_TheWishingPotion.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00334_TheWishingPotion/Q00334_TheWishingPotion.java
@@ -377,7 +377,7 @@ public class Q00334_TheWishingPotion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (npc.getId())
 		{
@@ -698,7 +698,7 @@ public class Q00334_TheWishingPotion extends Quest
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java
index bf8ee18bed..082eb2e2bd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java
@@ -600,7 +600,7 @@ public class Q00335_TheSongOfTheHunter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java
index 8148fc304c..8c50978043 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java
@@ -265,7 +265,7 @@ public class Q00336_CoinsOfMagic extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
index d726b24a3b..d803e38577 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
@@ -92,17 +92,17 @@ public class Q00337_AudienceWithTheLandDragon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("DESPAWN".equals(event))
 		{
 			npc.deleteMe();
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		else if ("DESPAWN_240".equals(event))
 		{
 			npc.deleteMe();
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java
index 6c33c83b9f..21af30f204 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java
@@ -53,7 +53,7 @@ public class Q00338_AlligatorHunter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/Q00340_SubjugationOfLizardmen.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/Q00340_SubjugationOfLizardmen.java
index b96a6e5dc7..be6e1f72d9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/Q00340_SubjugationOfLizardmen.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/Q00340_SubjugationOfLizardmen.java
@@ -62,7 +62,7 @@ public class Q00340_SubjugationOfLizardmen extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java
index e4fff374d3..1afee42276 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java
@@ -60,7 +60,7 @@ public class Q00341_HuntingForWildBeasts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00343_UnderTheShadowOfTheIvoryTower/Q00343_UnderTheShadowOfTheIvoryTower.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00343_UnderTheShadowOfTheIvoryTower/Q00343_UnderTheShadowOfTheIvoryTower.java
index 6f8f282fd3..48275e5486 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00343_UnderTheShadowOfTheIvoryTower/Q00343_UnderTheShadowOfTheIvoryTower.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00343_UnderTheShadowOfTheIvoryTower/Q00343_UnderTheShadowOfTheIvoryTower.java
@@ -68,7 +68,7 @@ public class Q00343_UnderTheShadowOfTheIvoryTower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
index b686034d10..56d1080237 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
@@ -84,7 +84,7 @@ public class Q00344_1000YearsTheEndOfLamentation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00345_MethodToRaiseTheDead/Q00345_MethodToRaiseTheDead.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00345_MethodToRaiseTheDead/Q00345_MethodToRaiseTheDead.java
index a52d09e8a0..550d304632 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00345_MethodToRaiseTheDead/Q00345_MethodToRaiseTheDead.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00345_MethodToRaiseTheDead/Q00345_MethodToRaiseTheDead.java
@@ -62,7 +62,7 @@ public class Q00345_MethodToRaiseTheDead extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00347_GoGetTheCalculator/Q00347_GoGetTheCalculator.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00347_GoGetTheCalculator/Q00347_GoGetTheCalculator.java
index ae59704aea..d7a65900a2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00347_GoGetTheCalculator/Q00347_GoGetTheCalculator.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00347_GoGetTheCalculator/Q00347_GoGetTheCalculator.java
@@ -55,7 +55,7 @@ public class Q00347_GoGetTheCalculator extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java
index dc6716c26b..ea1e9c4a18 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java
@@ -118,7 +118,7 @@ public class Q00348_AnArrogantSearch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (npc.getId())
 		{
@@ -129,7 +129,7 @@ public class Q00348_AnArrogantSearch extends Quest
 				if ("DESPAWN".equals(event))
 				{
 					npc.deleteMe();
-					return super.onAdvEvent(event, npc, player);
+					return super.onEvent(event, npc, player);
 				}
 			}
 		}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java
index 8832020ba9..ea2aeb4337 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java
@@ -149,7 +149,7 @@ public class Q00350_EnhanceYourWeapon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00351_BlackSwan/Q00351_BlackSwan.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00351_BlackSwan/Q00351_BlackSwan.java
index 6aadb34694..d27e31af61 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00351_BlackSwan/Q00351_BlackSwan.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00351_BlackSwan/Q00351_BlackSwan.java
@@ -69,7 +69,7 @@ public class Q00351_BlackSwan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00352_HelpRoodRaiseANewPet/Q00352_HelpRoodRaiseANewPet.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00352_HelpRoodRaiseANewPet/Q00352_HelpRoodRaiseANewPet.java
index 741cf0b67d..fb6b64ef24 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00352_HelpRoodRaiseANewPet/Q00352_HelpRoodRaiseANewPet.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00352_HelpRoodRaiseANewPet/Q00352_HelpRoodRaiseANewPet.java
@@ -80,7 +80,7 @@ public class Q00352_HelpRoodRaiseANewPet extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
index 111b91d5d5..4260e24965 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
@@ -62,7 +62,7 @@ public class Q00354_ConquestOfAlligatorIsland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
index 3f3ae82983..18551926c1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
@@ -86,7 +86,7 @@ public class Q00355_FamilyHonor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
index 59e09f8a1c..680784ec3e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
@@ -59,7 +59,7 @@ public class Q00356_DigUpTheSeaOfSpores extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00357_WarehouseKeepersAmbition/Q00357_WarehouseKeepersAmbition.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00357_WarehouseKeepersAmbition/Q00357_WarehouseKeepersAmbition.java
index 26cdd98b6e..550ba52e5f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00357_WarehouseKeepersAmbition/Q00357_WarehouseKeepersAmbition.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00357_WarehouseKeepersAmbition/Q00357_WarehouseKeepersAmbition.java
@@ -56,7 +56,7 @@ public class Q00357_WarehouseKeepersAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
index 91790c773b..6713ec63a8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
@@ -67,7 +67,7 @@ public class Q00358_IllegitimateChildOfTheGoddess extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/Q00359_ForASleeplessDeadman.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/Q00359_ForASleeplessDeadman.java
index 7aa4b8230d..3fd92e9fd2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/Q00359_ForASleeplessDeadman.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/Q00359_ForASleeplessDeadman.java
@@ -68,7 +68,7 @@ public class Q00359_ForASleeplessDeadman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
index 107381beb4..df600d4e34 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
@@ -60,7 +60,7 @@ public class Q00360_PlunderTheirSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00362_BardsMandolin/Q00362_BardsMandolin.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00362_BardsMandolin/Q00362_BardsMandolin.java
index f47937e589..cabcbce0a5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00362_BardsMandolin/Q00362_BardsMandolin.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00362_BardsMandolin/Q00362_BardsMandolin.java
@@ -49,7 +49,7 @@ public class Q00362_BardsMandolin extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/Q00363_SorrowfulSoundOfFlute.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/Q00363_SorrowfulSoundOfFlute.java
index 78dcf46527..b2c56f0186 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/Q00363_SorrowfulSoundOfFlute.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/Q00363_SorrowfulSoundOfFlute.java
@@ -54,7 +54,7 @@ public class Q00363_SorrowfulSoundOfFlute extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00364_JovialAccordion/Q00364_JovialAccordion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00364_JovialAccordion/Q00364_JovialAccordion.java
index e22ddba98c..a0070115a5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00364_JovialAccordion/Q00364_JovialAccordion.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00364_JovialAccordion/Q00364_JovialAccordion.java
@@ -54,7 +54,7 @@ public class Q00364_JovialAccordion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00365_DevilsLegacy/Q00365_DevilsLegacy.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00365_DevilsLegacy/Q00365_DevilsLegacy.java
index 7bce7c1145..b63b62d4bb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00365_DevilsLegacy/Q00365_DevilsLegacy.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00365_DevilsLegacy/Q00365_DevilsLegacy.java
@@ -73,7 +73,7 @@ public class Q00365_DevilsLegacy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00366_SilverHairedShaman/Q00366_SilverHairedShaman.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00366_SilverHairedShaman/Q00366_SilverHairedShaman.java
index 09c295ec3f..fd9a198de3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00366_SilverHairedShaman/Q00366_SilverHairedShaman.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00366_SilverHairedShaman/Q00366_SilverHairedShaman.java
@@ -62,7 +62,7 @@ public class Q00366_SilverHairedShaman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00367_ElectrifyingRecharge/Q00367_ElectrifyingRecharge.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00367_ElectrifyingRecharge/Q00367_ElectrifyingRecharge.java
index f0b33abc5d..771f547da1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00367_ElectrifyingRecharge/Q00367_ElectrifyingRecharge.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00367_ElectrifyingRecharge/Q00367_ElectrifyingRecharge.java
@@ -56,7 +56,7 @@ public class Q00367_ElectrifyingRecharge extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00368_TrespassingIntoTheHolyGround/Q00368_TrespassingIntoTheHolyGround.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00368_TrespassingIntoTheHolyGround/Q00368_TrespassingIntoTheHolyGround.java
index a758b7b060..27b1ac775a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00368_TrespassingIntoTheHolyGround/Q00368_TrespassingIntoTheHolyGround.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00368_TrespassingIntoTheHolyGround/Q00368_TrespassingIntoTheHolyGround.java
@@ -56,7 +56,7 @@ public class Q00368_TrespassingIntoTheHolyGround extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
index b64060d4a9..7cade314ff 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
@@ -67,7 +67,7 @@ public class Q00369_CollectorOfJewels extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
index 6548e9f525..e1a060c960 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
@@ -70,7 +70,7 @@ public class Q00370_AnElderSowsSeeds extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java
index ecafd068bc..cc64a9e94a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java
@@ -85,7 +85,7 @@ public class Q00371_ShrieksOfGhosts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00372_LegacyOfInsolence/Q00372_LegacyOfInsolence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00372_LegacyOfInsolence/Q00372_LegacyOfInsolence.java
index 1bccc6f298..0a29fe3c57 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00372_LegacyOfInsolence/Q00372_LegacyOfInsolence.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00372_LegacyOfInsolence/Q00372_LegacyOfInsolence.java
@@ -125,13 +125,13 @@ public class Q00372_LegacyOfInsolence extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		final int chance = getRandom(100);
 		if (qs == null)
 		{
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java
index 128f361fc9..55a6ba1046 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java
@@ -155,7 +155,7 @@ public class Q00373_SupplierOfReagents extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java
index 6093a4ca76..a75c11571b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java
@@ -64,7 +64,7 @@ public class Q00376_ExplorationOfTheGiantsCavePart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java
index 44023b8d90..5c67a1bd39 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java
@@ -68,7 +68,7 @@ public class Q00377_ExplorationOfTheGiantsCavePart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00378_GrandFeast/Q00378_GrandFeast.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00378_GrandFeast/Q00378_GrandFeast.java
index 4088dab52d..73d386991f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00378_GrandFeast/Q00378_GrandFeast.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00378_GrandFeast/Q00378_GrandFeast.java
@@ -57,7 +57,7 @@ public class Q00378_GrandFeast extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00379_FantasyWine/Q00379_FantasyWine.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00379_FantasyWine/Q00379_FantasyWine.java
index 39eb315693..11a294a2fa 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00379_FantasyWine/Q00379_FantasyWine.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00379_FantasyWine/Q00379_FantasyWine.java
@@ -54,7 +54,7 @@ public class Q00379_FantasyWine extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00380_BringOutTheFlavorOfIngredients/Q00380_BringOutTheFlavorOfIngredients.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00380_BringOutTheFlavorOfIngredients/Q00380_BringOutTheFlavorOfIngredients.java
index 513ad963a8..c8881d12b3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00380_BringOutTheFlavorOfIngredients/Q00380_BringOutTheFlavorOfIngredients.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00380_BringOutTheFlavorOfIngredients/Q00380_BringOutTheFlavorOfIngredients.java
@@ -64,7 +64,7 @@ public class Q00380_BringOutTheFlavorOfIngredients extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java
index aaa64cbee9..d7a4d19542 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java
@@ -56,7 +56,7 @@ public class Q00381_LetsBecomeARoyalMember extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00382_KailsMagicCoin/Q00382_KailsMagicCoin.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00382_KailsMagicCoin/Q00382_KailsMagicCoin.java
index 01879be71f..576196f002 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00382_KailsMagicCoin/Q00382_KailsMagicCoin.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00382_KailsMagicCoin/Q00382_KailsMagicCoin.java
@@ -67,7 +67,7 @@ public class Q00382_KailsMagicCoin extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00383_TreasureHunt/Q00383_TreasureHunt.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00383_TreasureHunt/Q00383_TreasureHunt.java
index bcb4c3f5e9..43e44178e0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00383_TreasureHunt/Q00383_TreasureHunt.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00383_TreasureHunt/Q00383_TreasureHunt.java
@@ -73,7 +73,7 @@ public class Q00383_TreasureHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java
index fb04492f02..6b72e4a8d3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java
@@ -137,7 +137,7 @@ public class Q00384_WarehouseKeepersPastime extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null))
@@ -332,7 +332,7 @@ public class Q00384_WarehouseKeepersPastime extends Quest
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private String takeHtml(Player player, QuestState qs, int num, int npcId)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00385_YokeOfThePast/Q00385_YokeOfThePast.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00385_YokeOfThePast/Q00385_YokeOfThePast.java
index a233ee52cb..d7cbfab3cc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00385_YokeOfThePast/Q00385_YokeOfThePast.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00385_YokeOfThePast/Q00385_YokeOfThePast.java
@@ -106,7 +106,7 @@ public class Q00385_YokeOfThePast extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
index 52d23ae640..33309a5251 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
@@ -134,7 +134,7 @@ public class Q00386_StolenDignity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (npc.getId() == WAREHOUSE_KEEPER_ROMP))
@@ -269,7 +269,7 @@ public class Q00386_StolenDignity extends Quest
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private String takeHtml(Player player, QuestState qs, int num)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
index f1c0f1c51c..386614d570 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
@@ -65,7 +65,7 @@ public class Q00401_PathOfTheWarrior extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
index 92917c0f79..54988dc2bd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
@@ -90,7 +90,7 @@ public class Q00402_PathOfTheHumanKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
index 96df9535e4..5a3cb474d6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
@@ -93,7 +93,7 @@ public class Q00403_PathOfTheRogue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
index 16eb6d7a7f..2607758ac3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
@@ -72,7 +72,7 @@ public class Q00404_PathOfTheHumanWizard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
index aa393026d9..5cc5457036 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
@@ -68,7 +68,7 @@ public class Q00405_PathOfTheCleric extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
index 7fea7e6aae..8d7be782d3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
@@ -73,7 +73,7 @@ public class Q00406_PathOfTheElvenKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
index 248e27298e..51605f1851 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
@@ -67,7 +67,7 @@ public class Q00407_PathOfTheElvenScout extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
index 86e1180a03..2769e78748 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
@@ -70,7 +70,7 @@ public class Q00408_PathOfTheElvenWizard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
index 5ac126c170..1de79fa94f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
@@ -66,7 +66,7 @@ public class Q00409_PathOfTheElvenOracle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
index f76749bb55..445a1bf24e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
@@ -62,7 +62,7 @@ public class Q00410_PathOfThePalusKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
index b8b05acfb7..1d10d8515a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
@@ -62,7 +62,7 @@ public class Q00411_PathOfTheAssassin extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
index ea690a4132..f87eb94d47 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
@@ -69,7 +69,7 @@ public class Q00412_PathOfTheDarkWizard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
index 301e9df582..163d0f68f0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
@@ -66,7 +66,7 @@ public class Q00413_PathOfTheShillienOracle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
index 5202f6f943..bba233ec8f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
@@ -65,7 +65,7 @@ public class Q00414_PathOfTheOrcRaider extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
index ebfc7d19db..61d591cda9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
@@ -92,7 +92,7 @@ public class Q00415_PathOfTheOrcMonk extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
index 1cc968a42d..d03cf805c8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
@@ -91,7 +91,7 @@ public class Q00416_PathOfTheOrcShaman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
index 3aa5b8e282..29711af625 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
@@ -86,7 +86,7 @@ public class Q00417_PathOfTheScavenger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
index 84c128e1b7..39ccc3ecb2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
@@ -69,7 +69,7 @@ public class Q00418_PathOfTheArtisan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00419_GetAPet/Q00419_GetAPet.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00419_GetAPet/Q00419_GetAPet.java
index 9404812c1a..490feeef00 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00419_GetAPet/Q00419_GetAPet.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00419_GetAPet/Q00419_GetAPet.java
@@ -159,7 +159,7 @@ public class Q00419_GetAPet extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
index a5df1b36af..b96364d059 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
@@ -129,7 +129,7 @@ public class Q00420_LittleWing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
index 3cf86b0f08..d15d303e0c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
@@ -86,7 +86,7 @@ public class Q00421_LittleWingsBigAdventure extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("DESPAWN_GUARDIAN".equals(event))
 		{
@@ -94,7 +94,7 @@ public class Q00421_LittleWingsBigAdventure extends Quest
 			{
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java
index 24f72ee7db..ced6e9a1c4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java
@@ -71,7 +71,7 @@ public class Q00422_RepentYourSins extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00423_TakeYourBestShot/Q00423_TakeYourBestShot.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00423_TakeYourBestShot/Q00423_TakeYourBestShot.java
index bde1c1731e..474f35979b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00423_TakeYourBestShot/Q00423_TakeYourBestShot.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00423_TakeYourBestShot/Q00423_TakeYourBestShot.java
@@ -54,7 +54,7 @@ public class Q00423_TakeYourBestShot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java
index 3f2f97d13b..2f049999bc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java
@@ -352,7 +352,7 @@ public class Q00426_QuestForFishingShot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java
index d613c05f91..c830993f7d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java
@@ -55,7 +55,7 @@ public class Q00431_WeddingMarch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java
index 6cee1f8c34..c7fa82395d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java
@@ -49,7 +49,7 @@ public class Q00432_BirthdayPartySong extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
index 6a80076f67..f80d8c3aa8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
@@ -55,7 +55,7 @@ public class Q00450_GraveRobberRescue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
index acc42d2006..e2d884c7d5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
@@ -57,7 +57,7 @@ public class Q00451_LuciensAltar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
index e34a20fdb8..1b7dfcd1a2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
@@ -50,7 +50,7 @@ public class Q00452_FindingtheLostSoldiers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
index b7daf55f42..a1527b7bad 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
@@ -211,7 +211,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java
index dd3972a97b..f95f63619d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java
@@ -64,7 +64,7 @@ public class Q00454_CompletelyLost extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
index 6daf2a37e3..f67b20750b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
@@ -91,7 +91,7 @@ public class Q00455_WingsOfSand extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
index e7960e1c64..5fb73bd9b8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
@@ -230,7 +230,7 @@ public class Q00456_DontKnowDontCare extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java
index 52ffce7a1c..983bfc9488 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java
@@ -65,7 +65,7 @@ public class Q00457_LostAndFound extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java
index 9a3b50ac3e..040507a695 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java
@@ -83,7 +83,7 @@ public class Q00458_PerfectForm extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String noQuest = getNoQuestMsg(player);
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00461_RumbleInTheBase/Q00461_RumbleInTheBase.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00461_RumbleInTheBase/Q00461_RumbleInTheBase.java
index 0a1f6d69cb..449aa83442 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00461_RumbleInTheBase/Q00461_RumbleInTheBase.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00461_RumbleInTheBase/Q00461_RumbleInTheBase.java
@@ -63,7 +63,7 @@ public class Q00461_RumbleInTheBase extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java
index a32f763602..b3a034f49c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java
@@ -111,7 +111,7 @@ public class Q00463_IMustBeaGenius extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java
index 65109ffac9..e57a4a872a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java
@@ -87,7 +87,7 @@ public class Q00464_Oath extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java
index 02257e1329..3a123f2dfa 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java
@@ -106,7 +106,7 @@ public class Q00501_ProofOfClanAlliance extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java
index 1496baa0e7..fa050bef5e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java
@@ -85,7 +85,7 @@ public class Q00503_PursuitOfClanAmbition extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java
index 55a5f4b621..fcaaec140c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java
@@ -64,7 +64,7 @@ public class Q00504_CompetitionForTheBanditStronghold extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
index 865eb0b656..306dcf6bd0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
@@ -74,7 +74,7 @@ public class Q00508_AClansReputation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
index 150c95ef9f..c204113005 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
@@ -69,7 +69,7 @@ public class Q00509_AClansFame extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
index ad478b5c25..f9373ef6ee 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
@@ -55,7 +55,7 @@ public class Q00510_AClansPrestige extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
index 80fd1e12b9..1db5bc0577 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
@@ -318,7 +318,7 @@ public class Q00511_AwlUnderFoot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		if (event.equalsIgnoreCase("enter"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
index 8a663cc71b..c240f04a79 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
@@ -113,7 +113,7 @@ public class Q00512_BladeUnderFoot extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
index ecf3aca848..be635ddfd1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
@@ -51,7 +51,7 @@ public class Q00551_OlympiadStarter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00552_OlympiadVeteran/Q00552_OlympiadVeteran.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00552_OlympiadVeteran/Q00552_OlympiadVeteran.java
index a219091d6b..72ebe8a7ea 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00552_OlympiadVeteran/Q00552_OlympiadVeteran.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00552_OlympiadVeteran/Q00552_OlympiadVeteran.java
@@ -49,7 +49,7 @@ public class Q00552_OlympiadVeteran extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
index 3bcdd37775..822cad08f4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
@@ -50,7 +50,7 @@ public class Q00553_OlympiadUndefeated extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java
index 9de82dd8fc..c49c8a0c3c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java
@@ -79,7 +79,7 @@ public class Q00601_WatchingEyes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java
index e1e010dc93..94cc0e5ef5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java
@@ -80,7 +80,7 @@ public class Q00602_ShadowOfLight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00603_DaimonTheWhiteEyedPart1/Q00603_DaimonTheWhiteEyedPart1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00603_DaimonTheWhiteEyedPart1/Q00603_DaimonTheWhiteEyedPart1.java
index 66fe3736a5..a14e8907a1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00603_DaimonTheWhiteEyedPart1/Q00603_DaimonTheWhiteEyedPart1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00603_DaimonTheWhiteEyedPart1/Q00603_DaimonTheWhiteEyedPart1.java
@@ -64,7 +64,7 @@ public class Q00603_DaimonTheWhiteEyedPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java
index fbca15fd0e..26a50bd354 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java
@@ -69,7 +69,7 @@ public class Q00604_DaimonTheWhiteEyedPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("DESPAWN".equals(event))
 		{
@@ -78,7 +78,7 @@ public class Q00604_DaimonTheWhiteEyedPart2 extends Quest
 				npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getTemplate().getDisplayId(), NpcStringId.CAN_LIGHT_EXIST_WITHOUT_DARKNESS));
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java
index 413f9861ce..66664f1140 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java
@@ -189,7 +189,7 @@ public class Q00605_AllianceWithKetraOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java
index 959228be25..5c1a23e6d1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java
@@ -71,7 +71,7 @@ public class Q00606_BattleAgainstVarkaSilenos extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00607_ProveYourCourageKetra/Q00607_ProveYourCourageKetra.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00607_ProveYourCourageKetra/Q00607_ProveYourCourageKetra.java
index 15eba2362e..4bcf994e80 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00607_ProveYourCourageKetra/Q00607_ProveYourCourageKetra.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00607_ProveYourCourageKetra/Q00607_ProveYourCourageKetra.java
@@ -62,7 +62,7 @@ public class Q00607_ProveYourCourageKetra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00608_SlayTheEnemyCommanderKetra/Q00608_SlayTheEnemyCommanderKetra.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00608_SlayTheEnemyCommanderKetra/Q00608_SlayTheEnemyCommanderKetra.java
index d172d7c670..abd7afb8fd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00608_SlayTheEnemyCommanderKetra/Q00608_SlayTheEnemyCommanderKetra.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00608_SlayTheEnemyCommanderKetra/Q00608_SlayTheEnemyCommanderKetra.java
@@ -62,7 +62,7 @@ public class Q00608_SlayTheEnemyCommanderKetra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00609_MagicalPowerOfWaterPart1/Q00609_MagicalPowerOfWaterPart1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00609_MagicalPowerOfWaterPart1/Q00609_MagicalPowerOfWaterPart1.java
index ce3357dbcc..c369c79051 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00609_MagicalPowerOfWaterPart1/Q00609_MagicalPowerOfWaterPart1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00609_MagicalPowerOfWaterPart1/Q00609_MagicalPowerOfWaterPart1.java
@@ -91,7 +91,7 @@ public class Q00609_MagicalPowerOfWaterPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java
index cc7b7626d7..8abb7bd48c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java
@@ -95,7 +95,7 @@ public class Q00610_MagicalPowerOfWaterPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (player != null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java
index 2b2bea7316..888aad1b6b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java
@@ -189,7 +189,7 @@ public class Q00611_AllianceWithVarkaSilenos extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java
index 2e56c6bbb4..fbc7262bf6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java
@@ -71,7 +71,7 @@ public class Q00612_BattleAgainstKetraOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00613_ProveYourCourageVarka/Q00613_ProveYourCourageVarka.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00613_ProveYourCourageVarka/Q00613_ProveYourCourageVarka.java
index d40bef609b..691782f40c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00613_ProveYourCourageVarka/Q00613_ProveYourCourageVarka.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00613_ProveYourCourageVarka/Q00613_ProveYourCourageVarka.java
@@ -62,7 +62,7 @@ public class Q00613_ProveYourCourageVarka extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00614_SlayTheEnemyCommanderVarka/Q00614_SlayTheEnemyCommanderVarka.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00614_SlayTheEnemyCommanderVarka/Q00614_SlayTheEnemyCommanderVarka.java
index 5a8abb0976..69db73b822 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00614_SlayTheEnemyCommanderVarka/Q00614_SlayTheEnemyCommanderVarka.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00614_SlayTheEnemyCommanderVarka/Q00614_SlayTheEnemyCommanderVarka.java
@@ -62,7 +62,7 @@ public class Q00614_SlayTheEnemyCommanderVarka extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00615_MagicalPowerOfFirePart1/Q00615_MagicalPowerOfFirePart1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00615_MagicalPowerOfFirePart1/Q00615_MagicalPowerOfFirePart1.java
index f4b17d65d5..dc4cc878fc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00615_MagicalPowerOfFirePart1/Q00615_MagicalPowerOfFirePart1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00615_MagicalPowerOfFirePart1/Q00615_MagicalPowerOfFirePart1.java
@@ -91,7 +91,7 @@ public class Q00615_MagicalPowerOfFirePart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java
index 948f8e83cf..3766161454 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java
@@ -95,7 +95,7 @@ public class Q00616_MagicalPowerOfFirePart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (player != null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
index e3854ec567..6e77b4ed50 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
@@ -84,7 +84,7 @@ public class Q00617_GatherTheFlames extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
index cc4e121273..fc5922e189 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
@@ -65,7 +65,7 @@ public class Q00618_IntoTheFlame extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java
index f6a4097c1f..004af89c0c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java
@@ -222,7 +222,7 @@ public class Q00619_RelicsOfTheOldEmpire extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
index ea8df463c0..dd1bb965a0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
@@ -283,7 +283,7 @@ public class Q00620_FourGoblets extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
index effc3c81e3..e473202bfa 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
@@ -62,7 +62,7 @@ public class Q00621_EggDelivery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
index 8a857ca301..0aa311db9e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
@@ -62,7 +62,7 @@ public class Q00622_SpecialtyLiquorDelivery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
index a464df7f99..a0ed4ec2a8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
@@ -66,7 +66,7 @@ public class Q00623_TheFinestFood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java
index 5bc0f17027..fc16434fd0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java
@@ -63,7 +63,7 @@ public class Q00624_TheFinestIngredientsPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java
index 7d92f54bf6..219df8edf6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java
@@ -70,7 +70,7 @@ public class Q00625_TheFinestIngredientsPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java
index 46a5233f0c..9844404f75 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java
@@ -76,7 +76,7 @@ public class Q00626_ADarkTwilight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
index 3b46324c88..a1edaa2dc1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
@@ -78,7 +78,7 @@ public class Q00627_HeartInSearchOfPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00628_HuntGoldenRam/Q00628_HuntGoldenRam.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00628_HuntGoldenRam/Q00628_HuntGoldenRam.java
index 1448942be1..bcbab02a87 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00628_HuntGoldenRam/Q00628_HuntGoldenRam.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00628_HuntGoldenRam/Q00628_HuntGoldenRam.java
@@ -68,7 +68,7 @@ public class Q00628_HuntGoldenRam extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00629_CleanUpTheSwampOfScreams/Q00629_CleanUpTheSwampOfScreams.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00629_CleanUpTheSwampOfScreams/Q00629_CleanUpTheSwampOfScreams.java
index 435517304b..9968e1db9f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00629_CleanUpTheSwampOfScreams/Q00629_CleanUpTheSwampOfScreams.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00629_CleanUpTheSwampOfScreams/Q00629_CleanUpTheSwampOfScreams.java
@@ -64,7 +64,7 @@ public class Q00629_CleanUpTheSwampOfScreams extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
index 79d69e4221..d4e6a5b7a8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
@@ -88,7 +88,7 @@ public class Q00631_DeliciousTopChoiceMeat extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00632_NecromancersRequest/Q00632_NecromancersRequest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00632_NecromancersRequest/Q00632_NecromancersRequest.java
index 8c1168ca71..afa8bc9c7f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00632_NecromancersRequest/Q00632_NecromancersRequest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00632_NecromancersRequest/Q00632_NecromancersRequest.java
@@ -86,7 +86,7 @@ public class Q00632_NecromancersRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00633_InTheForgottenVillage/Q00633_InTheForgottenVillage.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00633_InTheForgottenVillage/Q00633_InTheForgottenVillage.java
index 616403eb1b..fbd451dddd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00633_InTheForgottenVillage/Q00633_InTheForgottenVillage.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00633_InTheForgottenVillage/Q00633_InTheForgottenVillage.java
@@ -82,7 +82,7 @@ public class Q00633_InTheForgottenVillage extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00634_InSearchOfFragmentsOfDimension/Q00634_InSearchOfFragmentsOfDimension.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00634_InSearchOfFragmentsOfDimension/Q00634_InSearchOfFragmentsOfDimension.java
index 05a3cc09db..7a93d78232 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00634_InSearchOfFragmentsOfDimension/Q00634_InSearchOfFragmentsOfDimension.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00634_InSearchOfFragmentsOfDimension/Q00634_InSearchOfFragmentsOfDimension.java
@@ -113,7 +113,7 @@ public class Q00634_InSearchOfFragmentsOfDimension extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00636_TruthBeyond/Q00636_TruthBeyond.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00636_TruthBeyond/Q00636_TruthBeyond.java
index 82c697eb13..6026cea784 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00636_TruthBeyond/Q00636_TruthBeyond.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00636_TruthBeyond/Q00636_TruthBeyond.java
@@ -47,7 +47,7 @@ public class Q00636_TruthBeyond extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java
index e685ece542..a647861153 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java
@@ -55,7 +55,7 @@ public class Q00637_ThroughOnceMore extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java
index 750958df2b..3331e52fb5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java
@@ -144,7 +144,7 @@ public class Q00638_SeekersOfTheHolyGrail extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00640_TheZeroHour/Q00640_TheZeroHour.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00640_TheZeroHour/Q00640_TheZeroHour.java
index 4ae9fb1f3c..9b3566f774 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00640_TheZeroHour/Q00640_TheZeroHour.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00640_TheZeroHour/Q00640_TheZeroHour.java
@@ -67,7 +67,7 @@ public class Q00640_TheZeroHour extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
index 6ab1e34b5a..f7548f5322 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
@@ -57,7 +57,7 @@ public class Q00641_AttackSailren extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
index 6bfda3b650..6a5cece0b8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
@@ -65,7 +65,7 @@ public class Q00642_APowerfulPrimevalCreature extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
index 41c5a83b2a..48d241ef82 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
@@ -103,7 +103,7 @@ public class Q00643_RiseAndFallOfTheElrokiTribe extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00644_GraveRobberAnnihilation/Q00644_GraveRobberAnnihilation.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00644_GraveRobberAnnihilation/Q00644_GraveRobberAnnihilation.java
index 5a7f3de9a9..a6520c95ab 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00644_GraveRobberAnnihilation/Q00644_GraveRobberAnnihilation.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00644_GraveRobberAnnihilation/Q00644_GraveRobberAnnihilation.java
@@ -69,7 +69,7 @@ public class Q00644_GraveRobberAnnihilation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
index 11380b346c..c0c41af2c2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
@@ -59,7 +59,7 @@ public class Q00645_GhostsOfBatur extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java
index f19e6e21c5..8c073d215e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java
@@ -80,7 +80,7 @@ public class Q00647_InfluxOfMachines extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
index 6f6013cac1..ff2f3a5bfe 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
@@ -99,7 +99,7 @@ public class Q00648_AnIceMerchantsDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		final QuestState q115 = player.getQuestState(Q00115_TheOtherSideOfTruth.class.getSimpleName());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java
index ed8a7098bd..12c3c895c2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java
@@ -64,7 +64,7 @@ public class Q00649_ALooterAndARailroadMan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java
index f8ca72a5c6..ee4fd2ec82 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java
@@ -62,7 +62,7 @@ public class Q00650_ABrokenDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java
index 6a7f9e4d23..46ac78b78d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java
@@ -44,7 +44,7 @@ public class Q00651_RunawayYouth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java
index 3b7c5667cc..d7dc848522 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java
@@ -43,7 +43,7 @@ public class Q00652_AnAgedExAdventurer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java
index 166a837704..540054065f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java
@@ -44,7 +44,7 @@ public class Q00653_WildMaiden extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00654_JourneyToASettlement/Q00654_JourneyToASettlement.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00654_JourneyToASettlement/Q00654_JourneyToASettlement.java
index 13d9cec672..a1df7d8955 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00654_JourneyToASettlement/Q00654_JourneyToASettlement.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00654_JourneyToASettlement/Q00654_JourneyToASettlement.java
@@ -57,7 +57,7 @@ public class Q00654_JourneyToASettlement extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java
index 846079bb62..6ebe5e05b1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java
@@ -57,7 +57,7 @@ public class Q00655_AGrandPlanForTamingWildBeasts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00659_IdRatherBeCollectingFairyBreath/Q00659_IdRatherBeCollectingFairyBreath.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00659_IdRatherBeCollectingFairyBreath/Q00659_IdRatherBeCollectingFairyBreath.java
index 30ced074ca..30a9c94b5e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00659_IdRatherBeCollectingFairyBreath/Q00659_IdRatherBeCollectingFairyBreath.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00659_IdRatherBeCollectingFairyBreath/Q00659_IdRatherBeCollectingFairyBreath.java
@@ -57,7 +57,7 @@ public class Q00659_IdRatherBeCollectingFairyBreath extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java
index 036b45a2e2..08710c0a44 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java
@@ -76,7 +76,7 @@ public class Q00660_AidingTheFloranVillage extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00661_MakingTheHarvestGroundsSafe/Q00661_MakingTheHarvestGroundsSafe.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00661_MakingTheHarvestGroundsSafe/Q00661_MakingTheHarvestGroundsSafe.java
index bc6d631b9f..355fdff359 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00661_MakingTheHarvestGroundsSafe/Q00661_MakingTheHarvestGroundsSafe.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00661_MakingTheHarvestGroundsSafe/Q00661_MakingTheHarvestGroundsSafe.java
@@ -59,7 +59,7 @@ public class Q00661_MakingTheHarvestGroundsSafe extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
index f006c781a8..d6cc0a545b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
@@ -96,7 +96,7 @@ public class Q00662_AGameOfCards extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
index 51e0b7e7e2..44bd41e890 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
@@ -215,7 +215,7 @@ public class Q00663_SeductiveWhispers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = getNoQuestMsg(player);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
index 1dfdc81b32..e1e41ba51e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
@@ -49,7 +49,7 @@ public class Q00688_DefeatTheElrokianRaiders extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java
index 82e4c5fb29..455a6f85a8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java
@@ -71,7 +71,7 @@ public class Q00690_JudesRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java
index 18a550aa1f..1fb168dfa7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java
@@ -65,7 +65,7 @@ public class Q00691_MatrasSuspiciousRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java
index 99909e2930..dffdf64577 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java
@@ -109,7 +109,7 @@ public class Q00692_HowtoOpposeEvil extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java
index bad265c98f..e553a7b594 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java
@@ -46,7 +46,7 @@ public class Q00694_BreakThroughTheHallOfSuffering extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00695_DefendTheHallOfSuffering/Q00695_DefendTheHallOfSuffering.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00695_DefendTheHallOfSuffering/Q00695_DefendTheHallOfSuffering.java
index 4f430756fd..ae416dc043 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00695_DefendTheHallOfSuffering/Q00695_DefendTheHallOfSuffering.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00695_DefendTheHallOfSuffering/Q00695_DefendTheHallOfSuffering.java
@@ -46,7 +46,7 @@ public class Q00695_DefendTheHallOfSuffering extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00696_ConquerTheHallOfErosion/Q00696_ConquerTheHallOfErosion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00696_ConquerTheHallOfErosion/Q00696_ConquerTheHallOfErosion.java
index 6a30a09252..b14b082086 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00696_ConquerTheHallOfErosion/Q00696_ConquerTheHallOfErosion.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00696_ConquerTheHallOfErosion/Q00696_ConquerTheHallOfErosion.java
@@ -36,7 +36,7 @@ public class Q00696_ConquerTheHallOfErosion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00697_DefendTheHallOfErosion/Q00697_DefendTheHallOfErosion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00697_DefendTheHallOfErosion/Q00697_DefendTheHallOfErosion.java
index 5104113d9b..0799656316 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00697_DefendTheHallOfErosion/Q00697_DefendTheHallOfErosion.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00697_DefendTheHallOfErosion/Q00697_DefendTheHallOfErosion.java
@@ -36,7 +36,7 @@ public class Q00697_DefendTheHallOfErosion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00698_BlockTheLordsEscape/Q00698_BlockTheLordsEscape.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00698_BlockTheLordsEscape/Q00698_BlockTheLordsEscape.java
index ab1069cb99..4c80d00212 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00698_BlockTheLordsEscape/Q00698_BlockTheLordsEscape.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00698_BlockTheLordsEscape/Q00698_BlockTheLordsEscape.java
@@ -36,7 +36,7 @@ public class Q00698_BlockTheLordsEscape extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java
index 98017742e3..4248288d86 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java
@@ -64,7 +64,7 @@ public class Q00699_GuardianOfTheSkies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java
index ec2f7cfab2..861cf0287b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java
@@ -72,7 +72,7 @@ public class Q00700_CursedLife extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java
index 5408b7064b..99384aeb93 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java
@@ -65,7 +65,7 @@ public class Q00701_ProofOfExistence extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player, false);
 		if (st == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java
index 23ecdaf28c..4764cf132d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java
@@ -62,7 +62,7 @@ public class Q00702_ATrapForRevenge extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00708_PathToBecomingALordGludio/Q00708_PathToBecomingALordGludio.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00708_PathToBecomingALordGludio/Q00708_PathToBecomingALordGludio.java
index 3b56424b4f..0bec1da2f0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00708_PathToBecomingALordGludio/Q00708_PathToBecomingALordGludio.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00708_PathToBecomingALordGludio/Q00708_PathToBecomingALordGludio.java
@@ -70,7 +70,7 @@ public class Q00708_PathToBecomingALordGludio extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00709_PathToBecomingALordDion/Q00709_PathToBecomingALordDion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00709_PathToBecomingALordDion/Q00709_PathToBecomingALordDion.java
index 5b097b0c6a..0acf77c906 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00709_PathToBecomingALordDion/Q00709_PathToBecomingALordDion.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00709_PathToBecomingALordDion/Q00709_PathToBecomingALordDion.java
@@ -78,7 +78,7 @@ public class Q00709_PathToBecomingALordDion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00710_PathToBecomingALordGiran/Q00710_PathToBecomingALordGiran.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00710_PathToBecomingALordGiran/Q00710_PathToBecomingALordGiran.java
index 79b5611f3c..fe7f477228 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00710_PathToBecomingALordGiran/Q00710_PathToBecomingALordGiran.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00710_PathToBecomingALordGiran/Q00710_PathToBecomingALordGiran.java
@@ -73,7 +73,7 @@ public class Q00710_PathToBecomingALordGiran extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(getName());
 		final Castle castle = CastleManager.getInstance().getCastleById(GIRAN_CASTLE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00711_PathToBecomingALordInnadril/Q00711_PathToBecomingALordInnadril.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00711_PathToBecomingALordInnadril/Q00711_PathToBecomingALordInnadril.java
index 7d1a8f5973..1951e20c19 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00711_PathToBecomingALordInnadril/Q00711_PathToBecomingALordInnadril.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00711_PathToBecomingALordInnadril/Q00711_PathToBecomingALordInnadril.java
@@ -64,7 +64,7 @@ public class Q00711_PathToBecomingALordInnadril extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = player.getQuestState(getName());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00712_PathToBecomingALordOren/Q00712_PathToBecomingALordOren.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00712_PathToBecomingALordOren/Q00712_PathToBecomingALordOren.java
index ce7a568155..a7a158c242 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00712_PathToBecomingALordOren/Q00712_PathToBecomingALordOren.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00712_PathToBecomingALordOren/Q00712_PathToBecomingALordOren.java
@@ -64,7 +64,7 @@ public class Q00712_PathToBecomingALordOren extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(getName());
 		final Castle castle = CastleManager.getInstance().getCastleById(OREN_CASTLE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00713_PathToBecomingALordAden/Q00713_PathToBecomingALordAden.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00713_PathToBecomingALordAden/Q00713_PathToBecomingALordAden.java
index d77f510be0..6f645c326c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00713_PathToBecomingALordAden/Q00713_PathToBecomingALordAden.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00713_PathToBecomingALordAden/Q00713_PathToBecomingALordAden.java
@@ -54,7 +54,7 @@ public class Q00713_PathToBecomingALordAden extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(getName());
 		final Castle castle = CastleManager.getInstance().getCastleById(ADEN_CASTLE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00714_PathToBecomingALordSchuttgart/Q00714_PathToBecomingALordSchuttgart.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00714_PathToBecomingALordSchuttgart/Q00714_PathToBecomingALordSchuttgart.java
index bb8192f146..a690719308 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00714_PathToBecomingALordSchuttgart/Q00714_PathToBecomingALordSchuttgart.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00714_PathToBecomingALordSchuttgart/Q00714_PathToBecomingALordSchuttgart.java
@@ -74,7 +74,7 @@ public class Q00714_PathToBecomingALordSchuttgart extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(getName());
 		final Castle castle = CastleManager.getInstance().getCastleById(SCHUTTGART_CASTLE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00715_PathToBecomingALordGoddard/Q00715_PathToBecomingALordGoddard.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00715_PathToBecomingALordGoddard/Q00715_PathToBecomingALordGoddard.java
index b729287928..137f3b7d07 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00715_PathToBecomingALordGoddard/Q00715_PathToBecomingALordGoddard.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00715_PathToBecomingALordGoddard/Q00715_PathToBecomingALordGoddard.java
@@ -50,7 +50,7 @@ public class Q00715_PathToBecomingALordGoddard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(getName());
 		final Castle castle = CastleManager.getInstance().getCastleById(GODDARD_CASTLE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00716_PathToBecomingALordRune/Q00716_PathToBecomingALordRune.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00716_PathToBecomingALordRune/Q00716_PathToBecomingALordRune.java
index 7dd9096293..8f48fdace9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00716_PathToBecomingALordRune/Q00716_PathToBecomingALordRune.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00716_PathToBecomingALordRune/Q00716_PathToBecomingALordRune.java
@@ -69,7 +69,7 @@ public class Q00716_PathToBecomingALordRune extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(getName());
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
index ab30f4db2b..3314b8dc27 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
@@ -121,7 +121,7 @@ public class Q00726_LightWithinTheDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = player.getQuestState(getName());
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
index 343f460924..62cfdf6454 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
@@ -207,7 +207,7 @@ public class Q00727_HopeWithinTheDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		if (event.equalsIgnoreCase("enter"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
index fb8cafac72..8a33fc7b0f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
@@ -58,7 +58,7 @@ public class Q00901_HowLavasaurusesAreMade extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java
index 425dece861..2959e41806 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java
@@ -80,7 +80,7 @@ public class Q00902_ReclaimOurEra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
index 36444e64ea..d5a5ab6b4c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
@@ -55,7 +55,7 @@ public class Q00903_TheCallOfAntharas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00904_DragonTrophyAntharas/Q00904_DragonTrophyAntharas.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00904_DragonTrophyAntharas/Q00904_DragonTrophyAntharas.java
index daab90117b..dc4175c6b3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00904_DragonTrophyAntharas/Q00904_DragonTrophyAntharas.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00904_DragonTrophyAntharas/Q00904_DragonTrophyAntharas.java
@@ -61,7 +61,7 @@ public class Q00904_DragonTrophyAntharas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
index 40d7efb2cc..51fff3997d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
@@ -103,7 +103,7 @@ public class Q00905_RefinedDragonBlood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
index f2ad5396ea..5e11d70ca8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
@@ -65,7 +65,7 @@ public class Q00906_TheCallOfValakas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java
index f073e7fdbc..b4fc5c11fb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java
@@ -61,7 +61,7 @@ public class Q00907_DragonTrophyValakas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00998_FallenAngelSelect/Q00998_FallenAngelSelect.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00998_FallenAngelSelect/Q00998_FallenAngelSelect.java
index e0e86e1466..f6b444cc95 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00998_FallenAngelSelect/Q00998_FallenAngelSelect.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00998_FallenAngelSelect/Q00998_FallenAngelSelect.java
@@ -48,7 +48,7 @@ public class Q00998_FallenAngelSelect extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState st = getQuestState(player, false);
 		if (st == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00999_T1Tutorial/Q00999_T1Tutorial.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00999_T1Tutorial/Q00999_T1Tutorial.java
index 79755893b3..1fe57fd34f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00999_T1Tutorial/Q00999_T1Tutorial.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00999_T1Tutorial/Q00999_T1Tutorial.java
@@ -142,7 +142,7 @@ public class Q00999_T1Tutorial extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Config.DISABLE_TUTORIAL)
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java
index 42da4579a7..81566d9533 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java
@@ -45,7 +45,7 @@ public class Q10267_JourneyToGracia extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java
index 25e706dda2..3c48fc0b74 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java
@@ -44,7 +44,7 @@ public class Q10268_ToTheSeedOfInfinity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java
index 7954905242..f7e830c95c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java
@@ -44,7 +44,7 @@ public class Q10269_ToTheSeedOfDestruction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10270_BirthOfTheSeed/Q10270_BirthOfTheSeed.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10270_BirthOfTheSeed/Q10270_BirthOfTheSeed.java
index b4739634e6..21cf330dd1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10270_BirthOfTheSeed/Q10270_BirthOfTheSeed.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10270_BirthOfTheSeed/Q10270_BirthOfTheSeed.java
@@ -102,7 +102,7 @@ public class Q10270_BirthOfTheSeed extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10271_TheEnvelopingDarkness/Q10271_TheEnvelopingDarkness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10271_TheEnvelopingDarkness/Q10271_TheEnvelopingDarkness.java
index e842d8b8a6..8c60fcd643 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10271_TheEnvelopingDarkness/Q10271_TheEnvelopingDarkness.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10271_TheEnvelopingDarkness/Q10271_TheEnvelopingDarkness.java
@@ -44,7 +44,7 @@ public class Q10271_TheEnvelopingDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java
index f9956cdce7..e68fd0b8e8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java
@@ -71,7 +71,7 @@ public class Q10272_LightFragment extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
index 59e896c6bf..9af97f66dd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
@@ -55,7 +55,7 @@ public class Q10273_GoodDayToFly extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
index 2463507ca9..f1639af403 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
@@ -67,7 +67,7 @@ public class Q10274_CollectingInTheAir extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
index f935b4b0d9..5d32a914ba 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
@@ -60,7 +60,7 @@ public class Q10275_ContainingTheAttributePower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java
index b63137816e..657551653f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java
@@ -52,7 +52,7 @@ public class Q10276_MutatedKaneusGludio extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java
index f4fa288aa9..0821c19c40 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java
@@ -52,7 +52,7 @@ public class Q10277_MutatedKaneusDion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java
index 352d827bfe..41a11c3bbd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java
@@ -52,7 +52,7 @@ public class Q10278_MutatedKaneusHeine extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java
index 9f785e9521..e7622bdf90 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java
@@ -52,7 +52,7 @@ public class Q10279_MutatedKaneusOren extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java
index 5ef3f6390e..d8c2158528 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java
@@ -52,7 +52,7 @@ public class Q10280_MutatedKaneusSchuttgart extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
index feaf350c6c..fb71c26e05 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
@@ -50,7 +50,7 @@ public class Q10281_MutatedKaneusRune extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
index 70ea98053b..26d2120b71 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
@@ -44,7 +44,7 @@ public class Q10282_ToTheSeedOfAnnihilation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
index b83cb4e287..05c007f752 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
@@ -48,14 +48,14 @@ public class Q10283_RequestOfIceMerchant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == JINIA) && "DESPAWN".equals(event))
 		{
 			isBusy = false;
 			talker = 0;
 			npc.deleteMe();
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java
index 37dfda7959..d5e94d8b57 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java
@@ -54,7 +54,7 @@ public class Q10284_AcquisitionOfDivineSword extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
index ffc6cdcd60..eb2f4b6bce 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
@@ -57,7 +57,7 @@ public class Q10285_MeetingSirra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
index 079822e777..a7aa00c9c8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
@@ -57,7 +57,7 @@ public class Q10286_ReunionWithSirra extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
index d52bcc1112..fd6f6d1313 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
@@ -50,7 +50,7 @@ public class Q10287_StoryOfThoseLeft extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
index f6cdb7b900..538ece42e0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
@@ -48,7 +48,7 @@ public class Q10288_SecretMission extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java
index ebc3b15a3a..19e9c7f984 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java
@@ -48,7 +48,7 @@ public class Q10289_FadeToBlack extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
index 58aafa7832..8763b47647 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
@@ -54,7 +54,7 @@ public class Q10290_LandDragonConqueror extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
index e91b558dba..8523d4a8c0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
@@ -52,7 +52,7 @@ public class Q10291_FireDragonDestroyer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
index 5f7adc44af..f8cdf4ff28 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
@@ -68,7 +68,7 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java
index 7bcb081700..76663fd25c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java
@@ -55,7 +55,7 @@ public class Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java
index 7225cda5e7..4f4348be56 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java
@@ -92,7 +92,7 @@ public class Q10294_SevenSignsToTheMonasteryOfSilence extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java
index 2f433e6836..f39f5e8595 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java
@@ -67,7 +67,7 @@ public class Q10295_SevenSignsSolinasTomb extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java
index 74b6639e7b..f409041837 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java
@@ -51,7 +51,7 @@ public class Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
index bacbb7058b..ad79a5980b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
@@ -73,7 +73,7 @@ public class Q10501_ZakenEmbroideredSoulCloak extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (player.getLevel() >= MIN_LEVEL) && event.equals("32612-04.html"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
index 5a203958ae..a0c2cb5697 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
@@ -73,7 +73,7 @@ public class Q10502_FreyaEmbroideredSoulCloak extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (player.getLevel() >= MIN_LEVEL) && event.equals("32612-04.html"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
index 224940ecd9..08aa62d532 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
@@ -74,7 +74,7 @@ public class Q10503_FrintezzaEmbroideredSoulCloak extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (player.getLevel() >= MIN_LEVEL) && event.equals("32612-04.html"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java
index dc59cfeb9d..c8cd4ccd15 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java
@@ -66,7 +66,7 @@ public class Q10504_JewelOfAntharas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java
index b587e54fe8..a67d6cf0d5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java
@@ -66,7 +66,7 @@ public class Q10505_JewelOfValakas extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
index 7ff39fb0c0..8675a7ec2c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
@@ -51,7 +51,7 @@ public class AllianceMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!"9001-01.htm".equals(event) && (player.getClan() == null))
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
index 9bd56d50c3..eaa524cfef 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
@@ -69,7 +69,7 @@ public class ClanMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LEADER_REQUIRED.containsKey(event) && !player.isClanLeader())
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
index 1feeb34bdc..a83aac0754 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
@@ -62,7 +62,7 @@ public class DarkElfChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
index 7ba0619564..f059b8666f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
@@ -78,7 +78,7 @@ public class DarkElfChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
index 14f49ed1fd..816b96e4a9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
@@ -51,7 +51,7 @@ public class DwarfBlacksmithChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
index 52812ad4a4..54a365faab 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
@@ -57,7 +57,7 @@ public class DwarfBlacksmithChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
index d372ba5b2a..daafa6d9bc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
@@ -51,7 +51,7 @@ public class DwarfWarehouseChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
index 552b968cda..537fb2bd4f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
@@ -57,7 +57,7 @@ public class DwarfWarehouseChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
index 07aac523db..fdd471c3ce 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
@@ -60,7 +60,7 @@ public class ElfHumanClericChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
index 7c238fc992..268027c600 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
@@ -60,7 +60,7 @@ public class ElfHumanFighterChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
index f7e3bba54a..a4f8bcecda 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
@@ -75,7 +75,7 @@ public class ElfHumanFighterChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
index b33e852f7c..1d016bc05a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
@@ -59,7 +59,7 @@ public class ElfHumanWizardChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
index 90825aebb9..eda8996c5d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
@@ -64,7 +64,7 @@ public class ElfHumanWizardChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
index 0475e879b3..814097f932 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
@@ -62,7 +62,7 @@ public class FirstClassTransferTalk extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return event;
 	}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/KamaelChange1/KamaelChange1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/KamaelChange1/KamaelChange1.java
index f59a64640e..4521543017 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/KamaelChange1/KamaelChange1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/KamaelChange1/KamaelChange1.java
@@ -56,7 +56,7 @@ public class KamaelChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/KamaelChange2/KamaelChange2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/KamaelChange2/KamaelChange2.java
index 7536d09ee4..8ebd8f8814 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/KamaelChange2/KamaelChange2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/KamaelChange2/KamaelChange2.java
@@ -77,7 +77,7 @@ public class KamaelChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
index 3c595b9827..61020e2b22 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
@@ -52,7 +52,7 @@ public class OrcChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
index 151e59f21e..feb8847d2e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
@@ -65,7 +65,7 @@ public class OrcChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/Quest.java
index c6ad08dcbd..5b983bc914 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/Quest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/Quest.java
@@ -221,7 +221,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -243,7 +243,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -529,7 +529,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 		String res = null;
 		try
 		{
-			res = onAdvEvent(event, npc, player);
+			res = onEvent(event, npc, player);
 		}
 		catch (Exception e)
 		{
@@ -985,12 +985,11 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 */
 	public String onDeath(Creature killer, Creature victim, QuestState qs)
 	{
-		return onAdvEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
+		return onEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
 	}
 	
 	/**
 	 * This function is called whenever a player clicks on a link in a quest dialog and whenever a timer fires.<br>
-	 * If is not overridden by a subclass, then default to the returned value of the simpler (and older) {@link #onEvent(String, QuestState)} override.<br>
 	 * If the player has a quest state, use it as parameter in the next call, otherwise return null.
 	 * @param event this parameter contains a string identifier for the event.<br>
 	 *            Generally, this string is passed directly via the link.<br>
@@ -1009,35 +1008,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 *            This parameter may be {@code null} in certain circumstances.
 	 * @return the text returned by the event (may be {@code null}, a filename or just text)
 	 */
-	public String onAdvEvent(String event, Npc npc, Player player)
-	{
-		if (player != null)
-		{
-			final QuestState qs = player.getQuestState(getName());
-			if (qs != null)
-			{
-				return onEvent(event, qs);
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * This function is called in place of {@link #onAdvEvent(String, Npc, Player)} if the former is not implemented.<br>
-	 * If a script contains both {@link #onAdvEvent(String, Npc, Player)} and this implementation, then this method will never be called unless the script's {@link #onAdvEvent(String, Npc, Player)} explicitly calls this method.
-	 * @param event this parameter contains a string identifier for the event.<br>
-	 *            Generally, this string is passed directly via the link.<br>
-	 *            For example:<br>
-	 *            <code>
-	 *            &lt;a action="bypass -h Quest 626_ADarkTwilight 31517-01.htm"&gt;hello&lt;/a&gt;
-	 *            </code><br>
-	 *            The above link sets the event variable to "31517-01.htm" for the quest 626_ADarkTwilight.<br>
-	 *            In the case of timers, this will be the name of the timer.<br>
-	 *            This parameter serves as a sort of identifier.
-	 * @param qs this parameter contains a reference to the quest state of the player who used the link or started the timer.
-	 * @return the text returned by the event (may be {@code null}, a filename or just text)
-	 */
-	public String onEvent(String event, QuestState qs)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return null;
 	}
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
index a26e6075fd..31fc2ba199 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
@@ -43,12 +43,12 @@ public class Toma extends AbstractNpcAI
 	private Toma()
 	{
 		addFirstTalkId(TOMA);
-		onAdvEvent("RESPAWN_TOMA", null, null);
+		onEvent("RESPAWN_TOMA", null, null);
 		startQuestTimer("RESPAWN_TOMA", TELEPORT_DELAY, null, null, true);
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("RESPAWN_TOMA"))
 		{
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
index 6f8858a2a4..dd735beeaa 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
@@ -41,7 +41,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -54,7 +54,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 				npc.deleteMe();
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_DAY_NIGHT_CHANGE)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
index 76379f11ef..9e3b09ef23 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
@@ -38,14 +38,14 @@ public class Roxxy extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TEXT_SPAM") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SPEAK_WITH_ME_ABOUT_TRAVELING_AROUND_ADEN, 1000);
 			startQuestTimer("TEXT_SPAM", getRandom(10000, 30000), npc, null, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/bosses/Core/Core.java
index 71150c1323..b9dcb38092 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -142,7 +142,7 @@ public class Core extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
@@ -161,7 +161,7 @@ public class Core extends AbstractNpcAI
 			_minions.forEach(Attackable::decayMe);
 			_minions.clear();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index e74bc817e6..11c8477773 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -180,7 +180,7 @@ public class Orfen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -263,7 +263,7 @@ public class Orfen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 93735c996b..72e174bb65 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -155,7 +155,7 @@ public class QueenAnt extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -239,7 +239,7 @@ public class QueenAnt extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index 04fed5ab1b..b95d115b2c 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -59,7 +59,7 @@ public class ArenaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -124,7 +124,7 @@ public class ArenaManager extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
index b07792cd2d..11b8786523 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
@@ -57,7 +57,7 @@ public class CastleBlacksmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return (event.equalsIgnoreCase(npc.getId() + "-02.html") && hasRights(player, npc)) ? event : null;
 	}
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
index bb01178f53..0a2d84b789 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
@@ -393,7 +393,7 @@ public class CastleChamberlain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Castle castle = npc.getCastle();
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
index b9c1f3faf5..70bae86615 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
@@ -72,7 +72,7 @@ public class CastleDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
index bb32dde319..a319e3977f 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
@@ -56,7 +56,7 @@ public class CastleMercenaryManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index a2bf4617a1..06a742f8c8 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -78,7 +78,7 @@ public class CastleTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
@@ -168,7 +168,7 @@ public class CastleTeleporter extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
index bffed40bcc..ea1b40c41c 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
@@ -52,7 +52,7 @@ public class CastleWarehouse extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final boolean isMyLord = player.isClanLeader() && (player.getClan().getCastleId() == (npc.getCastle() != null ? npc.getCastle().getResidenceId() : -1));
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index 7fa66429b0..48867dd351 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -64,7 +64,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
index a86581206e..afd7250ca4 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
@@ -57,7 +57,7 @@ public class ClanHallDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index bc399da8e5..f1a436b50b 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -98,7 +98,7 @@ public class ClanHallManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index a33440f6bc..fe1a08f97b 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -235,7 +235,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		if (!_isEnabled)
 		{
@@ -902,7 +902,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	{
 		if (event.getCommand().startsWith("Quest ClassMaster "))
 		{
-			final String html = onAdvEvent(event.getCommand().substring(18), null, event.getPlayer());
+			final String html = onEvent(event.getCommand().substring(18), null, event.getPlayer());
 			event.getPlayer().sendPacket(TutorialCloseHtml.STATIC_PACKET);
 			showResult(event.getPlayer(), html);
 		}
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/DivineBeast.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/DivineBeast.java
index 1f247a7b35..3f3a076992 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/DivineBeast.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/DivineBeast.java
@@ -44,7 +44,7 @@ public class DivineBeast extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player == null) || !player.hasServitors())
 		{
@@ -55,7 +55,7 @@ public class DivineBeast extends AbstractNpcAI
 			cancelQuestTimer(event, npc, player);
 			player.getServitors().values().forEach(summon -> summon.unSummon(player));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
index bbff4608fc..8812882c93 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
@@ -69,7 +69,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
index 7d1abb4769..187fbae9dd 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
@@ -56,7 +56,7 @@ public class NewbieGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("0"))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
index acc83d72d8..27ab7e4f74 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
@@ -69,7 +69,7 @@ public class OlyBuffer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.startsWith("giveBuff;") && (npc.getScriptValue() < 5))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index 201f3843ba..f08fb759ac 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -70,7 +70,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
index 21d281c6c9..435f293345 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
@@ -84,7 +84,7 @@ public class Proclaimer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("giveBuff"))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
index ea0a8a16da..1fc1737173 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
@@ -79,7 +79,7 @@ public class ProvisionalHalls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/RandomWalkingGuards.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
index 8138dee3ee..ffe4fd87f1 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
@@ -48,7 +48,7 @@ public class RandomWalkingGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("RANDOM_WALK") && (npc != null))
 		{
@@ -59,7 +59,7 @@ public class RandomWalkingGuards extends AbstractNpcAI
 			}
 			startQuestTimer("RANDOM_WALK", getRandom(MIN_WALK_DELAY, MAX_WALK_DELAY), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/Servitors/SinEater.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/Servitors/SinEater.java
index 1ed8d645a5..d7536614e8 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/Servitors/SinEater.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/Servitors/SinEater.java
@@ -48,7 +48,7 @@ public class SinEater extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TALK") && (player != null) && (player.getPet() != null))
 		{
@@ -79,7 +79,7 @@ public class SinEater extends AbstractNpcAI
 			}
 			startQuestTimer("TALK", 60000, null, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_CREATURE_DEATH)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
index b8e769f36b..2830f9bca4 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
@@ -50,7 +50,7 @@ public class SymbolMaker extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
index 04d4672c76..b595c4d6d4 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
@@ -86,7 +86,7 @@ public class ToIVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int npcId = npc.getId();
 		
@@ -132,7 +132,7 @@ public class ToIVortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index 356236cfc7..bf5b0506dc 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -188,7 +188,7 @@ public class WyvernManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
index 0c2e7586c9..c49be5297b 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
@@ -36,7 +36,7 @@ public class DelevelManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.DELEVEL_MANAGER_ENABLED)
 		{
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
index ff6d40ec0e..4713803f1d 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
@@ -54,7 +54,7 @@ public class FactionSystem extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class FactionSystem extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
index 8b9c676ad5..771c8a9058 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
@@ -34,7 +34,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -77,7 +77,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 				npc.broadcastInfo(); // update flag status
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
index 669fcfc85c..ddf7e923eb 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
@@ -39,7 +39,7 @@ public class NoblessMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.NOBLESS_MASTER_ENABLED)
 		{
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
index 4f0f0c988a..5ba22124c1 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
@@ -215,7 +215,7 @@ public class NpcLocationInfo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (Util.isDigit(event))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
index 8e1f84c102..3a9b5b4bdc 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
@@ -169,7 +169,7 @@ public class Deathmatch extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
index 1eb84eca93..b92bbe7f77 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
@@ -213,7 +213,7 @@ public class Rabbits extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/events/Race/Race.java
index ff9fc462f6..6ac325ca6f 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/events/Race/Race.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/events/Race/Race.java
@@ -320,7 +320,7 @@ public class Race extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index e827184ae4..60da9f13d3 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -186,7 +186,7 @@ public class TvT extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index 53d917a5c7..a00de57ae5 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -44,7 +44,7 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java
index 5c95ae45b2..46ebc9569f 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java
@@ -52,7 +52,7 @@ public class Q00001_LettersOfLove extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java
index 4b0d98b480..b919ca7cb9 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java
@@ -56,7 +56,7 @@ public class Q00002_WhatWomenWant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java
index 7b951b3bbb..cf06da2248 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java
@@ -58,7 +58,7 @@ public class Q00003_WillTheSealBeBroken extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java
index 0b17c08913..c0426a0f95 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java
@@ -62,7 +62,7 @@ public class Q00004_LongLiveThePaagrioLord extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java
index fd70f6fc1a..c01e73d555 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java
@@ -58,7 +58,7 @@ public class Q00005_MinersFavor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java
index 3e49ce3e34..94cc53f893 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java
@@ -63,7 +63,7 @@ public class Q00101_SwordOfSolidarity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java
index f102da50b5..be903e75bd 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java
@@ -80,7 +80,7 @@ public class Q00102_SeaOfSporesFever extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30284-02.htm"))
@@ -89,7 +89,7 @@ public class Q00102_SeaOfSporesFever extends Quest
 			giveItems(player, ALBERIUS_LETTER, 1);
 			return event;
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java
index f904289c6e..1bd749e419 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java
@@ -66,7 +66,7 @@ public class Q00103_SpiritOfCraftsman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java
index a0be02e126..3612ce2ffa 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java
@@ -69,7 +69,7 @@ public class Q00104_SpiritOfMirrors extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30017-04.htm"))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java
index 310567491a..183b2fe249 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java
@@ -89,7 +89,7 @@ public class Q00105_SkirmishWithOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java
index 2235976814..06ee2a920f 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java
@@ -61,7 +61,7 @@ public class Q00106_ForgottenTruth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java
index 2115b08bb5..7f9a43746a 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java
@@ -60,7 +60,7 @@ public class Q00107_MercilessPunishment extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java
index 595593a59e..27f8345b86 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java
@@ -84,7 +84,7 @@ public class Q00108_JumbleTumbleDiamondFuss extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java
index b6f1db8606..80cb4bdb2e 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java
@@ -57,7 +57,7 @@ public class Q00151_CureForFever extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30050-03.htm"))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java
index b5ba64cf6e..65ef7dd7f2 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java
@@ -53,7 +53,7 @@ public class Q00152_ShardsOfGolem extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java
index 4a2d16f383..f6de972041 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java
@@ -54,7 +54,7 @@ public class Q00153_DeliverGoods extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (npc.getId() == ARNOLD_ID) && event.equalsIgnoreCase("30041-02.html"))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java
index 89520ee13d..3565a5e101 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java
@@ -54,7 +54,7 @@ public class Q00154_SacrificeToTheSea extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30312-03.htm"))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java
index b384a65f1c..eb9f2b9fd9 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java
@@ -46,7 +46,7 @@ public class Q00155_FindSirWindawood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30042-03.htm"))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java
index 394cd0f249..035f23f1e2 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java
@@ -47,7 +47,7 @@ public class Q00156_MillenniumLove extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java
index 3127631a29..f14de51738 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java
@@ -49,7 +49,7 @@ public class Q00157_RecoverSmuggledGoods extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java
index f3545be0ab..371311ebf1 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java
@@ -53,7 +53,7 @@ public class Q00158_SeedOfEvil extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30031-03.htm"))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java
index 0b338edac3..d8ea0f5822 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java
@@ -54,7 +54,7 @@ public class Q00159_ProtectTheWaterSource extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30154-04.htm"))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java
index d8d17b96d8..6f4eac457e 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java
@@ -53,7 +53,7 @@ public class Q00160_NerupasRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30370-04.htm"))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java
index cf0b7ed114..36667e4789 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java
@@ -47,7 +47,7 @@ public class Q00161_FruitOfTheMotherTree extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java
index c798c0b498..950113993e 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java
@@ -66,7 +66,7 @@ public class Q00162_CurseOfTheUndergroundFortress extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java
index 821cef7188..5838caa460 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java
@@ -58,7 +58,7 @@ public class Q00163_LegacyOfThePoet extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java
index 7c4d756f2f..77f7de165c 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java
@@ -51,7 +51,7 @@ public class Q00164_BloodFiend extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30149-04.htm"))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java
index 9158530da3..4a5ad604e8 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java
@@ -61,7 +61,7 @@ public class Q00165_ShilensHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30348-03.htm"))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java
index 1074e0cf48..a0de30162d 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java
@@ -62,7 +62,7 @@ public class Q00166_MassOfDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30130-03.htm"))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java
index 18e81aa594..aa100ab630 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java
@@ -47,7 +47,7 @@ public class Q00167_DwarvenKinship extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java
index 3ab148a70e..4d954078aa 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java
@@ -61,7 +61,7 @@ public class Q00168_DeliverSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30349-03.htm"))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java
index b4b07b94d7..ffca67d880 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java
@@ -53,7 +53,7 @@ public class Q00169_OffspringOfNightmares extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java
index c88a4ae63b..27ad086001 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java
@@ -54,7 +54,7 @@ public class Q00170_DangerousSeduction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
index 6b7de9bd96..18b11d47ae 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
@@ -76,7 +76,7 @@ public class Q00211_TrialOfTheChallenger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
index efde71ba49..2e70c4f9b1 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
@@ -86,7 +86,7 @@ public class Q00212_TrialOfDuty extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
index a0f8f915b3..1f4f42c490 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
@@ -92,7 +92,7 @@ public class Q00213_TrialOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
index 94bba112f2..6dfacfa116 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
@@ -120,7 +120,7 @@ public class Q00214_TrialOfTheScholar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
index da0399c8ce..a555adb852 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
@@ -77,7 +77,7 @@ public class Q00215_TrialOfThePilgrim extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
index 05aade19d6..82ef5fe081 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
@@ -94,7 +94,7 @@ public class Q00216_TrialOfTheGuildsman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
index 32a88e353e..86edef3008 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
@@ -107,7 +107,7 @@ public class Q00217_TestimonyOfTrust extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
index a5d3455060..05ed9df156 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
@@ -104,7 +104,7 @@ public class Q00218_TestimonyOfLife extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
index 5e3eb02369..9eae62eb6e 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
@@ -107,7 +107,7 @@ public class Q00219_TestimonyOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
index 24d8bf39f4..e22e3a6c92 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
@@ -121,7 +121,7 @@ public class Q00220_TestimonyOfGlory extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
index a276b60f56..dff82abd5d 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
@@ -124,7 +124,7 @@ public class Q00221_TestimonyOfProsperity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
index 761bdeb64a..3f03f3e509 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
@@ -88,7 +88,7 @@ public class Q00222_TestOfTheDuelist extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
index bd794eef75..d0bbb73b4f 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
@@ -85,7 +85,7 @@ public class Q00223_TestOfTheChampion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
index 163aa900f4..346538dc45 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
@@ -94,7 +94,7 @@ public class Q00224_TestOfSagittarius extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
index ae9bb5fb4d..e7a6b7ef1a 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
@@ -91,7 +91,7 @@ public class Q00225_TestOfTheSearcher extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
index c3dc04f3f1..9d8e8a161d 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
@@ -81,7 +81,7 @@ public class Q00226_TestOfTheHealer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
index ba1fc6097e..dac23aac62 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
@@ -114,7 +114,7 @@ public class Q00227_TestOfTheReformer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("DESPAWN".equals(event))
 		{
@@ -127,7 +127,7 @@ public class Q00227_TestOfTheReformer extends Quest
 			{
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
index 6ca6b63f34..42f8db1e54 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
@@ -99,7 +99,7 @@ public class Q00228_TestOfMagus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
index 954c6b4142..706fc8fb29 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
@@ -115,7 +115,7 @@ public class Q00229_TestOfWitchcraft extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
index 2d810c2bb4..9e61822eca 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
@@ -163,7 +163,7 @@ public class Q00230_TestOfTheSummoner extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
index ea9ab4c98d..0b1696278f 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
@@ -81,7 +81,7 @@ public class Q00231_TestOfTheMaestro extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
index bdd4cb26b5..8aaeb13125 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
@@ -106,7 +106,7 @@ public class Q00232_TestOfTheLord extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
index a8f0d1a2a5..3c14c2ef63 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
@@ -106,7 +106,7 @@ public class Q00233_TestOfTheWarSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
index 20afca3b0a..2d09f826cb 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
@@ -143,7 +143,7 @@ public class Q00255_Tutorial extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
index a98a9a317b..3f8ecbb375 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
@@ -88,7 +88,7 @@ public class Q00257_TheGuardIsBusy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
index ddd656d3ad..c19e69fd3d 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
@@ -66,7 +66,7 @@ public class Q00258_BringWolfPelts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30001-03.html"))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
index 02efc29fd9..88ca56e754 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
@@ -70,7 +70,7 @@ public class Q00259_RequestFromTheFarmOwner extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
index 6e63d6faf4..e3e252ec97 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
@@ -63,7 +63,7 @@ public class Q00260_OrcHunting extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
index d88e62677f..1ac73e678c 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
@@ -61,7 +61,7 @@ public class Q00261_CollectorsDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30222-03.htm"))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
index 95721f08dc..29b898dc6d 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
@@ -59,7 +59,7 @@ public class Q00262_TradeWithTheIvoryTower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30137-03.htm"))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
index 1bdeec4a83..950346cf59 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
@@ -61,7 +61,7 @@ public class Q00263_OrcSubjugation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
index 20ddbeac20..bd848ee2cf 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
@@ -68,7 +68,7 @@ public class Q00264_KeenClaws extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30136-03.htm"))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
index d90ce43946..195dc0675d 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
@@ -58,7 +58,7 @@ public class Q00265_BondsOfSlavery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
index 68c5dd1cc3..87c949919f 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
@@ -72,7 +72,7 @@ public class Q00266_PleasOfPixies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("31852-04.htm"))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
index aa676c5d46..5b26a51d59 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
@@ -50,7 +50,7 @@ public class Q00267_WrathOfVerdure extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
index b6c64f4db7..52a1ad5ec8 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
@@ -54,7 +54,7 @@ public class Q00271_ProofOfValor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30577-04.htm"))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
index 0c0748e735..8fc6eb06c2 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
@@ -54,7 +54,7 @@ public class Q00272_WrathOfAncestors extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30572-04.htm"))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
index b3f9d4bb1b..00afdb3a51 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
@@ -60,7 +60,7 @@ public class Q00273_InvadersOfTheHolyLand extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
index f45e185d3f..de06f688b3 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
@@ -57,7 +57,7 @@ public class Q00274_SkirmishWithTheWerewolves extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30569-04.htm"))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
index 1e6a02f4f9..31e70fba32 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
@@ -59,7 +59,7 @@ public class Q00275_DarkWingedSpies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30567-03.htm"))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
index 74935e9104..e8f904d1f6 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
@@ -74,7 +74,7 @@ public class Q00276_TotemOfTheHestui extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30571-03.htm"))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
index 156b85fdf6..6b507503c3 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
@@ -51,7 +51,7 @@ public class Q00277_GatekeepersOffering extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30576-03.htm"))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java
index 9f34fec4db..6017f331f9 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java
@@ -56,7 +56,7 @@ public class Q00291_RevengeOfTheRedbonnet extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30553-03.htm"))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
index 8e245d375c..48ed318353 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
@@ -68,7 +68,7 @@ public class Q00292_BrigandsSweep extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
index 227398a92d..93d41b6c06 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
@@ -59,7 +59,7 @@ public class Q00293_TheHiddenVeins extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
index 554161d862..a56345d2f9 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
@@ -62,7 +62,7 @@ public class Q00294_CovertBusiness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && qs.isCreated() && event.equals("30534-03.htm"))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
index 98daa7c06c..2e8d1c601d 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
@@ -51,7 +51,7 @@ public class Q00295_DreamingOfTheSkies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && qs.isCreated() && event.equals("30536-03.htm"))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
index 4d1d5b1777..9dc8ba9904 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
@@ -56,7 +56,7 @@ public class Q00296_TarantulasSpiderSilk extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
index e0b5bc2986..099201eb88 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
@@ -52,7 +52,7 @@ public class Q00297_GatekeepersFavor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30540-03.htm"))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
index 65317d4367..8960b5ee57 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
@@ -49,7 +49,7 @@ public class Q00303_CollectArrowheads extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30029-04.htm"))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
index 20009b3457..e520a0cd92 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
@@ -65,7 +65,7 @@ public class Q00306_CrystalOfFireAndIce extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
index 69cbcdbf2a..a1eb4478d8 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
@@ -51,7 +51,7 @@ public class Q00313_CollectSpores extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
index fb42e610a9..5c4fe19392 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
@@ -70,7 +70,7 @@ public class Q00316_DestroyPlagueCarriers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
index 86a347b60b..b69fd606ea 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
@@ -52,7 +52,7 @@ public class Q00317_CatchTheWind extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
index e88feb95e2..fc8f958e8c 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
@@ -54,7 +54,7 @@ public class Q00319_ScentOfDeath extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
index 8fd327d6b5..49cc3a2f09 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
@@ -55,7 +55,7 @@ public class Q00320_BonesTellTheFuture extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30359-04.htm"))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
index a97a566c92..03cf67028d 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
@@ -60,7 +60,7 @@ public class Q00324_SweetestVenom extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
index 233ae4efea..308b9d1e12 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
@@ -79,7 +79,7 @@ public class Q00325_GrimCollector extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
index dc3eb65ec4..2566d50918 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
@@ -69,7 +69,7 @@ public class Q00326_VanquishRemnants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
index 1956e2923e..99a18a2d23 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
@@ -105,7 +105,7 @@ public class Q00327_RecoverTheFarmland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
index 64cc6ef8e9..b8d1a39d6c 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
@@ -70,7 +70,7 @@ public class Q00328_SenseForBusiness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
index 72407eabc3..25eb32f4d0 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
@@ -62,7 +62,7 @@ public class Q00329_CuriosityOfADwarf extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
index 518d845bcc..dd71a57310 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
@@ -65,7 +65,7 @@ public class Q00331_ArrowOfVengeance extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
index 498b165be2..02f12606c7 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
@@ -121,7 +121,7 @@ public class Q00333_HuntOfTheBlackLion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		final int chance = getRandom(100);
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
index aaf517b7a9..e910c1e70e 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
@@ -68,7 +68,7 @@ public class Q00369_CollectorOfJewels extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
index d24b38b112..c6c223f5a1 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
@@ -70,7 +70,7 @@ public class Q00370_AnElderSowsSeeds extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
index 7773083c9a..c29c87b26d 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
@@ -65,7 +65,7 @@ public class Q00401_PathOfTheWarrior extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
index 73be798601..f90aa18585 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
@@ -90,7 +90,7 @@ public class Q00402_PathOfTheHumanKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
index bd13a4bbe9..9bd736acaa 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
@@ -93,7 +93,7 @@ public class Q00403_PathOfTheRogue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
index 4b0285fcef..ac44dd64d6 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
@@ -72,7 +72,7 @@ public class Q00404_PathOfTheHumanWizard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
index 455a88115a..b7ad34d507 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
@@ -68,7 +68,7 @@ public class Q00405_PathOfTheCleric extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
index 60a2100263..fcb92b0837 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
@@ -73,7 +73,7 @@ public class Q00406_PathOfTheElvenKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
index e8ae130e75..89dbb1cea4 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
@@ -67,7 +67,7 @@ public class Q00407_PathOfTheElvenScout extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
index e35ea8444b..86dd94df1f 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
@@ -70,7 +70,7 @@ public class Q00408_PathOfTheElvenWizard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
index 809b741536..1e788f366f 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
@@ -66,7 +66,7 @@ public class Q00409_PathOfTheElvenOracle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
index 261122d3ff..727d4148f0 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
@@ -62,7 +62,7 @@ public class Q00410_PathOfThePalusKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
index d0849cb9a0..b6bd1f946a 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
@@ -62,7 +62,7 @@ public class Q00411_PathOfTheAssassin extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
index a2a12199b7..fda1cd4beb 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
@@ -69,7 +69,7 @@ public class Q00412_PathOfTheDarkWizard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
index cf84a5a883..55897e0028 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
@@ -66,7 +66,7 @@ public class Q00413_PathOfTheShillienOracle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
index 9bd2adec48..34d1af1f9c 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
@@ -65,7 +65,7 @@ public class Q00414_PathOfTheOrcRaider extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
index 0d21264633..3b6f7f4fb5 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
@@ -90,7 +90,7 @@ public class Q00415_PathOfTheOrcMonk extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
index ff64a6210f..09a10e6e1d 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
@@ -87,7 +87,7 @@ public class Q00416_PathOfTheOrcShaman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
index 2e9a9937b5..973de273fc 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
@@ -84,7 +84,7 @@ public class Q00417_PathOfTheScavenger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
index 23061e130c..43770b4eb1 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
@@ -66,7 +66,7 @@ public class Q00418_PathOfTheArtisan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
index c6c6541b90..e40f43ea81 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
@@ -82,7 +82,7 @@ public class Q00662_AGameOfCards extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
index 06ea44ceb1..6698687a4e 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
@@ -45,7 +45,7 @@ public class AllianceMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!"9001-01.htm".equals(event) && (player.getClan() == null))
 		{
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
index b69c69d8d0..b9cae10d1b 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
@@ -74,7 +74,7 @@ public class ClanMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LEADER_REQUIRED.containsKey(event) && !player.isClanLeader())
 		{
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
index 472b265d19..7560171dd1 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
@@ -61,7 +61,7 @@ public class DarkElfChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
index 1eef46c033..073a93bdae 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
@@ -73,7 +73,7 @@ public class DarkElfChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
index b90395d96a..fe46f96453 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
@@ -50,7 +50,7 @@ public class DwarfBlacksmithChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
index c00f750f8f..7471a928e7 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
@@ -54,7 +54,7 @@ public class DwarfBlacksmithChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
index 187710070c..df7368de42 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
@@ -50,7 +50,7 @@ public class DwarfWarehouseChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
index bcd1325051..e18b5c69e4 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
@@ -54,7 +54,7 @@ public class DwarfWarehouseChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
index 683c50e475..a9da2dffa6 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
@@ -57,7 +57,7 @@ public class ElfHumanClericChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
index c0cf3513d7..eff155a55f 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
@@ -59,7 +59,7 @@ public class ElfHumanFighterChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
index 58bb620a4f..5ab836930b 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
@@ -72,7 +72,7 @@ public class ElfHumanFighterChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
index ed623b52b0..c5b843fdc1 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
@@ -57,7 +57,7 @@ public class ElfHumanWizardChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
index 2b882feda7..7343a5f35c 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
@@ -61,7 +61,7 @@ public class ElfHumanWizardChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
index acf6f9bc2f..1a231cd5d9 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
@@ -53,7 +53,7 @@ public class FirstClassTransferTalk extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return event;
 	}
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
index e3c48b1f33..324f48a504 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
@@ -51,7 +51,7 @@ public class OrcChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
index d055e1ab84..c1808b3396 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
@@ -61,7 +61,7 @@ public class OrcChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/quest/Quest.java
index f343e5d8e9..252c508537 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/quest/Quest.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/quest/Quest.java
@@ -245,7 +245,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -267,7 +267,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -558,7 +558,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 			{
 				player.setSimulatedTalking(false);
 			}
-			res = onAdvEvent(event, npc, player);
+			res = onEvent(event, npc, player);
 		}
 		catch (Exception e)
 		{
@@ -1020,12 +1020,11 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 */
 	public String onDeath(Creature killer, Creature victim, QuestState qs)
 	{
-		return onAdvEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
+		return onEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
 	}
 	
 	/**
 	 * This function is called whenever a player clicks on a link in a quest dialog and whenever a timer fires.<br>
-	 * If is not overridden by a subclass, then default to the returned value of the simpler (and older) {@link #onEvent(String, QuestState)} override.<br>
 	 * If the player has a quest state, use it as parameter in the next call, otherwise return null.
 	 * @param event this parameter contains a string identifier for the event.<br>
 	 *            Generally, this string is passed directly via the link.<br>
@@ -1044,35 +1043,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 *            This parameter may be {@code null} in certain circumstances.
 	 * @return the text returned by the event (may be {@code null}, a filename or just text)
 	 */
-	public String onAdvEvent(String event, Npc npc, Player player)
-	{
-		if (player != null)
-		{
-			final QuestState qs = player.getQuestState(getName());
-			if (qs != null)
-			{
-				return onEvent(event, qs);
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * This function is called in place of {@link #onAdvEvent(String, Npc, Player)} if the former is not implemented.<br>
-	 * If a script contains both {@link #onAdvEvent(String, Npc, Player)} and this implementation, then this method will never be called unless the script's {@link #onAdvEvent(String, Npc, Player)} explicitly calls this method.
-	 * @param event this parameter contains a string identifier for the event.<br>
-	 *            Generally, this string is passed directly via the link.<br>
-	 *            For example:<br>
-	 *            <code>
-	 *            &lt;a action="bypass -h Quest 626_ADarkTwilight 31517-01.htm"&gt;hello&lt;/a&gt;
-	 *            </code><br>
-	 *            The above link sets the event variable to "31517-01.htm" for the quest 626_ADarkTwilight.<br>
-	 *            In the case of timers, this will be the name of the timer.<br>
-	 *            This parameter serves as a sort of identifier.
-	 * @param qs this parameter contains a reference to the quest state of the player who used the link or started the timer.
-	 * @return the text returned by the event (may be {@code null}, a filename or just text)
-	 */
-	public String onEvent(String event, QuestState qs)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return null;
 	}
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
index a26e6075fd..31fc2ba199 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
@@ -43,12 +43,12 @@ public class Toma extends AbstractNpcAI
 	private Toma()
 	{
 		addFirstTalkId(TOMA);
-		onAdvEvent("RESPAWN_TOMA", null, null);
+		onEvent("RESPAWN_TOMA", null, null);
 		startQuestTimer("RESPAWN_TOMA", TELEPORT_DELAY, null, null, true);
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("RESPAWN_TOMA"))
 		{
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
index 6f8858a2a4..dd735beeaa 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
@@ -41,7 +41,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -54,7 +54,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 				npc.deleteMe();
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_DAY_NIGHT_CHANGE)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
index 76379f11ef..9e3b09ef23 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
@@ -38,14 +38,14 @@ public class Roxxy extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TEXT_SPAM") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SPEAK_WITH_ME_ABOUT_TRAVELING_AROUND_ADEN, 1000);
 			startQuestTimer("TEXT_SPAM", getRandom(10000, 30000), npc, null, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index d236e19d43..a5157acfc7 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -193,7 +193,7 @@ public class Antharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -605,7 +605,7 @@ public class Antharas extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/bosses/Core/Core.java
index 71150c1323..b9dcb38092 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -142,7 +142,7 @@ public class Core extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
@@ -161,7 +161,7 @@ public class Core extends AbstractNpcAI
 			_minions.forEach(Attackable::decayMe);
 			_minions.clear();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index e74bc817e6..11c8477773 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -180,7 +180,7 @@ public class Orfen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -263,7 +263,7 @@ public class Orfen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 93735c996b..72e174bb65 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -155,7 +155,7 @@ public class QueenAnt extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -239,7 +239,7 @@ public class QueenAnt extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index 04fed5ab1b..b95d115b2c 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -59,7 +59,7 @@ public class ArenaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -124,7 +124,7 @@ public class ArenaManager extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
index b07792cd2d..11b8786523 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
@@ -57,7 +57,7 @@ public class CastleBlacksmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return (event.equalsIgnoreCase(npc.getId() + "-02.html") && hasRights(player, npc)) ? event : null;
 	}
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
index bb01178f53..0a2d84b789 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
@@ -393,7 +393,7 @@ public class CastleChamberlain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Castle castle = npc.getCastle();
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
index b9c1f3faf5..70bae86615 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
@@ -72,7 +72,7 @@ public class CastleDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
index bb32dde319..a319e3977f 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
@@ -56,7 +56,7 @@ public class CastleMercenaryManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index a2bf4617a1..06a742f8c8 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -78,7 +78,7 @@ public class CastleTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
@@ -168,7 +168,7 @@ public class CastleTeleporter extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
index bffed40bcc..ea1b40c41c 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
@@ -52,7 +52,7 @@ public class CastleWarehouse extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final boolean isMyLord = player.isClanLeader() && (player.getClan().getCastleId() == (npc.getCastle() != null ? npc.getCastle().getResidenceId() : -1));
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index 7fa66429b0..48867dd351 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -64,7 +64,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
index a86581206e..afd7250ca4 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
@@ -57,7 +57,7 @@ public class ClanHallDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index bc399da8e5..f1a436b50b 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -98,7 +98,7 @@ public class ClanHallManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index a33440f6bc..fe1a08f97b 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -235,7 +235,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		if (!_isEnabled)
 		{
@@ -902,7 +902,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	{
 		if (event.getCommand().startsWith("Quest ClassMaster "))
 		{
-			final String html = onAdvEvent(event.getCommand().substring(18), null, event.getPlayer());
+			final String html = onEvent(event.getCommand().substring(18), null, event.getPlayer());
 			event.getPlayer().sendPacket(TutorialCloseHtml.STATIC_PACKET);
 			showResult(event.getPlayer(), html);
 		}
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/DivineBeast.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/DivineBeast.java
index 1f247a7b35..3f3a076992 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/DivineBeast.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/DivineBeast.java
@@ -44,7 +44,7 @@ public class DivineBeast extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player == null) || !player.hasServitors())
 		{
@@ -55,7 +55,7 @@ public class DivineBeast extends AbstractNpcAI
 			cancelQuestTimer(event, npc, player);
 			player.getServitors().values().forEach(summon -> summon.unSummon(player));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
index bbff4608fc..8812882c93 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
@@ -69,7 +69,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
index 7d1abb4769..187fbae9dd 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
@@ -56,7 +56,7 @@ public class NewbieGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("0"))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
index acc83d72d8..27ab7e4f74 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
@@ -69,7 +69,7 @@ public class OlyBuffer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.startsWith("giveBuff;") && (npc.getScriptValue() < 5))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index 201f3843ba..f08fb759ac 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -70,7 +70,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
index 21d281c6c9..435f293345 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
@@ -84,7 +84,7 @@ public class Proclaimer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("giveBuff"))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
index ea0a8a16da..1fc1737173 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
@@ -79,7 +79,7 @@ public class ProvisionalHalls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/RandomWalkingGuards.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
index 8138dee3ee..ffe4fd87f1 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
@@ -48,7 +48,7 @@ public class RandomWalkingGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("RANDOM_WALK") && (npc != null))
 		{
@@ -59,7 +59,7 @@ public class RandomWalkingGuards extends AbstractNpcAI
 			}
 			startQuestTimer("RANDOM_WALK", getRandom(MIN_WALK_DELAY, MAX_WALK_DELAY), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/Servitors/SinEater.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/Servitors/SinEater.java
index 1ed8d645a5..d7536614e8 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/Servitors/SinEater.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/Servitors/SinEater.java
@@ -48,7 +48,7 @@ public class SinEater extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TALK") && (player != null) && (player.getPet() != null))
 		{
@@ -79,7 +79,7 @@ public class SinEater extends AbstractNpcAI
 			}
 			startQuestTimer("TALK", 60000, null, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_CREATURE_DEATH)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
index b8e769f36b..2830f9bca4 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
@@ -50,7 +50,7 @@ public class SymbolMaker extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
index 04d4672c76..b595c4d6d4 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
@@ -86,7 +86,7 @@ public class ToIVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int npcId = npc.getId();
 		
@@ -132,7 +132,7 @@ public class ToIVortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index 356236cfc7..bf5b0506dc 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -188,7 +188,7 @@ public class WyvernManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
index 0c2e7586c9..c49be5297b 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
@@ -36,7 +36,7 @@ public class DelevelManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.DELEVEL_MANAGER_ENABLED)
 		{
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
index ff6d40ec0e..4713803f1d 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
@@ -54,7 +54,7 @@ public class FactionSystem extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class FactionSystem extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
index 8b9c676ad5..771c8a9058 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
@@ -34,7 +34,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -77,7 +77,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 				npc.broadcastInfo(); // update flag status
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
index 669fcfc85c..ddf7e923eb 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
@@ -39,7 +39,7 @@ public class NoblessMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.NOBLESS_MASTER_ENABLED)
 		{
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
index 4f0f0c988a..5ba22124c1 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
@@ -215,7 +215,7 @@ public class NpcLocationInfo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (Util.isDigit(event))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
index 8e1f84c102..3a9b5b4bdc 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
@@ -169,7 +169,7 @@ public class Deathmatch extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
index 1eb84eca93..b92bbe7f77 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
@@ -213,7 +213,7 @@ public class Rabbits extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/events/Race/Race.java
index ff9fc462f6..6ac325ca6f 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/events/Race/Race.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/events/Race/Race.java
@@ -320,7 +320,7 @@ public class Race extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index e827184ae4..60da9f13d3 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -186,7 +186,7 @@ public class TvT extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index 53d917a5c7..a00de57ae5 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -44,7 +44,7 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/events/LetterCollector/LetterCollector.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
index 9030e46d76..da0d972c5b 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
@@ -73,7 +73,7 @@ public class LetterCollector extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
index 762cde5596..245342a91e 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
@@ -45,7 +45,7 @@ public class ThePowerOfLove extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/events/TotalRecall/TotalRecall.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
index 4486ac5f36..a5448d4db5 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
@@ -42,7 +42,7 @@ public class TotalRecall extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
index 5de1a19cd2..3e745b3d08 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
@@ -354,7 +354,7 @@ public class WatermelonNinja extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java
index 5c95ae45b2..46ebc9569f 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java
@@ -52,7 +52,7 @@ public class Q00001_LettersOfLove extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java
index 4b0d98b480..b919ca7cb9 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java
@@ -56,7 +56,7 @@ public class Q00002_WhatWomenWant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java
index 7b951b3bbb..cf06da2248 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java
@@ -58,7 +58,7 @@ public class Q00003_WillTheSealBeBroken extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java
index 0b17c08913..c0426a0f95 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java
@@ -62,7 +62,7 @@ public class Q00004_LongLiveThePaagrioLord extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java
index fd70f6fc1a..c01e73d555 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java
@@ -58,7 +58,7 @@ public class Q00005_MinersFavor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java
index 3e49ce3e34..94cc53f893 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java
@@ -63,7 +63,7 @@ public class Q00101_SwordOfSolidarity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java
index f102da50b5..be903e75bd 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java
@@ -80,7 +80,7 @@ public class Q00102_SeaOfSporesFever extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30284-02.htm"))
@@ -89,7 +89,7 @@ public class Q00102_SeaOfSporesFever extends Quest
 			giveItems(player, ALBERIUS_LETTER, 1);
 			return event;
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java
index f904289c6e..1bd749e419 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java
@@ -66,7 +66,7 @@ public class Q00103_SpiritOfCraftsman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java
index a0be02e126..3612ce2ffa 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java
@@ -69,7 +69,7 @@ public class Q00104_SpiritOfMirrors extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30017-04.htm"))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java
index 310567491a..183b2fe249 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java
@@ -89,7 +89,7 @@ public class Q00105_SkirmishWithOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java
index 2235976814..06ee2a920f 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java
@@ -61,7 +61,7 @@ public class Q00106_ForgottenTruth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java
index 2115b08bb5..7f9a43746a 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java
@@ -60,7 +60,7 @@ public class Q00107_MercilessPunishment extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java
index 595593a59e..27f8345b86 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java
@@ -84,7 +84,7 @@ public class Q00108_JumbleTumbleDiamondFuss extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
index ad72f044ca..b9d8feb578 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
@@ -53,7 +53,7 @@ public class Q00127_FishingSpecialistsRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java
index b6f1db8606..80cb4bdb2e 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java
@@ -57,7 +57,7 @@ public class Q00151_CureForFever extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30050-03.htm"))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java
index b5ba64cf6e..65ef7dd7f2 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java
@@ -53,7 +53,7 @@ public class Q00152_ShardsOfGolem extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java
index 4a2d16f383..f6de972041 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java
@@ -54,7 +54,7 @@ public class Q00153_DeliverGoods extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (npc.getId() == ARNOLD_ID) && event.equalsIgnoreCase("30041-02.html"))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java
index 89520ee13d..3565a5e101 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java
@@ -54,7 +54,7 @@ public class Q00154_SacrificeToTheSea extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30312-03.htm"))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java
index b384a65f1c..eb9f2b9fd9 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java
@@ -46,7 +46,7 @@ public class Q00155_FindSirWindawood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30042-03.htm"))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java
index 394cd0f249..035f23f1e2 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java
@@ -47,7 +47,7 @@ public class Q00156_MillenniumLove extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java
index 3127631a29..f14de51738 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java
@@ -49,7 +49,7 @@ public class Q00157_RecoverSmuggledGoods extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java
index f3545be0ab..371311ebf1 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java
@@ -53,7 +53,7 @@ public class Q00158_SeedOfEvil extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30031-03.htm"))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java
index 0b338edac3..d8ea0f5822 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java
@@ -54,7 +54,7 @@ public class Q00159_ProtectTheWaterSource extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30154-04.htm"))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java
index d8d17b96d8..6f4eac457e 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java
@@ -53,7 +53,7 @@ public class Q00160_NerupasRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30370-04.htm"))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java
index cf0b7ed114..36667e4789 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java
@@ -47,7 +47,7 @@ public class Q00161_FruitOfTheMotherTree extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java
index c798c0b498..950113993e 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java
@@ -66,7 +66,7 @@ public class Q00162_CurseOfTheUndergroundFortress extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java
index 821cef7188..5838caa460 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java
@@ -58,7 +58,7 @@ public class Q00163_LegacyOfThePoet extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java
index 7c4d756f2f..77f7de165c 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java
@@ -51,7 +51,7 @@ public class Q00164_BloodFiend extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30149-04.htm"))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java
index 9158530da3..4a5ad604e8 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java
@@ -61,7 +61,7 @@ public class Q00165_ShilensHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30348-03.htm"))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java
index 1074e0cf48..a0de30162d 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java
@@ -62,7 +62,7 @@ public class Q00166_MassOfDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30130-03.htm"))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java
index 18e81aa594..aa100ab630 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java
@@ -47,7 +47,7 @@ public class Q00167_DwarvenKinship extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java
index 3ab148a70e..4d954078aa 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java
@@ -61,7 +61,7 @@ public class Q00168_DeliverSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30349-03.htm"))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java
index b4b07b94d7..ffca67d880 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java
@@ -53,7 +53,7 @@ public class Q00169_OffspringOfNightmares extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java
index c88a4ae63b..27ad086001 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java
@@ -54,7 +54,7 @@ public class Q00170_DangerousSeduction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
index 6b7de9bd96..18b11d47ae 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
@@ -76,7 +76,7 @@ public class Q00211_TrialOfTheChallenger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
index efde71ba49..2e70c4f9b1 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
@@ -86,7 +86,7 @@ public class Q00212_TrialOfDuty extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
index a0f8f915b3..1f4f42c490 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
@@ -92,7 +92,7 @@ public class Q00213_TrialOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
index 94bba112f2..6dfacfa116 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
@@ -120,7 +120,7 @@ public class Q00214_TrialOfTheScholar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
index da0399c8ce..a555adb852 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
@@ -77,7 +77,7 @@ public class Q00215_TrialOfThePilgrim extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
index 05aade19d6..82ef5fe081 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
@@ -94,7 +94,7 @@ public class Q00216_TrialOfTheGuildsman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
index 32a88e353e..86edef3008 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
@@ -107,7 +107,7 @@ public class Q00217_TestimonyOfTrust extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
index a5d3455060..05ed9df156 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
@@ -104,7 +104,7 @@ public class Q00218_TestimonyOfLife extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
index 5e3eb02369..9eae62eb6e 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
@@ -107,7 +107,7 @@ public class Q00219_TestimonyOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
index 24d8bf39f4..e22e3a6c92 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
@@ -121,7 +121,7 @@ public class Q00220_TestimonyOfGlory extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
index a276b60f56..dff82abd5d 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
@@ -124,7 +124,7 @@ public class Q00221_TestimonyOfProsperity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
index 761bdeb64a..3f03f3e509 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
@@ -88,7 +88,7 @@ public class Q00222_TestOfTheDuelist extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
index bd794eef75..d0bbb73b4f 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
@@ -85,7 +85,7 @@ public class Q00223_TestOfTheChampion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
index 163aa900f4..346538dc45 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
@@ -94,7 +94,7 @@ public class Q00224_TestOfSagittarius extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
index ae9bb5fb4d..e7a6b7ef1a 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
@@ -91,7 +91,7 @@ public class Q00225_TestOfTheSearcher extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
index c3dc04f3f1..9d8e8a161d 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
@@ -81,7 +81,7 @@ public class Q00226_TestOfTheHealer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
index ba1fc6097e..dac23aac62 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
@@ -114,7 +114,7 @@ public class Q00227_TestOfTheReformer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("DESPAWN".equals(event))
 		{
@@ -127,7 +127,7 @@ public class Q00227_TestOfTheReformer extends Quest
 			{
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
index 6ca6b63f34..42f8db1e54 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
@@ -99,7 +99,7 @@ public class Q00228_TestOfMagus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
index 954c6b4142..706fc8fb29 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
@@ -115,7 +115,7 @@ public class Q00229_TestOfWitchcraft extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
index 2d810c2bb4..9e61822eca 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
@@ -163,7 +163,7 @@ public class Q00230_TestOfTheSummoner extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
index ea9ab4c98d..0b1696278f 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
@@ -81,7 +81,7 @@ public class Q00231_TestOfTheMaestro extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
index bdd4cb26b5..8aaeb13125 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
@@ -106,7 +106,7 @@ public class Q00232_TestOfTheLord extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
index a8f0d1a2a5..3c14c2ef63 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
@@ -106,7 +106,7 @@ public class Q00233_TestOfTheWarSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
index 20afca3b0a..2d09f826cb 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
@@ -143,7 +143,7 @@ public class Q00255_Tutorial extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
index a98a9a317b..3f8ecbb375 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
@@ -88,7 +88,7 @@ public class Q00257_TheGuardIsBusy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
index ddd656d3ad..c19e69fd3d 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
@@ -66,7 +66,7 @@ public class Q00258_BringWolfPelts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30001-03.html"))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
index 02efc29fd9..88ca56e754 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
@@ -70,7 +70,7 @@ public class Q00259_RequestFromTheFarmOwner extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
index 6e63d6faf4..e3e252ec97 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
@@ -63,7 +63,7 @@ public class Q00260_OrcHunting extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
index d88e62677f..1ac73e678c 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
@@ -61,7 +61,7 @@ public class Q00261_CollectorsDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30222-03.htm"))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
index 95721f08dc..29b898dc6d 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
@@ -59,7 +59,7 @@ public class Q00262_TradeWithTheIvoryTower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30137-03.htm"))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
index 1bdeec4a83..950346cf59 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
@@ -61,7 +61,7 @@ public class Q00263_OrcSubjugation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
index 20ddbeac20..bd848ee2cf 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
@@ -68,7 +68,7 @@ public class Q00264_KeenClaws extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30136-03.htm"))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
index d90ce43946..195dc0675d 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
@@ -58,7 +58,7 @@ public class Q00265_BondsOfSlavery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
index 68c5dd1cc3..87c949919f 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
@@ -72,7 +72,7 @@ public class Q00266_PleasOfPixies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("31852-04.htm"))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
index aa676c5d46..5b26a51d59 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
@@ -50,7 +50,7 @@ public class Q00267_WrathOfVerdure extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
index b6c64f4db7..52a1ad5ec8 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
@@ -54,7 +54,7 @@ public class Q00271_ProofOfValor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30577-04.htm"))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
index 0c0748e735..8fc6eb06c2 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
@@ -54,7 +54,7 @@ public class Q00272_WrathOfAncestors extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30572-04.htm"))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
index b3f9d4bb1b..00afdb3a51 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
@@ -60,7 +60,7 @@ public class Q00273_InvadersOfTheHolyLand extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
index f45e185d3f..de06f688b3 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
@@ -57,7 +57,7 @@ public class Q00274_SkirmishWithTheWerewolves extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30569-04.htm"))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
index 1e6a02f4f9..31e70fba32 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
@@ -59,7 +59,7 @@ public class Q00275_DarkWingedSpies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30567-03.htm"))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
index 74935e9104..e8f904d1f6 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
@@ -74,7 +74,7 @@ public class Q00276_TotemOfTheHestui extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30571-03.htm"))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
index 156b85fdf6..6b507503c3 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
@@ -51,7 +51,7 @@ public class Q00277_GatekeepersOffering extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30576-03.htm"))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java
index 9f34fec4db..6017f331f9 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java
@@ -56,7 +56,7 @@ public class Q00291_RevengeOfTheRedbonnet extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30553-03.htm"))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
index 8e245d375c..48ed318353 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
@@ -68,7 +68,7 @@ public class Q00292_BrigandsSweep extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
index 227398a92d..93d41b6c06 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
@@ -59,7 +59,7 @@ public class Q00293_TheHiddenVeins extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
index 554161d862..a56345d2f9 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
@@ -62,7 +62,7 @@ public class Q00294_CovertBusiness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && qs.isCreated() && event.equals("30534-03.htm"))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
index 98daa7c06c..2e8d1c601d 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
@@ -51,7 +51,7 @@ public class Q00295_DreamingOfTheSkies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && qs.isCreated() && event.equals("30536-03.htm"))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
index 4d1d5b1777..9dc8ba9904 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
@@ -56,7 +56,7 @@ public class Q00296_TarantulasSpiderSilk extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
index e0b5bc2986..099201eb88 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
@@ -52,7 +52,7 @@ public class Q00297_GatekeepersFavor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30540-03.htm"))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
index a7c0756abb..24aef6ae0c 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
@@ -66,7 +66,7 @@ public class Q00300_HuntingLetoLizardman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
index 65317d4367..8960b5ee57 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
@@ -49,7 +49,7 @@ public class Q00303_CollectArrowheads extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30029-04.htm"))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
index 20009b3457..e520a0cd92 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
@@ -65,7 +65,7 @@ public class Q00306_CrystalOfFireAndIce extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
index 69cbcdbf2a..a1eb4478d8 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
@@ -51,7 +51,7 @@ public class Q00313_CollectSpores extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
index fb42e610a9..5c4fe19392 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
@@ -70,7 +70,7 @@ public class Q00316_DestroyPlagueCarriers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
index 86a347b60b..b69fd606ea 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
@@ -52,7 +52,7 @@ public class Q00317_CatchTheWind extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
index e88feb95e2..fc8f958e8c 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
@@ -54,7 +54,7 @@ public class Q00319_ScentOfDeath extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
index 8fd327d6b5..49cc3a2f09 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
@@ -55,7 +55,7 @@ public class Q00320_BonesTellTheFuture extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30359-04.htm"))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
index a97a566c92..03cf67028d 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
@@ -60,7 +60,7 @@ public class Q00324_SweetestVenom extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
index 233ae4efea..308b9d1e12 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
@@ -79,7 +79,7 @@ public class Q00325_GrimCollector extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
index dc3eb65ec4..2566d50918 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
@@ -69,7 +69,7 @@ public class Q00326_VanquishRemnants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
index 1956e2923e..99a18a2d23 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
@@ -105,7 +105,7 @@ public class Q00327_RecoverTheFarmland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
index 64cc6ef8e9..b8d1a39d6c 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
@@ -70,7 +70,7 @@ public class Q00328_SenseForBusiness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
index 72407eabc3..25eb32f4d0 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
@@ -62,7 +62,7 @@ public class Q00329_CuriosityOfADwarf extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
index 518d845bcc..dd71a57310 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
@@ -65,7 +65,7 @@ public class Q00331_ArrowOfVengeance extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
index 498b165be2..02f12606c7 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
@@ -121,7 +121,7 @@ public class Q00333_HuntOfTheBlackLion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		final int chance = getRandom(100);
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
index 5f664a5fed..1031fbb7fb 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
@@ -85,7 +85,7 @@ public class Q00344_1000YearsTheEndOfLamentation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
index fd775bbe73..bc785abac1 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
@@ -60,7 +60,7 @@ public class Q00354_ConquestOfAlligatorIsland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
index ee19b7e4ab..fbcd365dc3 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
@@ -87,7 +87,7 @@ public class Q00355_FamilyHonor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
index e1633226d2..c200224cfa 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
@@ -61,7 +61,7 @@ public class Q00356_DigUpTheSeaOfSpores extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
index aca7242c87..8b51394b23 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
@@ -68,7 +68,7 @@ public class Q00358_IllegitimateChildOfTheGoddess extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
index ed0f544adc..2407d92d0f 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
@@ -59,7 +59,7 @@ public class Q00360_PlunderTheirSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
index aaf517b7a9..e910c1e70e 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
@@ -68,7 +68,7 @@ public class Q00369_CollectorOfJewels extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
index d24b38b112..c6c223f5a1 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
@@ -70,7 +70,7 @@ public class Q00370_AnElderSowsSeeds extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java
index 26bbe0c26a..510e73c602 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java
@@ -58,7 +58,7 @@ public class Q00374_WhisperOfDreamsPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java
index 370ba1f6b8..f37a2720b9 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java
@@ -56,7 +56,7 @@ public class Q00375_WhisperOfDreamsPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
index 7773083c9a..c29c87b26d 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
@@ -65,7 +65,7 @@ public class Q00401_PathOfTheWarrior extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
index 73be798601..f90aa18585 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
@@ -90,7 +90,7 @@ public class Q00402_PathOfTheHumanKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
index bd13a4bbe9..9bd736acaa 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
@@ -93,7 +93,7 @@ public class Q00403_PathOfTheRogue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
index 4b0285fcef..ac44dd64d6 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
@@ -72,7 +72,7 @@ public class Q00404_PathOfTheHumanWizard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
index 455a88115a..b7ad34d507 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
@@ -68,7 +68,7 @@ public class Q00405_PathOfTheCleric extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
index 60a2100263..fcb92b0837 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
@@ -73,7 +73,7 @@ public class Q00406_PathOfTheElvenKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
index e8ae130e75..89dbb1cea4 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
@@ -67,7 +67,7 @@ public class Q00407_PathOfTheElvenScout extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
index e35ea8444b..86dd94df1f 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
@@ -70,7 +70,7 @@ public class Q00408_PathOfTheElvenWizard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
index 809b741536..1e788f366f 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
@@ -66,7 +66,7 @@ public class Q00409_PathOfTheElvenOracle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
index 261122d3ff..727d4148f0 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
@@ -62,7 +62,7 @@ public class Q00410_PathOfThePalusKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
index d0849cb9a0..b6bd1f946a 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
@@ -62,7 +62,7 @@ public class Q00411_PathOfTheAssassin extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
index a2a12199b7..fda1cd4beb 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
@@ -69,7 +69,7 @@ public class Q00412_PathOfTheDarkWizard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
index cf84a5a883..55897e0028 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
@@ -66,7 +66,7 @@ public class Q00413_PathOfTheShillienOracle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
index 9bd2adec48..34d1af1f9c 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
@@ -65,7 +65,7 @@ public class Q00414_PathOfTheOrcRaider extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
index 0d21264633..3b6f7f4fb5 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
@@ -90,7 +90,7 @@ public class Q00415_PathOfTheOrcMonk extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
index ff64a6210f..09a10e6e1d 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
@@ -87,7 +87,7 @@ public class Q00416_PathOfTheOrcShaman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
index 2e9a9937b5..973de273fc 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
@@ -84,7 +84,7 @@ public class Q00417_PathOfTheScavenger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
index 23061e130c..43770b4eb1 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
@@ -66,7 +66,7 @@ public class Q00418_PathOfTheArtisan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
index c6c6541b90..e40f43ea81 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
@@ -82,7 +82,7 @@ public class Q00662_AGameOfCards extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q11000_MoonKnight/Q11000_MoonKnight.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q11000_MoonKnight/Q11000_MoonKnight.java
index 6e1ca665de..4fa411b4fd 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q11000_MoonKnight/Q11000_MoonKnight.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/quests/Q11000_MoonKnight/Q11000_MoonKnight.java
@@ -85,7 +85,7 @@ public class Q11000_MoonKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
index 06ea44ceb1..6698687a4e 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
@@ -45,7 +45,7 @@ public class AllianceMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!"9001-01.htm".equals(event) && (player.getClan() == null))
 		{
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
index b69c69d8d0..b9cae10d1b 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
@@ -74,7 +74,7 @@ public class ClanMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LEADER_REQUIRED.containsKey(event) && !player.isClanLeader())
 		{
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
index 472b265d19..7560171dd1 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
@@ -61,7 +61,7 @@ public class DarkElfChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
index 1eef46c033..073a93bdae 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
@@ -73,7 +73,7 @@ public class DarkElfChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
index b90395d96a..fe46f96453 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
@@ -50,7 +50,7 @@ public class DwarfBlacksmithChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
index c00f750f8f..7471a928e7 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
@@ -54,7 +54,7 @@ public class DwarfBlacksmithChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
index 187710070c..df7368de42 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
@@ -50,7 +50,7 @@ public class DwarfWarehouseChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
index bcd1325051..e18b5c69e4 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
@@ -54,7 +54,7 @@ public class DwarfWarehouseChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
index 683c50e475..a9da2dffa6 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
@@ -57,7 +57,7 @@ public class ElfHumanClericChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
index c0cf3513d7..eff155a55f 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
@@ -59,7 +59,7 @@ public class ElfHumanFighterChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
index 58bb620a4f..5ab836930b 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
@@ -72,7 +72,7 @@ public class ElfHumanFighterChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
index ed623b52b0..c5b843fdc1 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
@@ -57,7 +57,7 @@ public class ElfHumanWizardChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
index 2b882feda7..7343a5f35c 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
@@ -61,7 +61,7 @@ public class ElfHumanWizardChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
index acf6f9bc2f..1a231cd5d9 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
@@ -53,7 +53,7 @@ public class FirstClassTransferTalk extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return event;
 	}
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
index e3c48b1f33..324f48a504 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
@@ -51,7 +51,7 @@ public class OrcChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
index d055e1ab84..c1808b3396 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
@@ -61,7 +61,7 @@ public class OrcChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/quest/Quest.java
index f343e5d8e9..252c508537 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/quest/Quest.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/quest/Quest.java
@@ -245,7 +245,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -267,7 +267,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -558,7 +558,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 			{
 				player.setSimulatedTalking(false);
 			}
-			res = onAdvEvent(event, npc, player);
+			res = onEvent(event, npc, player);
 		}
 		catch (Exception e)
 		{
@@ -1020,12 +1020,11 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 */
 	public String onDeath(Creature killer, Creature victim, QuestState qs)
 	{
-		return onAdvEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
+		return onEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
 	}
 	
 	/**
 	 * This function is called whenever a player clicks on a link in a quest dialog and whenever a timer fires.<br>
-	 * If is not overridden by a subclass, then default to the returned value of the simpler (and older) {@link #onEvent(String, QuestState)} override.<br>
 	 * If the player has a quest state, use it as parameter in the next call, otherwise return null.
 	 * @param event this parameter contains a string identifier for the event.<br>
 	 *            Generally, this string is passed directly via the link.<br>
@@ -1044,35 +1043,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 *            This parameter may be {@code null} in certain circumstances.
 	 * @return the text returned by the event (may be {@code null}, a filename or just text)
 	 */
-	public String onAdvEvent(String event, Npc npc, Player player)
-	{
-		if (player != null)
-		{
-			final QuestState qs = player.getQuestState(getName());
-			if (qs != null)
-			{
-				return onEvent(event, qs);
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * This function is called in place of {@link #onAdvEvent(String, Npc, Player)} if the former is not implemented.<br>
-	 * If a script contains both {@link #onAdvEvent(String, Npc, Player)} and this implementation, then this method will never be called unless the script's {@link #onAdvEvent(String, Npc, Player)} explicitly calls this method.
-	 * @param event this parameter contains a string identifier for the event.<br>
-	 *            Generally, this string is passed directly via the link.<br>
-	 *            For example:<br>
-	 *            <code>
-	 *            &lt;a action="bypass -h Quest 626_ADarkTwilight 31517-01.htm"&gt;hello&lt;/a&gt;
-	 *            </code><br>
-	 *            The above link sets the event variable to "31517-01.htm" for the quest 626_ADarkTwilight.<br>
-	 *            In the case of timers, this will be the name of the timer.<br>
-	 *            This parameter serves as a sort of identifier.
-	 * @param qs this parameter contains a reference to the quest state of the player who used the link or started the timer.
-	 * @return the text returned by the event (may be {@code null}, a filename or just text)
-	 */
-	public String onEvent(String event, QuestState qs)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return null;
 	}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/DungeonOfAbyssZone.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/DungeonOfAbyssZone.java
index 439e3d440e..440119f080 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/DungeonOfAbyssZone.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/DungeonOfAbyssZone.java
@@ -53,7 +53,7 @@ public class DungeonOfAbyssZone extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("EXIT_PLAYER") && (player != null))
 		{
@@ -90,7 +90,7 @@ public class DungeonOfAbyssZone extends AbstractNpcAI
 				player.teleToLocation(EXIT_LOCATION_4);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Ingrit.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Ingrit.java
index 8d6242081a..34a9393fad 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Ingrit.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Ingrit.java
@@ -59,7 +59,7 @@ public class Ingrit extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc.getId() == SOUL_TRACKER_INRGIT)
 		{
@@ -99,7 +99,7 @@ public class Ingrit extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Iris.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Iris.java
index 6077a611dd..78c008e99d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Iris.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Iris.java
@@ -59,7 +59,7 @@ public class Iris extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc.getId() == SOUL_TRACKER_IRIS)
 		{
@@ -99,7 +99,7 @@ public class Iris extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Magrit.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Magrit.java
index 420cffb53a..e69b4d1f47 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Magrit.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Magrit.java
@@ -59,7 +59,7 @@ public class Magrit extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc.getId() == SOUL_TRACKER_MARGIT)
 		{
@@ -99,7 +99,7 @@ public class Magrit extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Rosammy.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Rosammy.java
index e2dadf67e9..0d0b09c0c7 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Rosammy.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Rosammy.java
@@ -59,7 +59,7 @@ public class Rosammy extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc.getId() == SOUL_TRACKER_ROSAMMY)
 		{
@@ -99,7 +99,7 @@ public class Rosammy extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/Tores/Tores.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/Tores/Tores.java
index ab4f6e34c2..cabb6b15c7 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/Tores/Tores.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/Tores/Tores.java
@@ -55,7 +55,7 @@ public class Tores extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -86,7 +86,7 @@ public class Tores extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
index a26e6075fd..31fc2ba199 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
@@ -43,12 +43,12 @@ public class Toma extends AbstractNpcAI
 	private Toma()
 	{
 		addFirstTalkId(TOMA);
-		onAdvEvent("RESPAWN_TOMA", null, null);
+		onEvent("RESPAWN_TOMA", null, null);
 		startQuestTimer("RESPAWN_TOMA", TELEPORT_DELAY, null, null, true);
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("RESPAWN_TOMA"))
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
index 6f8858a2a4..dd735beeaa 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
@@ -41,7 +41,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -54,7 +54,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 				npc.deleteMe();
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_DAY_NIGHT_CHANGE)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
index 76379f11ef..9e3b09ef23 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
@@ -38,14 +38,14 @@ public class Roxxy extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TEXT_SPAM") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SPEAK_WITH_ME_ABOUT_TRAVELING_AROUND_ADEN, 1000);
 			startQuestTimer("TEXT_SPAM", getRandom(10000, 30000), npc, null, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
index 143e9f48cd..158b1a72e0 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
@@ -49,7 +49,7 @@ public class Arushinai extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("30401-1.htm") || event.equals("30401-2.htm"))
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
index 6ee6719c50..ec7aecde57 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
@@ -47,7 +47,7 @@ public class DimensionalVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("30952-1.htm") || event.equals("30952-2.htm") || event.equals("30952-3.htm"))
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index d236e19d43..a5157acfc7 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -193,7 +193,7 @@ public class Antharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -605,7 +605,7 @@ public class Antharas extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 4a01a9e786..b5610ec889 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -164,7 +164,7 @@ public class Baium extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -478,7 +478,7 @@ public class Baium extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Core/Core.java
index 71150c1323..b9dcb38092 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -142,7 +142,7 @@ public class Core extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
@@ -161,7 +161,7 @@ public class Core extends AbstractNpcAI
 			_minions.forEach(Attackable::decayMe);
 			_minions.clear();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index e74bc817e6..11c8477773 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -180,7 +180,7 @@ public class Orfen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -263,7 +263,7 @@ public class Orfen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 93735c996b..72e174bb65 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -155,7 +155,7 @@ public class QueenAnt extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -239,7 +239,7 @@ public class QueenAnt extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index 04fed5ab1b..b95d115b2c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -59,7 +59,7 @@ public class ArenaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -124,7 +124,7 @@ public class ArenaManager extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
index b07792cd2d..11b8786523 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
@@ -57,7 +57,7 @@ public class CastleBlacksmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return (event.equalsIgnoreCase(npc.getId() + "-02.html") && hasRights(player, npc)) ? event : null;
 	}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
index bb01178f53..0a2d84b789 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
@@ -393,7 +393,7 @@ public class CastleChamberlain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Castle castle = npc.getCastle();
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
index b9c1f3faf5..70bae86615 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
@@ -72,7 +72,7 @@ public class CastleDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
index bb32dde319..a319e3977f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
@@ -56,7 +56,7 @@ public class CastleMercenaryManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index a2bf4617a1..06a742f8c8 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -78,7 +78,7 @@ public class CastleTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
@@ -168,7 +168,7 @@ public class CastleTeleporter extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
index bffed40bcc..ea1b40c41c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
@@ -52,7 +52,7 @@ public class CastleWarehouse extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final boolean isMyLord = player.isClanLeader() && (player.getClan().getCastleId() == (npc.getCastle() != null ? npc.getCastle().getResidenceId() : -1));
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index 7fa66429b0..48867dd351 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -64,7 +64,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
index a86581206e..afd7250ca4 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
@@ -57,7 +57,7 @@ public class ClanHallDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index bc399da8e5..f1a436b50b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -98,7 +98,7 @@ public class ClanHallManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index fbf06e9737..7b6a27fc36 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -235,7 +235,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		if (!_isEnabled)
 		{
@@ -902,7 +902,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	{
 		if (event.getCommand().startsWith("Quest ClassMaster "))
 		{
-			final String html = onAdvEvent(event.getCommand().substring(18), null, event.getPlayer());
+			final String html = onEvent(event.getCommand().substring(18), null, event.getPlayer());
 			event.getPlayer().sendPacket(TutorialCloseHtml.STATIC_PACKET);
 			showResult(event.getPlayer(), html);
 		}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/DivineBeast.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/DivineBeast.java
index 1f247a7b35..3f3a076992 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/DivineBeast.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/DivineBeast.java
@@ -44,7 +44,7 @@ public class DivineBeast extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player == null) || !player.hasServitors())
 		{
@@ -55,7 +55,7 @@ public class DivineBeast extends AbstractNpcAI
 			cancelQuestTimer(event, npc, player);
 			player.getServitors().values().forEach(summon -> summon.unSummon(player));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
index bbff4608fc..8812882c93 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
@@ -69,7 +69,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
index 7d1abb4769..187fbae9dd 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
@@ -56,7 +56,7 @@ public class NewbieGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("0"))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
index acc83d72d8..27ab7e4f74 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
@@ -69,7 +69,7 @@ public class OlyBuffer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.startsWith("giveBuff;") && (npc.getScriptValue() < 5))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index 201f3843ba..f08fb759ac 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -70,7 +70,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
index 21d281c6c9..435f293345 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
@@ -84,7 +84,7 @@ public class Proclaimer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("giveBuff"))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
index ea0a8a16da..1fc1737173 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
@@ -79,7 +79,7 @@ public class ProvisionalHalls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/RandomWalkingGuards.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
index 8138dee3ee..ffe4fd87f1 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
@@ -48,7 +48,7 @@ public class RandomWalkingGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("RANDOM_WALK") && (npc != null))
 		{
@@ -59,7 +59,7 @@ public class RandomWalkingGuards extends AbstractNpcAI
 			}
 			startQuestTimer("RANDOM_WALK", getRandom(MIN_WALK_DELAY, MAX_WALK_DELAY), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/Servitors/SinEater.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/Servitors/SinEater.java
index 1ed8d645a5..d7536614e8 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/Servitors/SinEater.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/Servitors/SinEater.java
@@ -48,7 +48,7 @@ public class SinEater extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TALK") && (player != null) && (player.getPet() != null))
 		{
@@ -79,7 +79,7 @@ public class SinEater extends AbstractNpcAI
 			}
 			startQuestTimer("TALK", 60000, null, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_CREATURE_DEATH)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
index b8e769f36b..2830f9bca4 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
@@ -50,7 +50,7 @@ public class SymbolMaker extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
index 04d4672c76..b595c4d6d4 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
@@ -86,7 +86,7 @@ public class ToIVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int npcId = npc.getId();
 		
@@ -132,7 +132,7 @@ public class ToIVortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index 356236cfc7..bf5b0506dc 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -188,7 +188,7 @@ public class WyvernManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
index 0c2e7586c9..c49be5297b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
@@ -36,7 +36,7 @@ public class DelevelManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.DELEVEL_MANAGER_ENABLED)
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
index ff6d40ec0e..4713803f1d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
@@ -54,7 +54,7 @@ public class FactionSystem extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class FactionSystem extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
index 8b9c676ad5..771c8a9058 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
@@ -34,7 +34,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -77,7 +77,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 				npc.broadcastInfo(); // update flag status
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
index 669fcfc85c..ddf7e923eb 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
@@ -39,7 +39,7 @@ public class NoblessMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.NOBLESS_MASTER_ENABLED)
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
index 4f0f0c988a..5ba22124c1 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
@@ -215,7 +215,7 @@ public class NpcLocationInfo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (Util.isDigit(event))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
index 8e1f84c102..3a9b5b4bdc 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
@@ -169,7 +169,7 @@ public class Deathmatch extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
index 1eb84eca93..b92bbe7f77 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
@@ -213,7 +213,7 @@ public class Rabbits extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Race/Race.java
index ff9fc462f6..6ac325ca6f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Race/Race.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Race/Race.java
@@ -320,7 +320,7 @@ public class Race extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index e827184ae4..60da9f13d3 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -186,7 +186,7 @@ public class TvT extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index 53d917a5c7..a00de57ae5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -44,7 +44,7 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/LetterCollector/LetterCollector.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
index 9030e46d76..da0d972c5b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
@@ -73,7 +73,7 @@ public class LetterCollector extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
index 762cde5596..245342a91e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
@@ -45,7 +45,7 @@ public class ThePowerOfLove extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/TotalRecall/TotalRecall.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
index 4486ac5f36..a5448d4db5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
@@ -42,7 +42,7 @@ public class TotalRecall extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
index 5de1a19cd2..3e745b3d08 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
@@ -354,7 +354,7 @@ public class WatermelonNinja extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java
index 5c95ae45b2..46ebc9569f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java
@@ -52,7 +52,7 @@ public class Q00001_LettersOfLove extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java
index 16da55f86d..52361f7ade 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java
@@ -56,7 +56,7 @@ public class Q00002_WhatWomenWant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java
index 7b951b3bbb..cf06da2248 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java
@@ -58,7 +58,7 @@ public class Q00003_WillTheSealBeBroken extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java
index 374b13cd18..83d622baae 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java
@@ -62,7 +62,7 @@ public class Q00004_LongLiveThePaagrioLord extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java
index 11081e1338..ac8ec577ae 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java
@@ -58,7 +58,7 @@ public class Q00005_MinersFavor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java
index 79f364a54e..cf2473bc19 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java
@@ -84,7 +84,7 @@ public class Q00070_SagaOfThePhoenixKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java
index 1c5ee20575..703208bf2e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java
@@ -85,7 +85,7 @@ public class Q00071_SagaOfEvasTemplar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java
index 91ba4811de..0808d1601b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java
@@ -85,7 +85,7 @@ public class Q00072_SagaOfTheSwordMuse extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java
index 896f16438e..7e6fda1667 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java
@@ -85,7 +85,7 @@ public class Q00073_SagaOfTheDuelist extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java
index 1a98d4d200..fd0a03550d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java
@@ -85,7 +85,7 @@ public class Q00074_SagaOfTheDreadnought extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java
index e5e6b39427..428c1caa43 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java
@@ -85,7 +85,7 @@ public class Q00075_SagaOfTheTitan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java
index a977722f62..ccfff282a0 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java
@@ -85,7 +85,7 @@ public class Q00076_SagaOfTheGrandKhavatari extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java
index 508438d67a..43f8ff9d78 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java
@@ -85,7 +85,7 @@ public class Q00077_SagaOfTheDominator extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java
index 75c3d73024..1ed3216c29 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java
@@ -85,7 +85,7 @@ public class Q00078_SagaOfTheDoomcryer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java
index 3df5908a15..8dc5a8c81a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java
@@ -85,7 +85,7 @@ public class Q00079_SagaOfTheAdventurer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java
index 2074a51b96..c542de4c19 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java
@@ -85,7 +85,7 @@ public class Q00080_SagaOfTheWindRider extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java
index 67ca500398..73e5ca9f03 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java
@@ -85,7 +85,7 @@ public class Q00081_SagaOfTheGhostHunter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java
index 52f64dc817..b143f8b56b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java
@@ -85,7 +85,7 @@ public class Q00082_SagaOfTheSagittarius extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java
index 2818994337..c7cb95b044 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java
@@ -85,7 +85,7 @@ public class Q00083_SagaOfTheMoonlightSentinel extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java
index 5c4722209e..39a2839627 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java
@@ -85,7 +85,7 @@ public class Q00084_SagaOfTheGhostSentinel extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java
index e32cc7ded0..f72865632a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java
@@ -85,7 +85,7 @@ public class Q00085_SagaOfTheCardinal extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java
index c0b50b130e..4dd2385ff8 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java
@@ -85,7 +85,7 @@ public class Q00086_SagaOfTheHierophant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java
index 76719ec38e..1837ccacda 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java
@@ -85,7 +85,7 @@ public class Q00087_SagaOfEvasSaint extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java
index 4901af8961..e87a6913ce 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java
@@ -84,7 +84,7 @@ public class Q00088_SagaOfTheArchmage extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java
index cbf08d12cc..524e8dbdc1 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java
@@ -84,7 +84,7 @@ public class Q00089_SagaOfTheMysticMuse extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java
index 9b236936e0..26c9bb3dd4 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java
@@ -84,7 +84,7 @@ public class Q00090_SagaOfTheStormScreamer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java
index 751f487099..15c7611dc3 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java
@@ -85,7 +85,7 @@ public class Q00091_SagaOfTheArcanaLord extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java
index 6f98a643f7..337e3070d1 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java
@@ -84,7 +84,7 @@ public class Q00092_SagaOfTheElementalMaster extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java
index f77b67dd6a..61acb45c50 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java
@@ -84,7 +84,7 @@ public class Q00093_SagaOfTheSpectralMaster extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java
index 12d4bc28d6..24004acd96 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java
@@ -84,7 +84,7 @@ public class Q00094_SagaOfTheSoultaker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java
index a104ed14ed..6174d9f79d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java
@@ -85,7 +85,7 @@ public class Q00095_SagaOfTheHellKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java
index 7c08220d8d..5deb250ad9 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java
@@ -84,7 +84,7 @@ public class Q00096_SagaOfTheSpectralDancer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java
index dee5c701e3..7f93f9bb4b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java
@@ -84,7 +84,7 @@ public class Q00097_SagaOfTheShillienTemplar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java
index c21ebb5e13..7d89d5cabc 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java
@@ -85,7 +85,7 @@ public class Q00098_SagaOfTheShillienSaint extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java
index a63b4710c7..e9113ef4a7 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java
@@ -84,7 +84,7 @@ public class Q00099_SagaOfTheFortuneSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java
index 349f583104..8ec0ec7a61 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java
@@ -84,7 +84,7 @@ public class Q00100_SagaOfTheMaestro extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java
index 3e49ce3e34..94cc53f893 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java
@@ -63,7 +63,7 @@ public class Q00101_SwordOfSolidarity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java
index f102da50b5..be903e75bd 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java
@@ -80,7 +80,7 @@ public class Q00102_SeaOfSporesFever extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30284-02.htm"))
@@ -89,7 +89,7 @@ public class Q00102_SeaOfSporesFever extends Quest
 			giveItems(player, ALBERIUS_LETTER, 1);
 			return event;
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java
index f904289c6e..1bd749e419 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java
@@ -66,7 +66,7 @@ public class Q00103_SpiritOfCraftsman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java
index a0be02e126..3612ce2ffa 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java
@@ -69,7 +69,7 @@ public class Q00104_SpiritOfMirrors extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30017-04.htm"))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java
index 310567491a..183b2fe249 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java
@@ -89,7 +89,7 @@ public class Q00105_SkirmishWithOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java
index 2235976814..06ee2a920f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java
@@ -61,7 +61,7 @@ public class Q00106_ForgottenTruth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java
index 2115b08bb5..7f9a43746a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java
@@ -60,7 +60,7 @@ public class Q00107_MercilessPunishment extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java
index 595593a59e..27f8345b86 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java
@@ -84,7 +84,7 @@ public class Q00108_JumbleTumbleDiamondFuss extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
index ad72f044ca..b9d8feb578 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
@@ -53,7 +53,7 @@ public class Q00127_FishingSpecialistsRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java
index 9f69a9970d..0584deb4a5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java
@@ -57,7 +57,7 @@ public class Q00151_CureForFever extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30050-03.htm"))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java
index b5ba64cf6e..65ef7dd7f2 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java
@@ -53,7 +53,7 @@ public class Q00152_ShardsOfGolem extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java
index 4a2d16f383..f6de972041 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java
@@ -54,7 +54,7 @@ public class Q00153_DeliverGoods extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && (npc.getId() == ARNOLD_ID) && event.equalsIgnoreCase("30041-02.html"))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java
index 89520ee13d..3565a5e101 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java
@@ -54,7 +54,7 @@ public class Q00154_SacrificeToTheSea extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30312-03.htm"))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java
index b384a65f1c..eb9f2b9fd9 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java
@@ -46,7 +46,7 @@ public class Q00155_FindSirWindawood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30042-03.htm"))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java
index 394cd0f249..035f23f1e2 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java
@@ -47,7 +47,7 @@ public class Q00156_MillenniumLove extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java
index 3127631a29..f14de51738 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java
@@ -49,7 +49,7 @@ public class Q00157_RecoverSmuggledGoods extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java
index f3545be0ab..371311ebf1 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java
@@ -53,7 +53,7 @@ public class Q00158_SeedOfEvil extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30031-03.htm"))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java
index 0b338edac3..d8ea0f5822 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java
@@ -54,7 +54,7 @@ public class Q00159_ProtectTheWaterSource extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30154-04.htm"))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java
index d8d17b96d8..6f4eac457e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java
@@ -53,7 +53,7 @@ public class Q00160_NerupasRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30370-04.htm"))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java
index cf0b7ed114..36667e4789 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java
@@ -47,7 +47,7 @@ public class Q00161_FruitOfTheMotherTree extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java
index c798c0b498..950113993e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java
@@ -66,7 +66,7 @@ public class Q00162_CurseOfTheUndergroundFortress extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java
index 821cef7188..5838caa460 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java
@@ -58,7 +58,7 @@ public class Q00163_LegacyOfThePoet extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java
index 7c4d756f2f..77f7de165c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java
@@ -51,7 +51,7 @@ public class Q00164_BloodFiend extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30149-04.htm"))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java
index 9158530da3..4a5ad604e8 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java
@@ -61,7 +61,7 @@ public class Q00165_ShilensHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30348-03.htm"))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java
index fd3325639a..ee1d0ab752 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java
@@ -62,7 +62,7 @@ public class Q00166_MassOfDarkness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30130-03.htm"))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java
index 18e81aa594..aa100ab630 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java
@@ -47,7 +47,7 @@ public class Q00167_DwarvenKinship extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java
index 3ab148a70e..4d954078aa 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java
@@ -61,7 +61,7 @@ public class Q00168_DeliverSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30349-03.htm"))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java
index 31c4dcf628..c93fa24825 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java
@@ -53,7 +53,7 @@ public class Q00169_OffspringOfNightmares extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java
index c88a4ae63b..27ad086001 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java
@@ -54,7 +54,7 @@ public class Q00170_DangerousSeduction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
index 6b7de9bd96..18b11d47ae 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
@@ -76,7 +76,7 @@ public class Q00211_TrialOfTheChallenger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
index efde71ba49..2e70c4f9b1 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
@@ -86,7 +86,7 @@ public class Q00212_TrialOfDuty extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
index a0f8f915b3..1f4f42c490 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
@@ -92,7 +92,7 @@ public class Q00213_TrialOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
index 94bba112f2..6dfacfa116 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
@@ -120,7 +120,7 @@ public class Q00214_TrialOfTheScholar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
index da0399c8ce..a555adb852 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
@@ -77,7 +77,7 @@ public class Q00215_TrialOfThePilgrim extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
index 05aade19d6..82ef5fe081 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
@@ -94,7 +94,7 @@ public class Q00216_TrialOfTheGuildsman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
index 32a88e353e..86edef3008 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
@@ -107,7 +107,7 @@ public class Q00217_TestimonyOfTrust extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
index a5d3455060..05ed9df156 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
@@ -104,7 +104,7 @@ public class Q00218_TestimonyOfLife extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
index 5e3eb02369..9eae62eb6e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
@@ -107,7 +107,7 @@ public class Q00219_TestimonyOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
index 24d8bf39f4..e22e3a6c92 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
@@ -121,7 +121,7 @@ public class Q00220_TestimonyOfGlory extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
index a276b60f56..dff82abd5d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
@@ -124,7 +124,7 @@ public class Q00221_TestimonyOfProsperity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
index 761bdeb64a..3f03f3e509 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
@@ -88,7 +88,7 @@ public class Q00222_TestOfTheDuelist extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
index bd794eef75..d0bbb73b4f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
@@ -85,7 +85,7 @@ public class Q00223_TestOfTheChampion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
index 163aa900f4..346538dc45 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
@@ -94,7 +94,7 @@ public class Q00224_TestOfSagittarius extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
index ae9bb5fb4d..e7a6b7ef1a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
@@ -91,7 +91,7 @@ public class Q00225_TestOfTheSearcher extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
index c3dc04f3f1..9d8e8a161d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
@@ -81,7 +81,7 @@ public class Q00226_TestOfTheHealer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
index ba1fc6097e..dac23aac62 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
@@ -114,7 +114,7 @@ public class Q00227_TestOfTheReformer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("DESPAWN".equals(event))
 		{
@@ -127,7 +127,7 @@ public class Q00227_TestOfTheReformer extends Quest
 			{
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
index 6ca6b63f34..42f8db1e54 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
@@ -99,7 +99,7 @@ public class Q00228_TestOfMagus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
index 954c6b4142..706fc8fb29 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
@@ -115,7 +115,7 @@ public class Q00229_TestOfWitchcraft extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
index 2d810c2bb4..9e61822eca 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
@@ -163,7 +163,7 @@ public class Q00230_TestOfTheSummoner extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
index ea9ab4c98d..0b1696278f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
@@ -81,7 +81,7 @@ public class Q00231_TestOfTheMaestro extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
index bdd4cb26b5..8aaeb13125 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
@@ -106,7 +106,7 @@ public class Q00232_TestOfTheLord extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
index a8f0d1a2a5..3c14c2ef63 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
@@ -106,7 +106,7 @@ public class Q00233_TestOfTheWarSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
index f41ac170e9..9c179c34ac 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
@@ -143,7 +143,7 @@ public class Q00255_Tutorial extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
index a98a9a317b..3f8ecbb375 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
@@ -88,7 +88,7 @@ public class Q00257_TheGuardIsBusy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
index ddd656d3ad..c19e69fd3d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
@@ -66,7 +66,7 @@ public class Q00258_BringWolfPelts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30001-03.html"))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
index 02efc29fd9..88ca56e754 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
@@ -70,7 +70,7 @@ public class Q00259_RequestFromTheFarmOwner extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
index 6e63d6faf4..e3e252ec97 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
@@ -63,7 +63,7 @@ public class Q00260_OrcHunting extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
index b68a525827..ff6e0e01fc 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
@@ -61,7 +61,7 @@ public class Q00261_CollectorsDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30222-03.htm"))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
index 95721f08dc..29b898dc6d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
@@ -59,7 +59,7 @@ public class Q00262_TradeWithTheIvoryTower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30137-03.htm"))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
index 1bdeec4a83..950346cf59 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
@@ -61,7 +61,7 @@ public class Q00263_OrcSubjugation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
index 20ddbeac20..bd848ee2cf 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
@@ -68,7 +68,7 @@ public class Q00264_KeenClaws extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30136-03.htm"))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
index d90ce43946..195dc0675d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
@@ -58,7 +58,7 @@ public class Q00265_BondsOfSlavery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
index 68c5dd1cc3..87c949919f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
@@ -72,7 +72,7 @@ public class Q00266_PleasOfPixies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("31852-04.htm"))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
index aa676c5d46..5b26a51d59 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
@@ -50,7 +50,7 @@ public class Q00267_WrathOfVerdure extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
index b6c64f4db7..52a1ad5ec8 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
@@ -54,7 +54,7 @@ public class Q00271_ProofOfValor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30577-04.htm"))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
index 0c0748e735..8fc6eb06c2 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
@@ -54,7 +54,7 @@ public class Q00272_WrathOfAncestors extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30572-04.htm"))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
index b3f9d4bb1b..00afdb3a51 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
@@ -60,7 +60,7 @@ public class Q00273_InvadersOfTheHolyLand extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
index f45e185d3f..de06f688b3 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
@@ -57,7 +57,7 @@ public class Q00274_SkirmishWithTheWerewolves extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30569-04.htm"))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
index 1e6a02f4f9..31e70fba32 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
@@ -59,7 +59,7 @@ public class Q00275_DarkWingedSpies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30567-03.htm"))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
index 74935e9104..e8f904d1f6 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
@@ -74,7 +74,7 @@ public class Q00276_TotemOfTheHestui extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30571-03.htm"))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
index 156b85fdf6..6b507503c3 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
@@ -51,7 +51,7 @@ public class Q00277_GatekeepersOffering extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30576-03.htm"))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java
index 9f34fec4db..6017f331f9 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java
@@ -56,7 +56,7 @@ public class Q00291_RevengeOfTheRedbonnet extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30553-03.htm"))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
index 8e245d375c..48ed318353 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
@@ -68,7 +68,7 @@ public class Q00292_BrigandsSweep extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
index 227398a92d..93d41b6c06 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
@@ -59,7 +59,7 @@ public class Q00293_TheHiddenVeins extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
index 554161d862..a56345d2f9 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
@@ -62,7 +62,7 @@ public class Q00294_CovertBusiness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && qs.isCreated() && event.equals("30534-03.htm"))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
index 98daa7c06c..2e8d1c601d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
@@ -51,7 +51,7 @@ public class Q00295_DreamingOfTheSkies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && qs.isCreated() && event.equals("30536-03.htm"))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
index 4d1d5b1777..9dc8ba9904 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
@@ -56,7 +56,7 @@ public class Q00296_TarantulasSpiderSilk extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
index e0b5bc2986..099201eb88 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
@@ -52,7 +52,7 @@ public class Q00297_GatekeepersFavor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30540-03.htm"))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
index a7c0756abb..24aef6ae0c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
@@ -66,7 +66,7 @@ public class Q00300_HuntingLetoLizardman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
index 65317d4367..8960b5ee57 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
@@ -49,7 +49,7 @@ public class Q00303_CollectArrowheads extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30029-04.htm"))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
index 20009b3457..e520a0cd92 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
@@ -65,7 +65,7 @@ public class Q00306_CrystalOfFireAndIce extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
index 69cbcdbf2a..a1eb4478d8 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
@@ -51,7 +51,7 @@ public class Q00313_CollectSpores extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
index fb42e610a9..5c4fe19392 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
@@ -70,7 +70,7 @@ public class Q00316_DestroyPlagueCarriers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
index 86a347b60b..b69fd606ea 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
@@ -52,7 +52,7 @@ public class Q00317_CatchTheWind extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
index e88feb95e2..fc8f958e8c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
@@ -54,7 +54,7 @@ public class Q00319_ScentOfDeath extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
index 8fd327d6b5..49cc3a2f09 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
@@ -55,7 +55,7 @@ public class Q00320_BonesTellTheFuture extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30359-04.htm"))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
index a97a566c92..03cf67028d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
@@ -60,7 +60,7 @@ public class Q00324_SweetestVenom extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
index 233ae4efea..308b9d1e12 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
@@ -79,7 +79,7 @@ public class Q00325_GrimCollector extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
index dc3eb65ec4..2566d50918 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
@@ -69,7 +69,7 @@ public class Q00326_VanquishRemnants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
index 1956e2923e..99a18a2d23 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
@@ -105,7 +105,7 @@ public class Q00327_RecoverTheFarmland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
index 64cc6ef8e9..b8d1a39d6c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
@@ -70,7 +70,7 @@ public class Q00328_SenseForBusiness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
index 72407eabc3..25eb32f4d0 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
@@ -62,7 +62,7 @@ public class Q00329_CuriosityOfADwarf extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
index 518d845bcc..dd71a57310 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
@@ -65,7 +65,7 @@ public class Q00331_ArrowOfVengeance extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
index 498b165be2..02f12606c7 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
@@ -121,7 +121,7 @@ public class Q00333_HuntOfTheBlackLion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		final int chance = getRandom(100);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
index 5f664a5fed..1031fbb7fb 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
@@ -85,7 +85,7 @@ public class Q00344_1000YearsTheEndOfLamentation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java
index da8086521c..eb49b8dc51 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java
@@ -59,7 +59,7 @@ public class Q00348_AnArrogantSearch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
index fd775bbe73..bc785abac1 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
@@ -60,7 +60,7 @@ public class Q00354_ConquestOfAlligatorIsland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
index ee19b7e4ab..fbcd365dc3 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
@@ -87,7 +87,7 @@ public class Q00355_FamilyHonor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
index e1633226d2..c200224cfa 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
@@ -61,7 +61,7 @@ public class Q00356_DigUpTheSeaOfSpores extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
index aca7242c87..8b51394b23 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
@@ -68,7 +68,7 @@ public class Q00358_IllegitimateChildOfTheGoddess extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
index ed0f544adc..2407d92d0f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
@@ -59,7 +59,7 @@ public class Q00360_PlunderTheirSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
index aaf517b7a9..e910c1e70e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
@@ -68,7 +68,7 @@ public class Q00369_CollectorOfJewels extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
index d24b38b112..c6c223f5a1 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
@@ -70,7 +70,7 @@ public class Q00370_AnElderSowsSeeds extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java
index 26bbe0c26a..510e73c602 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java
@@ -58,7 +58,7 @@ public class Q00374_WhisperOfDreamsPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java
index 370ba1f6b8..f37a2720b9 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java
@@ -56,7 +56,7 @@ public class Q00375_WhisperOfDreamsPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
index 7773083c9a..c29c87b26d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
@@ -65,7 +65,7 @@ public class Q00401_PathOfTheWarrior extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
index 73be798601..f90aa18585 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
@@ -90,7 +90,7 @@ public class Q00402_PathOfTheHumanKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
index bd13a4bbe9..9bd736acaa 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
@@ -93,7 +93,7 @@ public class Q00403_PathOfTheRogue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
index 4b0285fcef..ac44dd64d6 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
@@ -72,7 +72,7 @@ public class Q00404_PathOfTheHumanWizard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
index 455a88115a..b7ad34d507 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
@@ -68,7 +68,7 @@ public class Q00405_PathOfTheCleric extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
index 60a2100263..fcb92b0837 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
@@ -73,7 +73,7 @@ public class Q00406_PathOfTheElvenKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
index e8ae130e75..89dbb1cea4 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
@@ -67,7 +67,7 @@ public class Q00407_PathOfTheElvenScout extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
index e35ea8444b..86dd94df1f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
@@ -70,7 +70,7 @@ public class Q00408_PathOfTheElvenWizard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
index 809b741536..1e788f366f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
@@ -66,7 +66,7 @@ public class Q00409_PathOfTheElvenOracle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
index 261122d3ff..727d4148f0 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
@@ -62,7 +62,7 @@ public class Q00410_PathOfThePalusKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
index d0849cb9a0..b6bd1f946a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
@@ -62,7 +62,7 @@ public class Q00411_PathOfTheAssassin extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
index a2a12199b7..fda1cd4beb 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
@@ -69,7 +69,7 @@ public class Q00412_PathOfTheDarkWizard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
index cf84a5a883..55897e0028 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
@@ -66,7 +66,7 @@ public class Q00413_PathOfTheShillienOracle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
index 9bd2adec48..34d1af1f9c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
@@ -65,7 +65,7 @@ public class Q00414_PathOfTheOrcRaider extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
index 0d21264633..3b6f7f4fb5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
@@ -90,7 +90,7 @@ public class Q00415_PathOfTheOrcMonk extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
index 6a0fb18a23..1b62cbad54 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
@@ -88,7 +88,7 @@ public class Q00416_PathOfTheOrcShaman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
index 2e9a9937b5..973de273fc 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
@@ -84,7 +84,7 @@ public class Q00417_PathOfTheScavenger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
index 23061e130c..43770b4eb1 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
@@ -66,7 +66,7 @@ public class Q00418_PathOfTheArtisan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
index c6c6541b90..e40f43ea81 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
@@ -82,7 +82,7 @@ public class Q00662_AGameOfCards extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss.java
index 6b14892016..e986187f8e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss.java
@@ -51,7 +51,7 @@ public class Q00933_ExploringTheWestWingOfTheDungeonOfAbyss extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss.java
index ba47f428b9..c8765f54cf 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss.java
@@ -51,7 +51,7 @@ public class Q00935_ExploringTheEastWingOfTheDungeonOfAbyss extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q11000_MoonKnight/Q11000_MoonKnight.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q11000_MoonKnight/Q11000_MoonKnight.java
index 2a609b0d0b..1318ee4350 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q11000_MoonKnight/Q11000_MoonKnight.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q11000_MoonKnight/Q11000_MoonKnight.java
@@ -85,7 +85,7 @@ public class Q11000_MoonKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
index 06ea44ceb1..6698687a4e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
@@ -45,7 +45,7 @@ public class AllianceMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!"9001-01.htm".equals(event) && (player.getClan() == null))
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
index b69c69d8d0..b9cae10d1b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
@@ -74,7 +74,7 @@ public class ClanMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LEADER_REQUIRED.containsKey(event) && !player.isClanLeader())
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
index 472b265d19..7560171dd1 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
@@ -61,7 +61,7 @@ public class DarkElfChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
index 1eef46c033..073a93bdae 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
@@ -73,7 +73,7 @@ public class DarkElfChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
index b90395d96a..fe46f96453 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
@@ -50,7 +50,7 @@ public class DwarfBlacksmithChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
index c00f750f8f..7471a928e7 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
@@ -54,7 +54,7 @@ public class DwarfBlacksmithChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
index 187710070c..df7368de42 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
@@ -50,7 +50,7 @@ public class DwarfWarehouseChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
index bcd1325051..e18b5c69e4 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
@@ -54,7 +54,7 @@ public class DwarfWarehouseChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
index 683c50e475..a9da2dffa6 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
@@ -57,7 +57,7 @@ public class ElfHumanClericChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
index c0cf3513d7..eff155a55f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
@@ -59,7 +59,7 @@ public class ElfHumanFighterChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
index 58bb620a4f..5ab836930b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
@@ -72,7 +72,7 @@ public class ElfHumanFighterChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
index ed623b52b0..c5b843fdc1 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
@@ -57,7 +57,7 @@ public class ElfHumanWizardChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
index 2b882feda7..7343a5f35c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
@@ -61,7 +61,7 @@ public class ElfHumanWizardChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
index acf6f9bc2f..1a231cd5d9 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
@@ -53,7 +53,7 @@ public class FirstClassTransferTalk extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return event;
 	}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
index e3c48b1f33..324f48a504 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
@@ -51,7 +51,7 @@ public class OrcChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
index d055e1ab84..c1808b3396 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
@@ -61,7 +61,7 @@ public class OrcChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/Quest.java
index f343e5d8e9..252c508537 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/Quest.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/Quest.java
@@ -245,7 +245,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -267,7 +267,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -558,7 +558,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 			{
 				player.setSimulatedTalking(false);
 			}
-			res = onAdvEvent(event, npc, player);
+			res = onEvent(event, npc, player);
 		}
 		catch (Exception e)
 		{
@@ -1020,12 +1020,11 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 */
 	public String onDeath(Creature killer, Creature victim, QuestState qs)
 	{
-		return onAdvEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
+		return onEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
 	}
 	
 	/**
 	 * This function is called whenever a player clicks on a link in a quest dialog and whenever a timer fires.<br>
-	 * If is not overridden by a subclass, then default to the returned value of the simpler (and older) {@link #onEvent(String, QuestState)} override.<br>
 	 * If the player has a quest state, use it as parameter in the next call, otherwise return null.
 	 * @param event this parameter contains a string identifier for the event.<br>
 	 *            Generally, this string is passed directly via the link.<br>
@@ -1044,35 +1043,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 *            This parameter may be {@code null} in certain circumstances.
 	 * @return the text returned by the event (may be {@code null}, a filename or just text)
 	 */
-	public String onAdvEvent(String event, Npc npc, Player player)
-	{
-		if (player != null)
-		{
-			final QuestState qs = player.getQuestState(getName());
-			if (qs != null)
-			{
-				return onEvent(event, qs);
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * This function is called in place of {@link #onAdvEvent(String, Npc, Player)} if the former is not implemented.<br>
-	 * If a script contains both {@link #onAdvEvent(String, Npc, Player)} and this implementation, then this method will never be called unless the script's {@link #onAdvEvent(String, Npc, Player)} explicitly calls this method.
-	 * @param event this parameter contains a string identifier for the event.<br>
-	 *            Generally, this string is passed directly via the link.<br>
-	 *            For example:<br>
-	 *            <code>
-	 *            &lt;a action="bypass -h Quest 626_ADarkTwilight 31517-01.htm"&gt;hello&lt;/a&gt;
-	 *            </code><br>
-	 *            The above link sets the event variable to "31517-01.htm" for the quest 626_ADarkTwilight.<br>
-	 *            In the case of timers, this will be the name of the timer.<br>
-	 *            This parameter serves as a sort of identifier.
-	 * @param qs this parameter contains a reference to the quest state of the player who used the link or started the timer.
-	 * @return the text returned by the event (may be {@code null}, a filename or just text)
-	 */
-	public String onEvent(String event, QuestState qs)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return null;
 	}
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/DungeonOfAbyss/DungeonOfAbyssZone.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/DungeonOfAbyss/DungeonOfAbyssZone.java
index 439e3d440e..440119f080 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/DungeonOfAbyss/DungeonOfAbyssZone.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/DungeonOfAbyss/DungeonOfAbyssZone.java
@@ -53,7 +53,7 @@ public class DungeonOfAbyssZone extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("EXIT_PLAYER") && (player != null))
 		{
@@ -90,7 +90,7 @@ public class DungeonOfAbyssZone extends AbstractNpcAI
 				player.teleToLocation(EXIT_LOCATION_4);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Ingrit.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Ingrit.java
index 8d6242081a..34a9393fad 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Ingrit.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Ingrit.java
@@ -59,7 +59,7 @@ public class Ingrit extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc.getId() == SOUL_TRACKER_INRGIT)
 		{
@@ -99,7 +99,7 @@ public class Ingrit extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Iris.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Iris.java
index 6077a611dd..78c008e99d 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Iris.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Iris.java
@@ -59,7 +59,7 @@ public class Iris extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc.getId() == SOUL_TRACKER_IRIS)
 		{
@@ -99,7 +99,7 @@ public class Iris extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Magrit.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Magrit.java
index 420cffb53a..e69b4d1f47 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Magrit.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Magrit.java
@@ -59,7 +59,7 @@ public class Magrit extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc.getId() == SOUL_TRACKER_MARGIT)
 		{
@@ -99,7 +99,7 @@ public class Magrit extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Rosammy.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Rosammy.java
index e2dadf67e9..0d0b09c0c7 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Rosammy.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Rosammy.java
@@ -59,7 +59,7 @@ public class Rosammy extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc.getId() == SOUL_TRACKER_ROSAMMY)
 		{
@@ -99,7 +99,7 @@ public class Rosammy extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/DungeonOfAbyss/Tores/Tores.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/DungeonOfAbyss/Tores/Tores.java
index ab4f6e34c2..cabb6b15c7 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/DungeonOfAbyss/Tores/Tores.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/DungeonOfAbyss/Tores/Tores.java
@@ -55,7 +55,7 @@ public class Tores extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -86,7 +86,7 @@ public class Tores extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
index a26e6075fd..31fc2ba199 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
@@ -43,12 +43,12 @@ public class Toma extends AbstractNpcAI
 	private Toma()
 	{
 		addFirstTalkId(TOMA);
-		onAdvEvent("RESPAWN_TOMA", null, null);
+		onEvent("RESPAWN_TOMA", null, null);
 		startQuestTimer("RESPAWN_TOMA", TELEPORT_DELAY, null, null, true);
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("RESPAWN_TOMA"))
 		{
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
index 6f8858a2a4..dd735beeaa 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
@@ -41,7 +41,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -54,7 +54,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 				npc.deleteMe();
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_DAY_NIGHT_CHANGE)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
index 76379f11ef..9e3b09ef23 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
@@ -38,14 +38,14 @@ public class Roxxy extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TEXT_SPAM") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SPEAK_WITH_ME_ABOUT_TRAVELING_AROUND_ADEN, 1000);
 			startQuestTimer("TEXT_SPAM", getRandom(10000, 30000), npc, null, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
index 143e9f48cd..158b1a72e0 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
@@ -49,7 +49,7 @@ public class Arushinai extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("30401-1.htm") || event.equals("30401-2.htm"))
 		{
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
index 6ee6719c50..ec7aecde57 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
@@ -47,7 +47,7 @@ public class DimensionalVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("30952-1.htm") || event.equals("30952-2.htm") || event.equals("30952-3.htm"))
 		{
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index d236e19d43..a5157acfc7 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -193,7 +193,7 @@ public class Antharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -605,7 +605,7 @@ public class Antharas extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 4a01a9e786..b5610ec889 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -164,7 +164,7 @@ public class Baium extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -478,7 +478,7 @@ public class Baium extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/bosses/Core/Core.java
index 71150c1323..b9dcb38092 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -142,7 +142,7 @@ public class Core extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
@@ -161,7 +161,7 @@ public class Core extends AbstractNpcAI
 			_minions.forEach(Attackable::decayMe);
 			_minions.clear();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index e74bc817e6..11c8477773 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -180,7 +180,7 @@ public class Orfen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -263,7 +263,7 @@ public class Orfen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 93735c996b..72e174bb65 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -155,7 +155,7 @@ public class QueenAnt extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -239,7 +239,7 @@ public class QueenAnt extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
index c26bb52f9c..31de5b2324 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
@@ -70,13 +70,13 @@ public class Zaken extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("zaken_unlock"))
 		{
 			spawnBoss();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private void spawnBoss()
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index 04fed5ab1b..b95d115b2c 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -59,7 +59,7 @@ public class ArenaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -124,7 +124,7 @@ public class ArenaManager extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
index b07792cd2d..11b8786523 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
@@ -57,7 +57,7 @@ public class CastleBlacksmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return (event.equalsIgnoreCase(npc.getId() + "-02.html") && hasRights(player, npc)) ? event : null;
 	}
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
index bb01178f53..0a2d84b789 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
@@ -393,7 +393,7 @@ public class CastleChamberlain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Castle castle = npc.getCastle();
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
index b9c1f3faf5..70bae86615 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
@@ -72,7 +72,7 @@ public class CastleDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
index bb32dde319..a319e3977f 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
@@ -56,7 +56,7 @@ public class CastleMercenaryManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index a2bf4617a1..06a742f8c8 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -78,7 +78,7 @@ public class CastleTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
@@ -168,7 +168,7 @@ public class CastleTeleporter extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
index bffed40bcc..ea1b40c41c 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
@@ -52,7 +52,7 @@ public class CastleWarehouse extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final boolean isMyLord = player.isClanLeader() && (player.getClan().getCastleId() == (npc.getCastle() != null ? npc.getCastle().getResidenceId() : -1));
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index 62d432cf52..c04c4e5ab1 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -64,7 +64,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
index a86581206e..afd7250ca4 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
@@ -57,7 +57,7 @@ public class ClanHallDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index bc399da8e5..f1a436b50b 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -98,7 +98,7 @@ public class ClanHallManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index fbf06e9737..7b6a27fc36 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -235,7 +235,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		if (!_isEnabled)
 		{
@@ -902,7 +902,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	{
 		if (event.getCommand().startsWith("Quest ClassMaster "))
 		{
-			final String html = onAdvEvent(event.getCommand().substring(18), null, event.getPlayer());
+			final String html = onEvent(event.getCommand().substring(18), null, event.getPlayer());
 			event.getPlayer().sendPacket(TutorialCloseHtml.STATIC_PACKET);
 			showResult(event.getPlayer(), html);
 		}
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/DivineBeast.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/DivineBeast.java
index 1f247a7b35..3f3a076992 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/DivineBeast.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/DivineBeast.java
@@ -44,7 +44,7 @@ public class DivineBeast extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player == null) || !player.hasServitors())
 		{
@@ -55,7 +55,7 @@ public class DivineBeast extends AbstractNpcAI
 			cancelQuestTimer(event, npc, player);
 			player.getServitors().values().forEach(summon -> summon.unSummon(player));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
index bbff4608fc..8812882c93 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
@@ -69,7 +69,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
index 7d1abb4769..187fbae9dd 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
@@ -56,7 +56,7 @@ public class NewbieGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("0"))
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
index acc83d72d8..27ab7e4f74 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
@@ -69,7 +69,7 @@ public class OlyBuffer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.startsWith("giveBuff;") && (npc.getScriptValue() < 5))
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index 201f3843ba..f08fb759ac 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -70,7 +70,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
index 21d281c6c9..435f293345 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
@@ -84,7 +84,7 @@ public class Proclaimer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("giveBuff"))
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
index ea0a8a16da..1fc1737173 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
@@ -79,7 +79,7 @@ public class ProvisionalHalls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/RandomWalkingGuards.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
index 8138dee3ee..ffe4fd87f1 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
@@ -48,7 +48,7 @@ public class RandomWalkingGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("RANDOM_WALK") && (npc != null))
 		{
@@ -59,7 +59,7 @@ public class RandomWalkingGuards extends AbstractNpcAI
 			}
 			startQuestTimer("RANDOM_WALK", getRandom(MIN_WALK_DELAY, MAX_WALK_DELAY), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/Servitors/SinEater.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/Servitors/SinEater.java
index 1ed8d645a5..d7536614e8 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/Servitors/SinEater.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/Servitors/SinEater.java
@@ -48,7 +48,7 @@ public class SinEater extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TALK") && (player != null) && (player.getPet() != null))
 		{
@@ -79,7 +79,7 @@ public class SinEater extends AbstractNpcAI
 			}
 			startQuestTimer("TALK", 60000, null, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_CREATURE_DEATH)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
index b8e769f36b..2830f9bca4 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
@@ -50,7 +50,7 @@ public class SymbolMaker extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
index 04d4672c76..b595c4d6d4 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
@@ -86,7 +86,7 @@ public class ToIVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int npcId = npc.getId();
 		
@@ -132,7 +132,7 @@ public class ToIVortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index 356236cfc7..bf5b0506dc 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -188,7 +188,7 @@ public class WyvernManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
index 0c2e7586c9..c49be5297b 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
@@ -36,7 +36,7 @@ public class DelevelManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.DELEVEL_MANAGER_ENABLED)
 		{
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
index ff6d40ec0e..4713803f1d 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
@@ -54,7 +54,7 @@ public class FactionSystem extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class FactionSystem extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
index 8b9c676ad5..771c8a9058 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
@@ -34,7 +34,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -77,7 +77,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 				npc.broadcastInfo(); // update flag status
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
index 669fcfc85c..ddf7e923eb 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
@@ -39,7 +39,7 @@ public class NoblessMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.NOBLESS_MASTER_ENABLED)
 		{
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
index 4f0f0c988a..5ba22124c1 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
@@ -215,7 +215,7 @@ public class NpcLocationInfo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (Util.isDigit(event))
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
index 8e1f84c102..3a9b5b4bdc 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
@@ -169,7 +169,7 @@ public class Deathmatch extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
index 1eb84eca93..b92bbe7f77 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
@@ -213,7 +213,7 @@ public class Rabbits extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/events/Race/Race.java
index ff9fc462f6..6ac325ca6f 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/events/Race/Race.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/events/Race/Race.java
@@ -320,7 +320,7 @@ public class Race extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index e827184ae4..60da9f13d3 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -186,7 +186,7 @@ public class TvT extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index 53d917a5c7..a00de57ae5 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -44,7 +44,7 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/events/HappyHours/HappyHours.java
index e76af2108a..eb247dbbb3 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/events/HappyHours/HappyHours.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/events/HappyHours/HappyHours.java
@@ -49,7 +49,7 @@ public class HappyHours extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/events/LetterCollector/LetterCollector.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
index 9030e46d76..da0d972c5b 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
@@ -73,7 +73,7 @@ public class LetterCollector extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
index 762cde5596..245342a91e 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
@@ -45,7 +45,7 @@ public class ThePowerOfLove extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/events/TotalRecall/TotalRecall.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
index 4486ac5f36..a5448d4db5 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
@@ -42,7 +42,7 @@ public class TotalRecall extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
index 5de1a19cd2..3e745b3d08 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
@@ -354,7 +354,7 @@ public class WatermelonNinja extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java
index 79f364a54e..cf2473bc19 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java
@@ -84,7 +84,7 @@ public class Q00070_SagaOfThePhoenixKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java
index 1c5ee20575..703208bf2e 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java
@@ -85,7 +85,7 @@ public class Q00071_SagaOfEvasTemplar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java
index 91ba4811de..0808d1601b 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java
@@ -85,7 +85,7 @@ public class Q00072_SagaOfTheSwordMuse extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java
index 896f16438e..7e6fda1667 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java
@@ -85,7 +85,7 @@ public class Q00073_SagaOfTheDuelist extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java
index 1a98d4d200..fd0a03550d 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java
@@ -85,7 +85,7 @@ public class Q00074_SagaOfTheDreadnought extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java
index e5e6b39427..428c1caa43 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java
@@ -85,7 +85,7 @@ public class Q00075_SagaOfTheTitan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java
index a977722f62..ccfff282a0 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java
@@ -85,7 +85,7 @@ public class Q00076_SagaOfTheGrandKhavatari extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java
index 508438d67a..43f8ff9d78 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java
@@ -85,7 +85,7 @@ public class Q00077_SagaOfTheDominator extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java
index 75c3d73024..1ed3216c29 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java
@@ -85,7 +85,7 @@ public class Q00078_SagaOfTheDoomcryer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java
index 3df5908a15..8dc5a8c81a 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java
@@ -85,7 +85,7 @@ public class Q00079_SagaOfTheAdventurer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java
index 2074a51b96..c542de4c19 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java
@@ -85,7 +85,7 @@ public class Q00080_SagaOfTheWindRider extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java
index 67ca500398..73e5ca9f03 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java
@@ -85,7 +85,7 @@ public class Q00081_SagaOfTheGhostHunter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java
index 52f64dc817..b143f8b56b 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java
@@ -85,7 +85,7 @@ public class Q00082_SagaOfTheSagittarius extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java
index 2818994337..c7cb95b044 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java
@@ -85,7 +85,7 @@ public class Q00083_SagaOfTheMoonlightSentinel extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java
index 5c4722209e..39a2839627 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java
@@ -85,7 +85,7 @@ public class Q00084_SagaOfTheGhostSentinel extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java
index e32cc7ded0..f72865632a 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java
@@ -85,7 +85,7 @@ public class Q00085_SagaOfTheCardinal extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java
index c0b50b130e..4dd2385ff8 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java
@@ -85,7 +85,7 @@ public class Q00086_SagaOfTheHierophant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java
index 76719ec38e..1837ccacda 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java
@@ -85,7 +85,7 @@ public class Q00087_SagaOfEvasSaint extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java
index 4901af8961..e87a6913ce 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java
@@ -84,7 +84,7 @@ public class Q00088_SagaOfTheArchmage extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java
index cbf08d12cc..524e8dbdc1 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java
@@ -84,7 +84,7 @@ public class Q00089_SagaOfTheMysticMuse extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java
index 9b236936e0..26c9bb3dd4 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java
@@ -84,7 +84,7 @@ public class Q00090_SagaOfTheStormScreamer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java
index 751f487099..15c7611dc3 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java
@@ -85,7 +85,7 @@ public class Q00091_SagaOfTheArcanaLord extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java
index 6f98a643f7..337e3070d1 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java
@@ -84,7 +84,7 @@ public class Q00092_SagaOfTheElementalMaster extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java
index f77b67dd6a..61acb45c50 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java
@@ -84,7 +84,7 @@ public class Q00093_SagaOfTheSpectralMaster extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java
index 12d4bc28d6..24004acd96 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java
@@ -84,7 +84,7 @@ public class Q00094_SagaOfTheSoultaker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java
index a104ed14ed..6174d9f79d 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java
@@ -85,7 +85,7 @@ public class Q00095_SagaOfTheHellKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java
index 7c08220d8d..5deb250ad9 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java
@@ -84,7 +84,7 @@ public class Q00096_SagaOfTheSpectralDancer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java
index dee5c701e3..7f93f9bb4b 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java
@@ -84,7 +84,7 @@ public class Q00097_SagaOfTheShillienTemplar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java
index c21ebb5e13..7d89d5cabc 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java
@@ -85,7 +85,7 @@ public class Q00098_SagaOfTheShillienSaint extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java
index a63b4710c7..e9113ef4a7 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java
@@ -84,7 +84,7 @@ public class Q00099_SagaOfTheFortuneSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java
index 349f583104..8ec0ec7a61 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java
@@ -84,7 +84,7 @@ public class Q00100_SagaOfTheMaestro extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
index ad72f044ca..b9d8feb578 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
@@ -53,7 +53,7 @@ public class Q00127_FishingSpecialistsRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
index 6b7de9bd96..18b11d47ae 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
@@ -76,7 +76,7 @@ public class Q00211_TrialOfTheChallenger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
index efde71ba49..2e70c4f9b1 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
@@ -86,7 +86,7 @@ public class Q00212_TrialOfDuty extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
index a0f8f915b3..1f4f42c490 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
@@ -92,7 +92,7 @@ public class Q00213_TrialOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
index 94bba112f2..6dfacfa116 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
@@ -120,7 +120,7 @@ public class Q00214_TrialOfTheScholar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
index da0399c8ce..a555adb852 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
@@ -77,7 +77,7 @@ public class Q00215_TrialOfThePilgrim extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
index 05aade19d6..82ef5fe081 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
@@ -94,7 +94,7 @@ public class Q00216_TrialOfTheGuildsman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
index 32a88e353e..86edef3008 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
@@ -107,7 +107,7 @@ public class Q00217_TestimonyOfTrust extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
index a5d3455060..05ed9df156 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
@@ -104,7 +104,7 @@ public class Q00218_TestimonyOfLife extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
index 5e3eb02369..9eae62eb6e 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
@@ -107,7 +107,7 @@ public class Q00219_TestimonyOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
index 24d8bf39f4..e22e3a6c92 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
@@ -121,7 +121,7 @@ public class Q00220_TestimonyOfGlory extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
index a276b60f56..dff82abd5d 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
@@ -124,7 +124,7 @@ public class Q00221_TestimonyOfProsperity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
index 761bdeb64a..3f03f3e509 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
@@ -88,7 +88,7 @@ public class Q00222_TestOfTheDuelist extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
index bd794eef75..d0bbb73b4f 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
@@ -85,7 +85,7 @@ public class Q00223_TestOfTheChampion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
index 163aa900f4..346538dc45 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
@@ -94,7 +94,7 @@ public class Q00224_TestOfSagittarius extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
index ae9bb5fb4d..e7a6b7ef1a 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
@@ -91,7 +91,7 @@ public class Q00225_TestOfTheSearcher extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
index c3dc04f3f1..9d8e8a161d 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
@@ -81,7 +81,7 @@ public class Q00226_TestOfTheHealer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
index ba1fc6097e..dac23aac62 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
@@ -114,7 +114,7 @@ public class Q00227_TestOfTheReformer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("DESPAWN".equals(event))
 		{
@@ -127,7 +127,7 @@ public class Q00227_TestOfTheReformer extends Quest
 			{
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
index 6ca6b63f34..42f8db1e54 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
@@ -99,7 +99,7 @@ public class Q00228_TestOfMagus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
index 954c6b4142..706fc8fb29 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
@@ -115,7 +115,7 @@ public class Q00229_TestOfWitchcraft extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
index 2d810c2bb4..9e61822eca 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
@@ -163,7 +163,7 @@ public class Q00230_TestOfTheSummoner extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
index ea9ab4c98d..0b1696278f 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
@@ -81,7 +81,7 @@ public class Q00231_TestOfTheMaestro extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
index bdd4cb26b5..8aaeb13125 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
@@ -106,7 +106,7 @@ public class Q00232_TestOfTheLord extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
index a8f0d1a2a5..3c14c2ef63 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
@@ -106,7 +106,7 @@ public class Q00233_TestOfTheWarSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
index f41ac170e9..9c179c34ac 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
@@ -143,7 +143,7 @@ public class Q00255_Tutorial extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
index a98a9a317b..3f8ecbb375 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
@@ -88,7 +88,7 @@ public class Q00257_TheGuardIsBusy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
index ddd656d3ad..c19e69fd3d 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
@@ -66,7 +66,7 @@ public class Q00258_BringWolfPelts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30001-03.html"))
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
index 02efc29fd9..88ca56e754 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
@@ -70,7 +70,7 @@ public class Q00259_RequestFromTheFarmOwner extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
index 6e63d6faf4..e3e252ec97 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
@@ -63,7 +63,7 @@ public class Q00260_OrcHunting extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
index b68a525827..ff6e0e01fc 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
@@ -61,7 +61,7 @@ public class Q00261_CollectorsDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30222-03.htm"))
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
index 95721f08dc..29b898dc6d 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
@@ -59,7 +59,7 @@ public class Q00262_TradeWithTheIvoryTower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30137-03.htm"))
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
index 1bdeec4a83..950346cf59 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
@@ -61,7 +61,7 @@ public class Q00263_OrcSubjugation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
index 20ddbeac20..bd848ee2cf 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
@@ -68,7 +68,7 @@ public class Q00264_KeenClaws extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30136-03.htm"))
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
index d90ce43946..195dc0675d 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
@@ -58,7 +58,7 @@ public class Q00265_BondsOfSlavery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
index 68c5dd1cc3..87c949919f 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
@@ -72,7 +72,7 @@ public class Q00266_PleasOfPixies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("31852-04.htm"))
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
index aa676c5d46..5b26a51d59 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
@@ -50,7 +50,7 @@ public class Q00267_WrathOfVerdure extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
index b6c64f4db7..52a1ad5ec8 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
@@ -54,7 +54,7 @@ public class Q00271_ProofOfValor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30577-04.htm"))
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
index 0c0748e735..8fc6eb06c2 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
@@ -54,7 +54,7 @@ public class Q00272_WrathOfAncestors extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30572-04.htm"))
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
index b3f9d4bb1b..00afdb3a51 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
@@ -60,7 +60,7 @@ public class Q00273_InvadersOfTheHolyLand extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
index f45e185d3f..de06f688b3 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
@@ -57,7 +57,7 @@ public class Q00274_SkirmishWithTheWerewolves extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30569-04.htm"))
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
index 1e6a02f4f9..31e70fba32 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
@@ -59,7 +59,7 @@ public class Q00275_DarkWingedSpies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30567-03.htm"))
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
index 74935e9104..e8f904d1f6 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
@@ -74,7 +74,7 @@ public class Q00276_TotemOfTheHestui extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30571-03.htm"))
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
index 156b85fdf6..6b507503c3 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
@@ -51,7 +51,7 @@ public class Q00277_GatekeepersOffering extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30576-03.htm"))
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
index 8e245d375c..48ed318353 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
@@ -68,7 +68,7 @@ public class Q00292_BrigandsSweep extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
index 227398a92d..93d41b6c06 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
@@ -59,7 +59,7 @@ public class Q00293_TheHiddenVeins extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
index 554161d862..a56345d2f9 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
@@ -62,7 +62,7 @@ public class Q00294_CovertBusiness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && qs.isCreated() && event.equals("30534-03.htm"))
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
index 98daa7c06c..2e8d1c601d 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
@@ -51,7 +51,7 @@ public class Q00295_DreamingOfTheSkies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && qs.isCreated() && event.equals("30536-03.htm"))
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
index 4d1d5b1777..9dc8ba9904 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
@@ -56,7 +56,7 @@ public class Q00296_TarantulasSpiderSilk extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
index e0b5bc2986..099201eb88 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
@@ -52,7 +52,7 @@ public class Q00297_GatekeepersFavor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30540-03.htm"))
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
index a7c0756abb..24aef6ae0c 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
@@ -66,7 +66,7 @@ public class Q00300_HuntingLetoLizardman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
index 65317d4367..8960b5ee57 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
@@ -49,7 +49,7 @@ public class Q00303_CollectArrowheads extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30029-04.htm"))
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
index 20009b3457..e520a0cd92 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
@@ -65,7 +65,7 @@ public class Q00306_CrystalOfFireAndIce extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
index 69cbcdbf2a..a1eb4478d8 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
@@ -51,7 +51,7 @@ public class Q00313_CollectSpores extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
index fb42e610a9..5c4fe19392 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
@@ -70,7 +70,7 @@ public class Q00316_DestroyPlagueCarriers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
index 86a347b60b..b69fd606ea 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
@@ -52,7 +52,7 @@ public class Q00317_CatchTheWind extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
index e88feb95e2..fc8f958e8c 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
@@ -54,7 +54,7 @@ public class Q00319_ScentOfDeath extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
index 8fd327d6b5..49cc3a2f09 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
@@ -55,7 +55,7 @@ public class Q00320_BonesTellTheFuture extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30359-04.htm"))
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
index a97a566c92..03cf67028d 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
@@ -60,7 +60,7 @@ public class Q00324_SweetestVenom extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
index 233ae4efea..308b9d1e12 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
@@ -79,7 +79,7 @@ public class Q00325_GrimCollector extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
index dc3eb65ec4..2566d50918 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
@@ -69,7 +69,7 @@ public class Q00326_VanquishRemnants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
index 1956e2923e..99a18a2d23 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
@@ -105,7 +105,7 @@ public class Q00327_RecoverTheFarmland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
index 64cc6ef8e9..b8d1a39d6c 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
@@ -70,7 +70,7 @@ public class Q00328_SenseForBusiness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
index 72407eabc3..25eb32f4d0 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
@@ -62,7 +62,7 @@ public class Q00329_CuriosityOfADwarf extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
index 518d845bcc..dd71a57310 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
@@ -65,7 +65,7 @@ public class Q00331_ArrowOfVengeance extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
index 498b165be2..02f12606c7 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
@@ -121,7 +121,7 @@ public class Q00333_HuntOfTheBlackLion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		final int chance = getRandom(100);
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
index 5f664a5fed..1031fbb7fb 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
@@ -85,7 +85,7 @@ public class Q00344_1000YearsTheEndOfLamentation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java
index da8086521c..eb49b8dc51 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java
@@ -59,7 +59,7 @@ public class Q00348_AnArrogantSearch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
index fd775bbe73..bc785abac1 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
@@ -60,7 +60,7 @@ public class Q00354_ConquestOfAlligatorIsland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
index ee19b7e4ab..fbcd365dc3 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
@@ -87,7 +87,7 @@ public class Q00355_FamilyHonor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
index e1633226d2..c200224cfa 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
@@ -61,7 +61,7 @@ public class Q00356_DigUpTheSeaOfSpores extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
index aca7242c87..8b51394b23 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
@@ -68,7 +68,7 @@ public class Q00358_IllegitimateChildOfTheGoddess extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
index ed0f544adc..2407d92d0f 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
@@ -59,7 +59,7 @@ public class Q00360_PlunderTheirSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
index aaf517b7a9..e910c1e70e 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
@@ -68,7 +68,7 @@ public class Q00369_CollectorOfJewels extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
index d24b38b112..c6c223f5a1 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
@@ -70,7 +70,7 @@ public class Q00370_AnElderSowsSeeds extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java
index 26bbe0c26a..510e73c602 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java
@@ -58,7 +58,7 @@ public class Q00374_WhisperOfDreamsPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java
index 370ba1f6b8..f37a2720b9 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java
@@ -56,7 +56,7 @@ public class Q00375_WhisperOfDreamsPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
index 7773083c9a..c29c87b26d 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
@@ -65,7 +65,7 @@ public class Q00401_PathOfTheWarrior extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
index 73be798601..f90aa18585 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
@@ -90,7 +90,7 @@ public class Q00402_PathOfTheHumanKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
index bd13a4bbe9..9bd736acaa 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
@@ -93,7 +93,7 @@ public class Q00403_PathOfTheRogue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
index 4b0285fcef..ac44dd64d6 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
@@ -72,7 +72,7 @@ public class Q00404_PathOfTheHumanWizard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
index 455a88115a..b7ad34d507 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
@@ -68,7 +68,7 @@ public class Q00405_PathOfTheCleric extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
index 60a2100263..fcb92b0837 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
@@ -73,7 +73,7 @@ public class Q00406_PathOfTheElvenKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
index e8ae130e75..89dbb1cea4 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
@@ -67,7 +67,7 @@ public class Q00407_PathOfTheElvenScout extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
index e35ea8444b..86dd94df1f 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
@@ -70,7 +70,7 @@ public class Q00408_PathOfTheElvenWizard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
index 809b741536..1e788f366f 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
@@ -66,7 +66,7 @@ public class Q00409_PathOfTheElvenOracle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
index 261122d3ff..727d4148f0 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
@@ -62,7 +62,7 @@ public class Q00410_PathOfThePalusKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
index d0849cb9a0..b6bd1f946a 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
@@ -62,7 +62,7 @@ public class Q00411_PathOfTheAssassin extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
index a2a12199b7..fda1cd4beb 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
@@ -69,7 +69,7 @@ public class Q00412_PathOfTheDarkWizard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
index cf84a5a883..55897e0028 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
@@ -66,7 +66,7 @@ public class Q00413_PathOfTheShillienOracle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
index 9bd2adec48..34d1af1f9c 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
@@ -65,7 +65,7 @@ public class Q00414_PathOfTheOrcRaider extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
index 0d21264633..3b6f7f4fb5 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
@@ -90,7 +90,7 @@ public class Q00415_PathOfTheOrcMonk extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
index 6a0fb18a23..1b62cbad54 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
@@ -88,7 +88,7 @@ public class Q00416_PathOfTheOrcShaman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
index 2e9a9937b5..973de273fc 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
@@ -84,7 +84,7 @@ public class Q00417_PathOfTheScavenger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
index 23061e130c..43770b4eb1 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
@@ -66,7 +66,7 @@ public class Q00418_PathOfTheArtisan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
index 90fc91cb14..8a8d28689c 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
@@ -68,7 +68,7 @@ public class Q00500_BrothersBoundInChains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
index c6c6541b90..e40f43ea81 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
@@ -82,7 +82,7 @@ public class Q00662_AGameOfCards extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss.java
index 6b14892016..e986187f8e 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss.java
@@ -51,7 +51,7 @@ public class Q00933_ExploringTheWestWingOfTheDungeonOfAbyss extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss.java
index ba47f428b9..c8765f54cf 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss.java
@@ -51,7 +51,7 @@ public class Q00935_ExploringTheEastWingOfTheDungeonOfAbyss extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q10866_PunitiveOperationOnTheDevilIsle/Q10866_PunitiveOperationOnTheDevilIsle.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q10866_PunitiveOperationOnTheDevilIsle/Q10866_PunitiveOperationOnTheDevilIsle.java
index 236a65502b..fa4bf40711 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q10866_PunitiveOperationOnTheDevilIsle/Q10866_PunitiveOperationOnTheDevilIsle.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q10866_PunitiveOperationOnTheDevilIsle/Q10866_PunitiveOperationOnTheDevilIsle.java
@@ -52,7 +52,7 @@ public class Q10866_PunitiveOperationOnTheDevilIsle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q10993_FutureDwarves/Q10993_FutureDwarves.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q10993_FutureDwarves/Q10993_FutureDwarves.java
index 250e3a8995..013242d4b2 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q10993_FutureDwarves/Q10993_FutureDwarves.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q10993_FutureDwarves/Q10993_FutureDwarves.java
@@ -57,7 +57,7 @@ public class Q10993_FutureDwarves extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q10994_FutureOrcs/Q10994_FutureOrcs.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q10994_FutureOrcs/Q10994_FutureOrcs.java
index 238e0fa458..f96df09a5c 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q10994_FutureOrcs/Q10994_FutureOrcs.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q10994_FutureOrcs/Q10994_FutureOrcs.java
@@ -56,7 +56,7 @@ public class Q10994_FutureOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java
index 7c85f8822b..1c1dd0364d 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java
@@ -73,7 +73,7 @@ public class Q10995_MutualBenefit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java
index 16ce909551..631067b7a1 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java
@@ -71,7 +71,7 @@ public class Q10996_TemplesDecorations extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q10997_LoserPriest1/Q10997_LoserPriest1.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q10997_LoserPriest1/Q10997_LoserPriest1.java
index 2ed08fc50c..8e9a9c27ea 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q10997_LoserPriest1/Q10997_LoserPriest1.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q10997_LoserPriest1/Q10997_LoserPriest1.java
@@ -65,7 +65,7 @@ public class Q10997_LoserPriest1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java
index 5bf66e5740..f558135c8c 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java
@@ -67,7 +67,7 @@ public class Q10998_LoserPriest2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java
index 7a6abe643a..42f08ebc69 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java
@@ -70,7 +70,7 @@ public class Q10999_LoserPriest3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11000_MoonKnight/Q11000_MoonKnight.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11000_MoonKnight/Q11000_MoonKnight.java
index f5b2632cfc..990ed4ca8c 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11000_MoonKnight/Q11000_MoonKnight.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11000_MoonKnight/Q11000_MoonKnight.java
@@ -87,7 +87,7 @@ public class Q11000_MoonKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java
index d785928ae4..30433b7906 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java
@@ -71,7 +71,7 @@ public class Q11001_TombsOfAncestors extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java
index 8721acf2af..f91df843e3 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java
@@ -70,7 +70,7 @@ public class Q11002_HelpWithTempleRestoration extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java
index 129deca6dc..cdd446e816 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java
@@ -69,7 +69,7 @@ public class Q11003_PerfectLeatherArmor1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java
index cb6a7a0ee9..da42f6b60d 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java
@@ -71,7 +71,7 @@ public class Q11004_PerfectLeatherArmor2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java
index 405848b6c2..d7a0f220be 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java
@@ -71,7 +71,7 @@ public class Q11005_PerfectLeatherArmor3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11006_FuturePeople/Q11006_FuturePeople.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11006_FuturePeople/Q11006_FuturePeople.java
index 926f1dd745..922772d391 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11006_FuturePeople/Q11006_FuturePeople.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11006_FuturePeople/Q11006_FuturePeople.java
@@ -61,7 +61,7 @@ public class Q11006_FuturePeople extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java
index eb48ad1fa4..49c35c4534 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java
@@ -71,7 +71,7 @@ public class Q11007_NoiseInWoods extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java
index 6234d1f496..502b9b9d24 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java
@@ -72,7 +72,7 @@ public class Q11008_PreparationForDungeon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java
index 5efbb08add..93e5cd7383 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java
@@ -66,7 +66,7 @@ public class Q11009_NewPotionDevelopment1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java
index 6fc7075973..5aa513eabc 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java
@@ -68,7 +68,7 @@ public class Q11010_NewPotionDevelopment2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java
index f2e64bdfe7..e71754ecd3 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java
@@ -67,7 +67,7 @@ public class Q11011_NewPotionDevelopment3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11012_FutureElves/Q11012_FutureElves.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11012_FutureElves/Q11012_FutureElves.java
index 10c21ab330..44ee19386e 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11012_FutureElves/Q11012_FutureElves.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11012_FutureElves/Q11012_FutureElves.java
@@ -57,7 +57,7 @@ public class Q11012_FutureElves extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java
index 59082963ba..abdcd1da60 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java
@@ -73,7 +73,7 @@ public class Q11013_ShilensHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java
index 1f376d04a6..41a4c1e0ee 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java
@@ -72,7 +72,7 @@ public class Q11014_SurpriseGift extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java
index 8ea5b69558..a3772b0f31 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java
@@ -69,7 +69,7 @@ public class Q11015_PrepareForTrade1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java
index 911eaff20a..f194ab0ffe 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java
@@ -71,7 +71,7 @@ public class Q11016_PrepareForTrade2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java
index 48c8a15d51..911a806b55 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java
@@ -71,7 +71,7 @@ public class Q11017_PrepareForTrade3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11018_FutureDarkElves/Q11018_FutureDarkElves.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11018_FutureDarkElves/Q11018_FutureDarkElves.java
index bbe6a3fac5..ae2938c9c2 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11018_FutureDarkElves/Q11018_FutureDarkElves.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11018_FutureDarkElves/Q11018_FutureDarkElves.java
@@ -59,7 +59,7 @@ public class Q11018_FutureDarkElves extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java
index dcc694115b..5c9f57e024 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java
@@ -72,7 +72,7 @@ public class Q11019_TribalBenefit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java
index 8209d11d8d..432afa42b1 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java
@@ -69,7 +69,7 @@ public class Q11020_BlacksmithsRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java
index 200ca15bb5..62766dbf94 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java
@@ -67,7 +67,7 @@ public class Q11021_RedGemNecklace1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java
index 1e5796e1d0..8f5191d574 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java
@@ -69,7 +69,7 @@ public class Q11022_RedGemNecklace2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java
index 53d77fa2e6..5c6641ea5e 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java
@@ -67,7 +67,7 @@ public class Q11023_RedGemNecklace3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
index 06ea44ceb1..6698687a4e 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
@@ -45,7 +45,7 @@ public class AllianceMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!"9001-01.htm".equals(event) && (player.getClan() == null))
 		{
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
index b69c69d8d0..b9cae10d1b 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
@@ -74,7 +74,7 @@ public class ClanMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LEADER_REQUIRED.containsKey(event) && !player.isClanLeader())
 		{
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
index 472b265d19..7560171dd1 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
@@ -61,7 +61,7 @@ public class DarkElfChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
index 1eef46c033..073a93bdae 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
@@ -73,7 +73,7 @@ public class DarkElfChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
index b90395d96a..fe46f96453 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
@@ -50,7 +50,7 @@ public class DwarfBlacksmithChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
index c00f750f8f..7471a928e7 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
@@ -54,7 +54,7 @@ public class DwarfBlacksmithChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
index 187710070c..df7368de42 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
@@ -50,7 +50,7 @@ public class DwarfWarehouseChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
index bcd1325051..e18b5c69e4 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
@@ -54,7 +54,7 @@ public class DwarfWarehouseChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
index 683c50e475..a9da2dffa6 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
@@ -57,7 +57,7 @@ public class ElfHumanClericChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
index c0cf3513d7..eff155a55f 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
@@ -59,7 +59,7 @@ public class ElfHumanFighterChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
index 58bb620a4f..5ab836930b 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
@@ -72,7 +72,7 @@ public class ElfHumanFighterChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
index ed623b52b0..c5b843fdc1 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
@@ -57,7 +57,7 @@ public class ElfHumanWizardChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
index 2b882feda7..7343a5f35c 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
@@ -61,7 +61,7 @@ public class ElfHumanWizardChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
index acf6f9bc2f..1a231cd5d9 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
@@ -53,7 +53,7 @@ public class FirstClassTransferTalk extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return event;
 	}
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
index e3c48b1f33..324f48a504 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
@@ -51,7 +51,7 @@ public class OrcChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
index d055e1ab84..c1808b3396 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
@@ -61,7 +61,7 @@ public class OrcChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/quest/Quest.java
index f343e5d8e9..252c508537 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/quest/Quest.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/quest/Quest.java
@@ -245,7 +245,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -267,7 +267,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -558,7 +558,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 			{
 				player.setSimulatedTalking(false);
 			}
-			res = onAdvEvent(event, npc, player);
+			res = onEvent(event, npc, player);
 		}
 		catch (Exception e)
 		{
@@ -1020,12 +1020,11 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 */
 	public String onDeath(Creature killer, Creature victim, QuestState qs)
 	{
-		return onAdvEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
+		return onEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
 	}
 	
 	/**
 	 * This function is called whenever a player clicks on a link in a quest dialog and whenever a timer fires.<br>
-	 * If is not overridden by a subclass, then default to the returned value of the simpler (and older) {@link #onEvent(String, QuestState)} override.<br>
 	 * If the player has a quest state, use it as parameter in the next call, otherwise return null.
 	 * @param event this parameter contains a string identifier for the event.<br>
 	 *            Generally, this string is passed directly via the link.<br>
@@ -1044,35 +1043,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 *            This parameter may be {@code null} in certain circumstances.
 	 * @return the text returned by the event (may be {@code null}, a filename or just text)
 	 */
-	public String onAdvEvent(String event, Npc npc, Player player)
-	{
-		if (player != null)
-		{
-			final QuestState qs = player.getQuestState(getName());
-			if (qs != null)
-			{
-				return onEvent(event, qs);
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * This function is called in place of {@link #onAdvEvent(String, Npc, Player)} if the former is not implemented.<br>
-	 * If a script contains both {@link #onAdvEvent(String, Npc, Player)} and this implementation, then this method will never be called unless the script's {@link #onAdvEvent(String, Npc, Player)} explicitly calls this method.
-	 * @param event this parameter contains a string identifier for the event.<br>
-	 *            Generally, this string is passed directly via the link.<br>
-	 *            For example:<br>
-	 *            <code>
-	 *            &lt;a action="bypass -h Quest 626_ADarkTwilight 31517-01.htm"&gt;hello&lt;/a&gt;
-	 *            </code><br>
-	 *            The above link sets the event variable to "31517-01.htm" for the quest 626_ADarkTwilight.<br>
-	 *            In the case of timers, this will be the name of the timer.<br>
-	 *            This parameter serves as a sort of identifier.
-	 * @param qs this parameter contains a reference to the quest state of the player who used the link or started the timer.
-	 * @return the text returned by the event (may be {@code null}, a filename or just text)
-	 */
-	public String onEvent(String event, QuestState qs)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return null;
 	}
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java
index 3817e1be30..db707fe326 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java
@@ -49,7 +49,7 @@ public class Fellow extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/DungeonOfAbyss/DungeonOfAbyssZone.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/DungeonOfAbyss/DungeonOfAbyssZone.java
index 439e3d440e..440119f080 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/DungeonOfAbyss/DungeonOfAbyssZone.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/DungeonOfAbyss/DungeonOfAbyssZone.java
@@ -53,7 +53,7 @@ public class DungeonOfAbyssZone extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("EXIT_PLAYER") && (player != null))
 		{
@@ -90,7 +90,7 @@ public class DungeonOfAbyssZone extends AbstractNpcAI
 				player.teleToLocation(EXIT_LOCATION_4);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Ingrit.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Ingrit.java
index 8d6242081a..34a9393fad 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Ingrit.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Ingrit.java
@@ -59,7 +59,7 @@ public class Ingrit extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc.getId() == SOUL_TRACKER_INRGIT)
 		{
@@ -99,7 +99,7 @@ public class Ingrit extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Iris.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Iris.java
index 6077a611dd..78c008e99d 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Iris.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Iris.java
@@ -59,7 +59,7 @@ public class Iris extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc.getId() == SOUL_TRACKER_IRIS)
 		{
@@ -99,7 +99,7 @@ public class Iris extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Magrit.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Magrit.java
index 420cffb53a..e69b4d1f47 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Magrit.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Magrit.java
@@ -59,7 +59,7 @@ public class Magrit extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc.getId() == SOUL_TRACKER_MARGIT)
 		{
@@ -99,7 +99,7 @@ public class Magrit extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Rosammy.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Rosammy.java
index e2dadf67e9..0d0b09c0c7 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Rosammy.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Rosammy.java
@@ -59,7 +59,7 @@ public class Rosammy extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc.getId() == SOUL_TRACKER_ROSAMMY)
 		{
@@ -99,7 +99,7 @@ public class Rosammy extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/DungeonOfAbyss/Tores/Tores.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/DungeonOfAbyss/Tores/Tores.java
index ab4f6e34c2..cabb6b15c7 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/DungeonOfAbyss/Tores/Tores.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/DungeonOfAbyss/Tores/Tores.java
@@ -55,7 +55,7 @@ public class Tores extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -86,7 +86,7 @@ public class Tores extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
index a26e6075fd..31fc2ba199 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
@@ -43,12 +43,12 @@ public class Toma extends AbstractNpcAI
 	private Toma()
 	{
 		addFirstTalkId(TOMA);
-		onAdvEvent("RESPAWN_TOMA", null, null);
+		onEvent("RESPAWN_TOMA", null, null);
 		startQuestTimer("RESPAWN_TOMA", TELEPORT_DELAY, null, null, true);
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("RESPAWN_TOMA"))
 		{
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
index 6f8858a2a4..dd735beeaa 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
@@ -41,7 +41,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -54,7 +54,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 				npc.deleteMe();
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_DAY_NIGHT_CHANGE)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
index 76379f11ef..9e3b09ef23 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
@@ -38,14 +38,14 @@ public class Roxxy extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TEXT_SPAM") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SPEAK_WITH_ME_ABOUT_TRAVELING_AROUND_ADEN, 1000);
 			startQuestTimer("TEXT_SPAM", getRandom(10000, 30000), npc, null, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
index 143e9f48cd..158b1a72e0 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
@@ -49,7 +49,7 @@ public class Arushinai extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("30401-1.htm") || event.equals("30401-2.htm"))
 		{
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java
index d918a2bfc3..801a77996a 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java
@@ -49,7 +49,7 @@ public class Ateld extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
index 6ee6719c50..ec7aecde57 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
@@ -47,7 +47,7 @@ public class DimensionalVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("30952-1.htm") || event.equals("30952-2.htm") || event.equals("30952-3.htm"))
 		{
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index d236e19d43..a5157acfc7 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -193,7 +193,7 @@ public class Antharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -605,7 +605,7 @@ public class Antharas extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 4a01a9e786..b5610ec889 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -164,7 +164,7 @@ public class Baium extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -478,7 +478,7 @@ public class Baium extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/bosses/Core/Core.java
index 71150c1323..b9dcb38092 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -142,7 +142,7 @@ public class Core extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
@@ -161,7 +161,7 @@ public class Core extends AbstractNpcAI
 			_minions.forEach(Attackable::decayMe);
 			_minions.clear();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index e74bc817e6..11c8477773 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -180,7 +180,7 @@ public class Orfen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -263,7 +263,7 @@ public class Orfen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 93735c996b..72e174bb65 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -155,7 +155,7 @@ public class QueenAnt extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -239,7 +239,7 @@ public class QueenAnt extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
index c26bb52f9c..31de5b2324 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
@@ -70,13 +70,13 @@ public class Zaken extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("zaken_unlock"))
 		{
 			spawnBoss();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private void spawnBoss()
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index 04fed5ab1b..b95d115b2c 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -59,7 +59,7 @@ public class ArenaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -124,7 +124,7 @@ public class ArenaManager extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
index b07792cd2d..11b8786523 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
@@ -57,7 +57,7 @@ public class CastleBlacksmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return (event.equalsIgnoreCase(npc.getId() + "-02.html") && hasRights(player, npc)) ? event : null;
 	}
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
index bb01178f53..0a2d84b789 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
@@ -393,7 +393,7 @@ public class CastleChamberlain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Castle castle = npc.getCastle();
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
index b9c1f3faf5..70bae86615 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
@@ -72,7 +72,7 @@ public class CastleDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
index bb32dde319..a319e3977f 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
@@ -56,7 +56,7 @@ public class CastleMercenaryManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index a2bf4617a1..06a742f8c8 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -78,7 +78,7 @@ public class CastleTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
@@ -168,7 +168,7 @@ public class CastleTeleporter extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
index bffed40bcc..ea1b40c41c 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
@@ -52,7 +52,7 @@ public class CastleWarehouse extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final boolean isMyLord = player.isClanLeader() && (player.getClan().getCastleId() == (npc.getCastle() != null ? npc.getCastle().getResidenceId() : -1));
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index 62d432cf52..c04c4e5ab1 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -64,7 +64,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
index a86581206e..afd7250ca4 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
@@ -57,7 +57,7 @@ public class ClanHallDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index bc399da8e5..f1a436b50b 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -98,7 +98,7 @@ public class ClanHallManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index fbf06e9737..7b6a27fc36 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -235,7 +235,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		if (!_isEnabled)
 		{
@@ -902,7 +902,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	{
 		if (event.getCommand().startsWith("Quest ClassMaster "))
 		{
-			final String html = onAdvEvent(event.getCommand().substring(18), null, event.getPlayer());
+			final String html = onEvent(event.getCommand().substring(18), null, event.getPlayer());
 			event.getPlayer().sendPacket(TutorialCloseHtml.STATIC_PACKET);
 			showResult(event.getPlayer(), html);
 		}
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/DivineBeast.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/DivineBeast.java
index 1f247a7b35..3f3a076992 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/DivineBeast.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/DivineBeast.java
@@ -44,7 +44,7 @@ public class DivineBeast extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player == null) || !player.hasServitors())
 		{
@@ -55,7 +55,7 @@ public class DivineBeast extends AbstractNpcAI
 			cancelQuestTimer(event, npc, player);
 			player.getServitors().values().forEach(summon -> summon.unSummon(player));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
index bbff4608fc..8812882c93 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
@@ -69,7 +69,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
index 7d1abb4769..187fbae9dd 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
@@ -56,7 +56,7 @@ public class NewbieGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("0"))
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
index acc83d72d8..27ab7e4f74 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
@@ -69,7 +69,7 @@ public class OlyBuffer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.startsWith("giveBuff;") && (npc.getScriptValue() < 5))
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index 201f3843ba..f08fb759ac 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -70,7 +70,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
index 21d281c6c9..435f293345 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
@@ -84,7 +84,7 @@ public class Proclaimer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("giveBuff"))
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
index ea0a8a16da..1fc1737173 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
@@ -79,7 +79,7 @@ public class ProvisionalHalls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/RandomWalkingGuards.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
index 8138dee3ee..ffe4fd87f1 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
@@ -48,7 +48,7 @@ public class RandomWalkingGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("RANDOM_WALK") && (npc != null))
 		{
@@ -59,7 +59,7 @@ public class RandomWalkingGuards extends AbstractNpcAI
 			}
 			startQuestTimer("RANDOM_WALK", getRandom(MIN_WALK_DELAY, MAX_WALK_DELAY), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/Servitors/SinEater.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/Servitors/SinEater.java
index 1ed8d645a5..d7536614e8 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/Servitors/SinEater.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/Servitors/SinEater.java
@@ -48,7 +48,7 @@ public class SinEater extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TALK") && (player != null) && (player.getPet() != null))
 		{
@@ -79,7 +79,7 @@ public class SinEater extends AbstractNpcAI
 			}
 			startQuestTimer("TALK", 60000, null, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_CREATURE_DEATH)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
index b8e769f36b..2830f9bca4 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
@@ -50,7 +50,7 @@ public class SymbolMaker extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
index 04d4672c76..b595c4d6d4 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
@@ -86,7 +86,7 @@ public class ToIVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int npcId = npc.getId();
 		
@@ -132,7 +132,7 @@ public class ToIVortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index 356236cfc7..bf5b0506dc 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -188,7 +188,7 @@ public class WyvernManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
index 0c2e7586c9..c49be5297b 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
@@ -36,7 +36,7 @@ public class DelevelManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.DELEVEL_MANAGER_ENABLED)
 		{
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
index ff6d40ec0e..4713803f1d 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
@@ -54,7 +54,7 @@ public class FactionSystem extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class FactionSystem extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
index 8b9c676ad5..771c8a9058 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
@@ -34,7 +34,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -77,7 +77,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 				npc.broadcastInfo(); // update flag status
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
index 669fcfc85c..ddf7e923eb 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
@@ -39,7 +39,7 @@ public class NoblessMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.NOBLESS_MASTER_ENABLED)
 		{
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
index 4f0f0c988a..5ba22124c1 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
@@ -215,7 +215,7 @@ public class NpcLocationInfo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (Util.isDigit(event))
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
index 8e1f84c102..3a9b5b4bdc 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
@@ -169,7 +169,7 @@ public class Deathmatch extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
index 1eb84eca93..b92bbe7f77 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
@@ -213,7 +213,7 @@ public class Rabbits extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/events/Race/Race.java
index ff9fc462f6..6ac325ca6f 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/events/Race/Race.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/events/Race/Race.java
@@ -320,7 +320,7 @@ public class Race extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index e827184ae4..60da9f13d3 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -186,7 +186,7 @@ public class TvT extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index 53d917a5c7..a00de57ae5 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -44,7 +44,7 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/events/HappyHours/HappyHours.java
index e76af2108a..eb247dbbb3 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/events/HappyHours/HappyHours.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/events/HappyHours/HappyHours.java
@@ -49,7 +49,7 @@ public class HappyHours extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/events/LetterCollector/LetterCollector.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
index 9030e46d76..da0d972c5b 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
@@ -73,7 +73,7 @@ public class LetterCollector extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
index 762cde5596..245342a91e 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
@@ -45,7 +45,7 @@ public class ThePowerOfLove extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/events/TotalRecall/TotalRecall.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
index 4486ac5f36..a5448d4db5 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
@@ -42,7 +42,7 @@ public class TotalRecall extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
index 5de1a19cd2..3e745b3d08 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
@@ -354,7 +354,7 @@ public class WatermelonNinja extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java
index ff61dd4a39..f1a3a2df02 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java
@@ -87,7 +87,7 @@ public class MonsterArena extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java
index 79f364a54e..cf2473bc19 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java
@@ -84,7 +84,7 @@ public class Q00070_SagaOfThePhoenixKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java
index 1c5ee20575..703208bf2e 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java
@@ -85,7 +85,7 @@ public class Q00071_SagaOfEvasTemplar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java
index 91ba4811de..0808d1601b 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java
@@ -85,7 +85,7 @@ public class Q00072_SagaOfTheSwordMuse extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java
index 896f16438e..7e6fda1667 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java
@@ -85,7 +85,7 @@ public class Q00073_SagaOfTheDuelist extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java
index 1a98d4d200..fd0a03550d 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java
@@ -85,7 +85,7 @@ public class Q00074_SagaOfTheDreadnought extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java
index e5e6b39427..428c1caa43 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java
@@ -85,7 +85,7 @@ public class Q00075_SagaOfTheTitan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java
index a977722f62..ccfff282a0 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java
@@ -85,7 +85,7 @@ public class Q00076_SagaOfTheGrandKhavatari extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java
index 508438d67a..43f8ff9d78 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java
@@ -85,7 +85,7 @@ public class Q00077_SagaOfTheDominator extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java
index 75c3d73024..1ed3216c29 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java
@@ -85,7 +85,7 @@ public class Q00078_SagaOfTheDoomcryer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java
index 3df5908a15..8dc5a8c81a 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java
@@ -85,7 +85,7 @@ public class Q00079_SagaOfTheAdventurer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java
index 2074a51b96..c542de4c19 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java
@@ -85,7 +85,7 @@ public class Q00080_SagaOfTheWindRider extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java
index 67ca500398..73e5ca9f03 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java
@@ -85,7 +85,7 @@ public class Q00081_SagaOfTheGhostHunter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java
index 52f64dc817..b143f8b56b 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java
@@ -85,7 +85,7 @@ public class Q00082_SagaOfTheSagittarius extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java
index 2818994337..c7cb95b044 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java
@@ -85,7 +85,7 @@ public class Q00083_SagaOfTheMoonlightSentinel extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java
index 5c4722209e..39a2839627 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java
@@ -85,7 +85,7 @@ public class Q00084_SagaOfTheGhostSentinel extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java
index e32cc7ded0..f72865632a 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java
@@ -85,7 +85,7 @@ public class Q00085_SagaOfTheCardinal extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java
index c0b50b130e..4dd2385ff8 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java
@@ -85,7 +85,7 @@ public class Q00086_SagaOfTheHierophant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java
index 76719ec38e..1837ccacda 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java
@@ -85,7 +85,7 @@ public class Q00087_SagaOfEvasSaint extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java
index 4901af8961..e87a6913ce 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java
@@ -84,7 +84,7 @@ public class Q00088_SagaOfTheArchmage extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java
index cbf08d12cc..524e8dbdc1 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java
@@ -84,7 +84,7 @@ public class Q00089_SagaOfTheMysticMuse extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java
index 9b236936e0..26c9bb3dd4 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java
@@ -84,7 +84,7 @@ public class Q00090_SagaOfTheStormScreamer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java
index 751f487099..15c7611dc3 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java
@@ -85,7 +85,7 @@ public class Q00091_SagaOfTheArcanaLord extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java
index 6f98a643f7..337e3070d1 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java
@@ -84,7 +84,7 @@ public class Q00092_SagaOfTheElementalMaster extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java
index f77b67dd6a..61acb45c50 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java
@@ -84,7 +84,7 @@ public class Q00093_SagaOfTheSpectralMaster extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java
index 12d4bc28d6..24004acd96 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java
@@ -84,7 +84,7 @@ public class Q00094_SagaOfTheSoultaker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java
index a104ed14ed..6174d9f79d 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java
@@ -85,7 +85,7 @@ public class Q00095_SagaOfTheHellKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java
index 7c08220d8d..5deb250ad9 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java
@@ -84,7 +84,7 @@ public class Q00096_SagaOfTheSpectralDancer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java
index dee5c701e3..7f93f9bb4b 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java
@@ -84,7 +84,7 @@ public class Q00097_SagaOfTheShillienTemplar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java
index c21ebb5e13..7d89d5cabc 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java
@@ -85,7 +85,7 @@ public class Q00098_SagaOfTheShillienSaint extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java
index a63b4710c7..e9113ef4a7 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java
@@ -84,7 +84,7 @@ public class Q00099_SagaOfTheFortuneSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java
index 349f583104..8ec0ec7a61 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java
@@ -84,7 +84,7 @@ public class Q00100_SagaOfTheMaestro extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
index 24aa967f60..f348ed1ada 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
@@ -52,7 +52,7 @@ public class Q00127_FishingSpecialistsRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
index 6b7de9bd96..18b11d47ae 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
@@ -76,7 +76,7 @@ public class Q00211_TrialOfTheChallenger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
index efde71ba49..2e70c4f9b1 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
@@ -86,7 +86,7 @@ public class Q00212_TrialOfDuty extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
index a0f8f915b3..1f4f42c490 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
@@ -92,7 +92,7 @@ public class Q00213_TrialOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
index 94bba112f2..6dfacfa116 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
@@ -120,7 +120,7 @@ public class Q00214_TrialOfTheScholar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
index da0399c8ce..a555adb852 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
@@ -77,7 +77,7 @@ public class Q00215_TrialOfThePilgrim extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
index 05aade19d6..82ef5fe081 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
@@ -94,7 +94,7 @@ public class Q00216_TrialOfTheGuildsman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
index 32a88e353e..86edef3008 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
@@ -107,7 +107,7 @@ public class Q00217_TestimonyOfTrust extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
index a5d3455060..05ed9df156 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
@@ -104,7 +104,7 @@ public class Q00218_TestimonyOfLife extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
index 5e3eb02369..9eae62eb6e 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
@@ -107,7 +107,7 @@ public class Q00219_TestimonyOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
index 24d8bf39f4..e22e3a6c92 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
@@ -121,7 +121,7 @@ public class Q00220_TestimonyOfGlory extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
index a276b60f56..dff82abd5d 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
@@ -124,7 +124,7 @@ public class Q00221_TestimonyOfProsperity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
index 761bdeb64a..3f03f3e509 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
@@ -88,7 +88,7 @@ public class Q00222_TestOfTheDuelist extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
index bd794eef75..d0bbb73b4f 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
@@ -85,7 +85,7 @@ public class Q00223_TestOfTheChampion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
index 163aa900f4..346538dc45 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
@@ -94,7 +94,7 @@ public class Q00224_TestOfSagittarius extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
index ae9bb5fb4d..e7a6b7ef1a 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
@@ -91,7 +91,7 @@ public class Q00225_TestOfTheSearcher extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
index c3dc04f3f1..9d8e8a161d 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
@@ -81,7 +81,7 @@ public class Q00226_TestOfTheHealer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
index ba1fc6097e..dac23aac62 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
@@ -114,7 +114,7 @@ public class Q00227_TestOfTheReformer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("DESPAWN".equals(event))
 		{
@@ -127,7 +127,7 @@ public class Q00227_TestOfTheReformer extends Quest
 			{
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
index 6ca6b63f34..42f8db1e54 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
@@ -99,7 +99,7 @@ public class Q00228_TestOfMagus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
index 954c6b4142..706fc8fb29 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
@@ -115,7 +115,7 @@ public class Q00229_TestOfWitchcraft extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
index 2d810c2bb4..9e61822eca 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
@@ -163,7 +163,7 @@ public class Q00230_TestOfTheSummoner extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
index ea9ab4c98d..0b1696278f 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
@@ -81,7 +81,7 @@ public class Q00231_TestOfTheMaestro extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
index bdd4cb26b5..8aaeb13125 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
@@ -106,7 +106,7 @@ public class Q00232_TestOfTheLord extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
index a8f0d1a2a5..3c14c2ef63 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
@@ -106,7 +106,7 @@ public class Q00233_TestOfTheWarSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
index f41ac170e9..9c179c34ac 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
@@ -143,7 +143,7 @@ public class Q00255_Tutorial extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
index a98a9a317b..3f8ecbb375 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
@@ -88,7 +88,7 @@ public class Q00257_TheGuardIsBusy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
index ddd656d3ad..c19e69fd3d 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
@@ -66,7 +66,7 @@ public class Q00258_BringWolfPelts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30001-03.html"))
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
index 02efc29fd9..88ca56e754 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
@@ -70,7 +70,7 @@ public class Q00259_RequestFromTheFarmOwner extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
index 6e63d6faf4..e3e252ec97 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
@@ -63,7 +63,7 @@ public class Q00260_OrcHunting extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
index b68a525827..ff6e0e01fc 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
@@ -61,7 +61,7 @@ public class Q00261_CollectorsDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30222-03.htm"))
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
index 95721f08dc..29b898dc6d 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
@@ -59,7 +59,7 @@ public class Q00262_TradeWithTheIvoryTower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30137-03.htm"))
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
index 1bdeec4a83..950346cf59 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
@@ -61,7 +61,7 @@ public class Q00263_OrcSubjugation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
index 20ddbeac20..bd848ee2cf 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
@@ -68,7 +68,7 @@ public class Q00264_KeenClaws extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30136-03.htm"))
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
index d90ce43946..195dc0675d 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
@@ -58,7 +58,7 @@ public class Q00265_BondsOfSlavery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
index 68c5dd1cc3..87c949919f 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
@@ -72,7 +72,7 @@ public class Q00266_PleasOfPixies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("31852-04.htm"))
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
index aa676c5d46..5b26a51d59 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
@@ -50,7 +50,7 @@ public class Q00267_WrathOfVerdure extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
index b6c64f4db7..52a1ad5ec8 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
@@ -54,7 +54,7 @@ public class Q00271_ProofOfValor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30577-04.htm"))
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
index 0c0748e735..8fc6eb06c2 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
@@ -54,7 +54,7 @@ public class Q00272_WrathOfAncestors extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30572-04.htm"))
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
index b3f9d4bb1b..00afdb3a51 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
@@ -60,7 +60,7 @@ public class Q00273_InvadersOfTheHolyLand extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
index f45e185d3f..de06f688b3 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
@@ -57,7 +57,7 @@ public class Q00274_SkirmishWithTheWerewolves extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30569-04.htm"))
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
index 1e6a02f4f9..31e70fba32 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
@@ -59,7 +59,7 @@ public class Q00275_DarkWingedSpies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30567-03.htm"))
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
index 74935e9104..e8f904d1f6 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
@@ -74,7 +74,7 @@ public class Q00276_TotemOfTheHestui extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30571-03.htm"))
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
index 156b85fdf6..6b507503c3 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
@@ -51,7 +51,7 @@ public class Q00277_GatekeepersOffering extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30576-03.htm"))
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
index 8e245d375c..48ed318353 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
@@ -68,7 +68,7 @@ public class Q00292_BrigandsSweep extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
index 227398a92d..93d41b6c06 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
@@ -59,7 +59,7 @@ public class Q00293_TheHiddenVeins extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
index 554161d862..a56345d2f9 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
@@ -62,7 +62,7 @@ public class Q00294_CovertBusiness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && qs.isCreated() && event.equals("30534-03.htm"))
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
index 98daa7c06c..2e8d1c601d 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
@@ -51,7 +51,7 @@ public class Q00295_DreamingOfTheSkies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && qs.isCreated() && event.equals("30536-03.htm"))
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
index 4d1d5b1777..9dc8ba9904 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
@@ -56,7 +56,7 @@ public class Q00296_TarantulasSpiderSilk extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
index e0b5bc2986..099201eb88 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
@@ -52,7 +52,7 @@ public class Q00297_GatekeepersFavor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30540-03.htm"))
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
index a7c0756abb..24aef6ae0c 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
@@ -66,7 +66,7 @@ public class Q00300_HuntingLetoLizardman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
index 65317d4367..8960b5ee57 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
@@ -49,7 +49,7 @@ public class Q00303_CollectArrowheads extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30029-04.htm"))
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
index 20009b3457..e520a0cd92 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
@@ -65,7 +65,7 @@ public class Q00306_CrystalOfFireAndIce extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
index 69cbcdbf2a..a1eb4478d8 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
@@ -51,7 +51,7 @@ public class Q00313_CollectSpores extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
index fb42e610a9..5c4fe19392 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
@@ -70,7 +70,7 @@ public class Q00316_DestroyPlagueCarriers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
index 86a347b60b..b69fd606ea 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
@@ -52,7 +52,7 @@ public class Q00317_CatchTheWind extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
index e88feb95e2..fc8f958e8c 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
@@ -54,7 +54,7 @@ public class Q00319_ScentOfDeath extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
index 8fd327d6b5..49cc3a2f09 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
@@ -55,7 +55,7 @@ public class Q00320_BonesTellTheFuture extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30359-04.htm"))
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
index a97a566c92..03cf67028d 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
@@ -60,7 +60,7 @@ public class Q00324_SweetestVenom extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
index 233ae4efea..308b9d1e12 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
@@ -79,7 +79,7 @@ public class Q00325_GrimCollector extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
index dc3eb65ec4..2566d50918 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
@@ -69,7 +69,7 @@ public class Q00326_VanquishRemnants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
index 1956e2923e..99a18a2d23 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
@@ -105,7 +105,7 @@ public class Q00327_RecoverTheFarmland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
index 64cc6ef8e9..b8d1a39d6c 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
@@ -70,7 +70,7 @@ public class Q00328_SenseForBusiness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
index 72407eabc3..25eb32f4d0 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
@@ -62,7 +62,7 @@ public class Q00329_CuriosityOfADwarf extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
index 518d845bcc..dd71a57310 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
@@ -65,7 +65,7 @@ public class Q00331_ArrowOfVengeance extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
index 498b165be2..02f12606c7 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
@@ -121,7 +121,7 @@ public class Q00333_HuntOfTheBlackLion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		final int chance = getRandom(100);
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
index 5f664a5fed..1031fbb7fb 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
@@ -85,7 +85,7 @@ public class Q00344_1000YearsTheEndOfLamentation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java
index da8086521c..eb49b8dc51 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java
@@ -59,7 +59,7 @@ public class Q00348_AnArrogantSearch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
index fd775bbe73..bc785abac1 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
@@ -60,7 +60,7 @@ public class Q00354_ConquestOfAlligatorIsland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
index ee19b7e4ab..fbcd365dc3 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
@@ -87,7 +87,7 @@ public class Q00355_FamilyHonor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
index e1633226d2..c200224cfa 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
@@ -61,7 +61,7 @@ public class Q00356_DigUpTheSeaOfSpores extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
index aca7242c87..8b51394b23 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
@@ -68,7 +68,7 @@ public class Q00358_IllegitimateChildOfTheGoddess extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
index ed0f544adc..2407d92d0f 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
@@ -59,7 +59,7 @@ public class Q00360_PlunderTheirSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
index aaf517b7a9..e910c1e70e 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
@@ -68,7 +68,7 @@ public class Q00369_CollectorOfJewels extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
index d24b38b112..c6c223f5a1 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
@@ -70,7 +70,7 @@ public class Q00370_AnElderSowsSeeds extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java
index 26bbe0c26a..510e73c602 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java
@@ -58,7 +58,7 @@ public class Q00374_WhisperOfDreamsPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java
index 370ba1f6b8..f37a2720b9 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java
@@ -56,7 +56,7 @@ public class Q00375_WhisperOfDreamsPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
index 7773083c9a..c29c87b26d 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
@@ -65,7 +65,7 @@ public class Q00401_PathOfTheWarrior extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
index 73be798601..f90aa18585 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
@@ -90,7 +90,7 @@ public class Q00402_PathOfTheHumanKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
index bd13a4bbe9..9bd736acaa 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
@@ -93,7 +93,7 @@ public class Q00403_PathOfTheRogue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
index 4b0285fcef..ac44dd64d6 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
@@ -72,7 +72,7 @@ public class Q00404_PathOfTheHumanWizard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
index 455a88115a..b7ad34d507 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
@@ -68,7 +68,7 @@ public class Q00405_PathOfTheCleric extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
index 60a2100263..fcb92b0837 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
@@ -73,7 +73,7 @@ public class Q00406_PathOfTheElvenKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
index e8ae130e75..89dbb1cea4 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
@@ -67,7 +67,7 @@ public class Q00407_PathOfTheElvenScout extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
index e35ea8444b..86dd94df1f 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
@@ -70,7 +70,7 @@ public class Q00408_PathOfTheElvenWizard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
index 809b741536..1e788f366f 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
@@ -66,7 +66,7 @@ public class Q00409_PathOfTheElvenOracle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
index 261122d3ff..727d4148f0 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
@@ -62,7 +62,7 @@ public class Q00410_PathOfThePalusKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
index d0849cb9a0..b6bd1f946a 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
@@ -62,7 +62,7 @@ public class Q00411_PathOfTheAssassin extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
index a2a12199b7..fda1cd4beb 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
@@ -69,7 +69,7 @@ public class Q00412_PathOfTheDarkWizard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
index cf84a5a883..55897e0028 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
@@ -66,7 +66,7 @@ public class Q00413_PathOfTheShillienOracle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
index 9bd2adec48..34d1af1f9c 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
@@ -65,7 +65,7 @@ public class Q00414_PathOfTheOrcRaider extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
index 0d21264633..3b6f7f4fb5 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
@@ -90,7 +90,7 @@ public class Q00415_PathOfTheOrcMonk extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
index 6a0fb18a23..1b62cbad54 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
@@ -88,7 +88,7 @@ public class Q00416_PathOfTheOrcShaman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
index 2e9a9937b5..973de273fc 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
@@ -84,7 +84,7 @@ public class Q00417_PathOfTheScavenger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
index 23061e130c..43770b4eb1 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
@@ -66,7 +66,7 @@ public class Q00418_PathOfTheArtisan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
index 90fc91cb14..8a8d28689c 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
@@ -68,7 +68,7 @@ public class Q00500_BrothersBoundInChains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
index c6c6541b90..e40f43ea81 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
@@ -82,7 +82,7 @@ public class Q00662_AGameOfCards extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss.java
index 6b14892016..e986187f8e 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss.java
@@ -51,7 +51,7 @@ public class Q00933_ExploringTheWestWingOfTheDungeonOfAbyss extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss.java
index ba47f428b9..c8765f54cf 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss.java
@@ -51,7 +51,7 @@ public class Q00935_ExploringTheEastWingOfTheDungeonOfAbyss extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q10866_PunitiveOperationOnTheDevilIsle/Q10866_PunitiveOperationOnTheDevilIsle.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q10866_PunitiveOperationOnTheDevilIsle/Q10866_PunitiveOperationOnTheDevilIsle.java
index 236a65502b..fa4bf40711 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q10866_PunitiveOperationOnTheDevilIsle/Q10866_PunitiveOperationOnTheDevilIsle.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q10866_PunitiveOperationOnTheDevilIsle/Q10866_PunitiveOperationOnTheDevilIsle.java
@@ -52,7 +52,7 @@ public class Q10866_PunitiveOperationOnTheDevilIsle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q10993_FutureDwarves/Q10993_FutureDwarves.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q10993_FutureDwarves/Q10993_FutureDwarves.java
index b76c4327b3..221901dc1c 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q10993_FutureDwarves/Q10993_FutureDwarves.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q10993_FutureDwarves/Q10993_FutureDwarves.java
@@ -57,7 +57,7 @@ public class Q10993_FutureDwarves extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q10994_FutureOrcs/Q10994_FutureOrcs.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q10994_FutureOrcs/Q10994_FutureOrcs.java
index b2397d915a..d4d6479353 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q10994_FutureOrcs/Q10994_FutureOrcs.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q10994_FutureOrcs/Q10994_FutureOrcs.java
@@ -56,7 +56,7 @@ public class Q10994_FutureOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java
index 7c85f8822b..1c1dd0364d 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java
@@ -73,7 +73,7 @@ public class Q10995_MutualBenefit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java
index 16ce909551..631067b7a1 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java
@@ -71,7 +71,7 @@ public class Q10996_TemplesDecorations extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q10997_LoserPriest1/Q10997_LoserPriest1.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q10997_LoserPriest1/Q10997_LoserPriest1.java
index 2ed08fc50c..8e9a9c27ea 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q10997_LoserPriest1/Q10997_LoserPriest1.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q10997_LoserPriest1/Q10997_LoserPriest1.java
@@ -65,7 +65,7 @@ public class Q10997_LoserPriest1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java
index 5bf66e5740..f558135c8c 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java
@@ -67,7 +67,7 @@ public class Q10998_LoserPriest2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java
index 7a6abe643a..42f08ebc69 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java
@@ -70,7 +70,7 @@ public class Q10999_LoserPriest3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11000_MoonKnight/Q11000_MoonKnight.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11000_MoonKnight/Q11000_MoonKnight.java
index f5b2632cfc..990ed4ca8c 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11000_MoonKnight/Q11000_MoonKnight.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11000_MoonKnight/Q11000_MoonKnight.java
@@ -87,7 +87,7 @@ public class Q11000_MoonKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java
index d785928ae4..30433b7906 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java
@@ -71,7 +71,7 @@ public class Q11001_TombsOfAncestors extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java
index 8721acf2af..f91df843e3 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java
@@ -70,7 +70,7 @@ public class Q11002_HelpWithTempleRestoration extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java
index 129deca6dc..cdd446e816 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java
@@ -69,7 +69,7 @@ public class Q11003_PerfectLeatherArmor1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java
index cb6a7a0ee9..da42f6b60d 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java
@@ -71,7 +71,7 @@ public class Q11004_PerfectLeatherArmor2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java
index 405848b6c2..d7a0f220be 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java
@@ -71,7 +71,7 @@ public class Q11005_PerfectLeatherArmor3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11006_FuturePeople/Q11006_FuturePeople.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11006_FuturePeople/Q11006_FuturePeople.java
index 4c017c9982..86f13b4fa2 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11006_FuturePeople/Q11006_FuturePeople.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11006_FuturePeople/Q11006_FuturePeople.java
@@ -61,7 +61,7 @@ public class Q11006_FuturePeople extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java
index eb48ad1fa4..49c35c4534 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java
@@ -71,7 +71,7 @@ public class Q11007_NoiseInWoods extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java
index 6234d1f496..502b9b9d24 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java
@@ -72,7 +72,7 @@ public class Q11008_PreparationForDungeon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java
index 5efbb08add..93e5cd7383 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java
@@ -66,7 +66,7 @@ public class Q11009_NewPotionDevelopment1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java
index 6fc7075973..5aa513eabc 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java
@@ -68,7 +68,7 @@ public class Q11010_NewPotionDevelopment2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java
index f2e64bdfe7..e71754ecd3 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java
@@ -67,7 +67,7 @@ public class Q11011_NewPotionDevelopment3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11012_FutureElves/Q11012_FutureElves.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11012_FutureElves/Q11012_FutureElves.java
index ab957c6430..a771e855d2 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11012_FutureElves/Q11012_FutureElves.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11012_FutureElves/Q11012_FutureElves.java
@@ -57,7 +57,7 @@ public class Q11012_FutureElves extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java
index 59082963ba..abdcd1da60 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java
@@ -73,7 +73,7 @@ public class Q11013_ShilensHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java
index 1f376d04a6..41a4c1e0ee 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java
@@ -72,7 +72,7 @@ public class Q11014_SurpriseGift extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java
index 8ea5b69558..a3772b0f31 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java
@@ -69,7 +69,7 @@ public class Q11015_PrepareForTrade1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java
index 911eaff20a..f194ab0ffe 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java
@@ -71,7 +71,7 @@ public class Q11016_PrepareForTrade2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java
index 48c8a15d51..911a806b55 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java
@@ -71,7 +71,7 @@ public class Q11017_PrepareForTrade3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11018_FutureDarkElves/Q11018_FutureDarkElves.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11018_FutureDarkElves/Q11018_FutureDarkElves.java
index d6c98287af..1fb7ef5309 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11018_FutureDarkElves/Q11018_FutureDarkElves.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11018_FutureDarkElves/Q11018_FutureDarkElves.java
@@ -59,7 +59,7 @@ public class Q11018_FutureDarkElves extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java
index dcc694115b..5c9f57e024 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java
@@ -72,7 +72,7 @@ public class Q11019_TribalBenefit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java
index 8209d11d8d..432afa42b1 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java
@@ -69,7 +69,7 @@ public class Q11020_BlacksmithsRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java
index 200ca15bb5..62766dbf94 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java
@@ -67,7 +67,7 @@ public class Q11021_RedGemNecklace1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java
index 1e5796e1d0..8f5191d574 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java
@@ -69,7 +69,7 @@ public class Q11022_RedGemNecklace2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java
index 53d77fa2e6..5c6641ea5e 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java
@@ -67,7 +67,7 @@ public class Q11023_RedGemNecklace3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
index 06ea44ceb1..6698687a4e 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
@@ -45,7 +45,7 @@ public class AllianceMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!"9001-01.htm".equals(event) && (player.getClan() == null))
 		{
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
index b69c69d8d0..b9cae10d1b 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
@@ -74,7 +74,7 @@ public class ClanMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LEADER_REQUIRED.containsKey(event) && !player.isClanLeader())
 		{
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
index 472b265d19..7560171dd1 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
@@ -61,7 +61,7 @@ public class DarkElfChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
index 1eef46c033..073a93bdae 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
@@ -73,7 +73,7 @@ public class DarkElfChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
index b90395d96a..fe46f96453 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
@@ -50,7 +50,7 @@ public class DwarfBlacksmithChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
index c00f750f8f..7471a928e7 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
@@ -54,7 +54,7 @@ public class DwarfBlacksmithChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
index 187710070c..df7368de42 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
@@ -50,7 +50,7 @@ public class DwarfWarehouseChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
index bcd1325051..e18b5c69e4 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
@@ -54,7 +54,7 @@ public class DwarfWarehouseChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
index 683c50e475..a9da2dffa6 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
@@ -57,7 +57,7 @@ public class ElfHumanClericChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
index c0cf3513d7..eff155a55f 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
@@ -59,7 +59,7 @@ public class ElfHumanFighterChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
index 58bb620a4f..5ab836930b 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
@@ -72,7 +72,7 @@ public class ElfHumanFighterChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
index ed623b52b0..c5b843fdc1 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
@@ -57,7 +57,7 @@ public class ElfHumanWizardChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
index 2b882feda7..7343a5f35c 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
@@ -61,7 +61,7 @@ public class ElfHumanWizardChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
index acf6f9bc2f..1a231cd5d9 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
@@ -53,7 +53,7 @@ public class FirstClassTransferTalk extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return event;
 	}
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
index e3c48b1f33..324f48a504 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
@@ -51,7 +51,7 @@ public class OrcChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
index d055e1ab84..c1808b3396 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
@@ -61,7 +61,7 @@ public class OrcChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/quest/Quest.java
index f343e5d8e9..252c508537 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/quest/Quest.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/quest/Quest.java
@@ -245,7 +245,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -267,7 +267,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -558,7 +558,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 			{
 				player.setSimulatedTalking(false);
 			}
-			res = onAdvEvent(event, npc, player);
+			res = onEvent(event, npc, player);
 		}
 		catch (Exception e)
 		{
@@ -1020,12 +1020,11 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 */
 	public String onDeath(Creature killer, Creature victim, QuestState qs)
 	{
-		return onAdvEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
+		return onEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
 	}
 	
 	/**
 	 * This function is called whenever a player clicks on a link in a quest dialog and whenever a timer fires.<br>
-	 * If is not overridden by a subclass, then default to the returned value of the simpler (and older) {@link #onEvent(String, QuestState)} override.<br>
 	 * If the player has a quest state, use it as parameter in the next call, otherwise return null.
 	 * @param event this parameter contains a string identifier for the event.<br>
 	 *            Generally, this string is passed directly via the link.<br>
@@ -1044,35 +1043,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 *            This parameter may be {@code null} in certain circumstances.
 	 * @return the text returned by the event (may be {@code null}, a filename or just text)
 	 */
-	public String onAdvEvent(String event, Npc npc, Player player)
-	{
-		if (player != null)
-		{
-			final QuestState qs = player.getQuestState(getName());
-			if (qs != null)
-			{
-				return onEvent(event, qs);
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * This function is called in place of {@link #onAdvEvent(String, Npc, Player)} if the former is not implemented.<br>
-	 * If a script contains both {@link #onAdvEvent(String, Npc, Player)} and this implementation, then this method will never be called unless the script's {@link #onAdvEvent(String, Npc, Player)} explicitly calls this method.
-	 * @param event this parameter contains a string identifier for the event.<br>
-	 *            Generally, this string is passed directly via the link.<br>
-	 *            For example:<br>
-	 *            <code>
-	 *            &lt;a action="bypass -h Quest 626_ADarkTwilight 31517-01.htm"&gt;hello&lt;/a&gt;
-	 *            </code><br>
-	 *            The above link sets the event variable to "31517-01.htm" for the quest 626_ADarkTwilight.<br>
-	 *            In the case of timers, this will be the name of the timer.<br>
-	 *            This parameter serves as a sort of identifier.
-	 * @param qs this parameter contains a reference to the quest state of the player who used the link or started the timer.
-	 * @return the text returned by the event (may be {@code null}, a filename or just text)
-	 */
-	public String onEvent(String event, QuestState qs)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return null;
 	}
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java
index 3817e1be30..db707fe326 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java
@@ -49,7 +49,7 @@ public class Fellow extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/DungeonOfAbyss/DungeonOfAbyssZone.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/DungeonOfAbyss/DungeonOfAbyssZone.java
index 439e3d440e..440119f080 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/DungeonOfAbyss/DungeonOfAbyssZone.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/DungeonOfAbyss/DungeonOfAbyssZone.java
@@ -53,7 +53,7 @@ public class DungeonOfAbyssZone extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("EXIT_PLAYER") && (player != null))
 		{
@@ -90,7 +90,7 @@ public class DungeonOfAbyssZone extends AbstractNpcAI
 				player.teleToLocation(EXIT_LOCATION_4);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Ingrit.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Ingrit.java
index 8d6242081a..34a9393fad 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Ingrit.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Ingrit.java
@@ -59,7 +59,7 @@ public class Ingrit extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc.getId() == SOUL_TRACKER_INRGIT)
 		{
@@ -99,7 +99,7 @@ public class Ingrit extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Iris.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Iris.java
index 6077a611dd..78c008e99d 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Iris.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Iris.java
@@ -59,7 +59,7 @@ public class Iris extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc.getId() == SOUL_TRACKER_IRIS)
 		{
@@ -99,7 +99,7 @@ public class Iris extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Magrit.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Magrit.java
index 420cffb53a..e69b4d1f47 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Magrit.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Magrit.java
@@ -59,7 +59,7 @@ public class Magrit extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc.getId() == SOUL_TRACKER_MARGIT)
 		{
@@ -99,7 +99,7 @@ public class Magrit extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Rosammy.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Rosammy.java
index e2dadf67e9..0d0b09c0c7 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Rosammy.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Rosammy.java
@@ -59,7 +59,7 @@ public class Rosammy extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc.getId() == SOUL_TRACKER_ROSAMMY)
 		{
@@ -99,7 +99,7 @@ public class Rosammy extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/DungeonOfAbyss/Tores/Tores.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/DungeonOfAbyss/Tores/Tores.java
index ab4f6e34c2..cabb6b15c7 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/DungeonOfAbyss/Tores/Tores.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/DungeonOfAbyss/Tores/Tores.java
@@ -55,7 +55,7 @@ public class Tores extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -86,7 +86,7 @@ public class Tores extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
index a26e6075fd..31fc2ba199 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
@@ -43,12 +43,12 @@ public class Toma extends AbstractNpcAI
 	private Toma()
 	{
 		addFirstTalkId(TOMA);
-		onAdvEvent("RESPAWN_TOMA", null, null);
+		onEvent("RESPAWN_TOMA", null, null);
 		startQuestTimer("RESPAWN_TOMA", TELEPORT_DELAY, null, null, true);
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("RESPAWN_TOMA"))
 		{
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
index 6f8858a2a4..dd735beeaa 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
@@ -41,7 +41,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -54,7 +54,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 				npc.deleteMe();
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_DAY_NIGHT_CHANGE)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
index 76379f11ef..9e3b09ef23 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
@@ -38,14 +38,14 @@ public class Roxxy extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TEXT_SPAM") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SPEAK_WITH_ME_ABOUT_TRAVELING_AROUND_ADEN, 1000);
 			startQuestTimer("TEXT_SPAM", getRandom(10000, 30000), npc, null, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
index 143e9f48cd..158b1a72e0 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
@@ -49,7 +49,7 @@ public class Arushinai extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("30401-1.htm") || event.equals("30401-2.htm"))
 		{
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java
index d918a2bfc3..801a77996a 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java
@@ -49,7 +49,7 @@ public class Ateld extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
index 6ee6719c50..ec7aecde57 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
@@ -47,7 +47,7 @@ public class DimensionalVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("30952-1.htm") || event.equals("30952-2.htm") || event.equals("30952-3.htm"))
 		{
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index d236e19d43..a5157acfc7 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -193,7 +193,7 @@ public class Antharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -605,7 +605,7 @@ public class Antharas extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 4a01a9e786..b5610ec889 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -164,7 +164,7 @@ public class Baium extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -478,7 +478,7 @@ public class Baium extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/bosses/Core/Core.java
index 71150c1323..b9dcb38092 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -142,7 +142,7 @@ public class Core extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
@@ -161,7 +161,7 @@ public class Core extends AbstractNpcAI
 			_minions.forEach(Attackable::decayMe);
 			_minions.clear();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/bosses/LimitBarrier.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/bosses/LimitBarrier.java
index 6e05c44075..b0aa4223de 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/bosses/LimitBarrier.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/bosses/LimitBarrier.java
@@ -150,7 +150,7 @@ public class LimitBarrier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -179,7 +179,7 @@ public class LimitBarrier extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index c263b212f3..b2d3b91356 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -180,7 +180,7 @@ public class Orfen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -263,7 +263,7 @@ public class Orfen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 93735c996b..72e174bb65 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -155,7 +155,7 @@ public class QueenAnt extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -239,7 +239,7 @@ public class QueenAnt extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java
index 51bd8a03e0..daa7e95811 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java
@@ -76,7 +76,7 @@ public class SevenSignsRBs extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
index c26bb52f9c..31de5b2324 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
@@ -70,13 +70,13 @@ public class Zaken extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("zaken_unlock"))
 		{
 			spawnBoss();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private void spawnBoss()
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index 04fed5ab1b..b95d115b2c 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -59,7 +59,7 @@ public class ArenaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -124,7 +124,7 @@ public class ArenaManager extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java
index c65d275482..7a1750b82f 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java
@@ -44,7 +44,7 @@ public class AttributeMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("learn".equalsIgnoreCase(event))
 		{
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
index b07792cd2d..11b8786523 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
@@ -57,7 +57,7 @@ public class CastleBlacksmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return (event.equalsIgnoreCase(npc.getId() + "-02.html") && hasRights(player, npc)) ? event : null;
 	}
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
index bb01178f53..0a2d84b789 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
@@ -393,7 +393,7 @@ public class CastleChamberlain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Castle castle = npc.getCastle();
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
index b9c1f3faf5..70bae86615 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
@@ -72,7 +72,7 @@ public class CastleDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
index bb32dde319..a319e3977f 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
@@ -56,7 +56,7 @@ public class CastleMercenaryManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index a2bf4617a1..06a742f8c8 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -78,7 +78,7 @@ public class CastleTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
@@ -168,7 +168,7 @@ public class CastleTeleporter extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
index bffed40bcc..ea1b40c41c 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
@@ -52,7 +52,7 @@ public class CastleWarehouse extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final boolean isMyLord = player.isClanLeader() && (player.getClan().getCastleId() == (npc.getCastle() != null ? npc.getCastle().getResidenceId() : -1));
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index 62d432cf52..c04c4e5ab1 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -64,7 +64,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
index a86581206e..afd7250ca4 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
@@ -57,7 +57,7 @@ public class ClanHallDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 490a87012a..c43403fae7 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -98,7 +98,7 @@ public class ClanHallManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index fbf06e9737..7b6a27fc36 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -235,7 +235,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		if (!_isEnabled)
 		{
@@ -902,7 +902,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	{
 		if (event.getCommand().startsWith("Quest ClassMaster "))
 		{
-			final String html = onAdvEvent(event.getCommand().substring(18), null, event.getPlayer());
+			final String html = onEvent(event.getCommand().substring(18), null, event.getPlayer());
 			event.getPlayer().sendPacket(TutorialCloseHtml.STATIC_PACKET);
 			showResult(event.getPlayer(), html);
 		}
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/DivineBeast.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/DivineBeast.java
index 1f247a7b35..3f3a076992 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/DivineBeast.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/DivineBeast.java
@@ -44,7 +44,7 @@ public class DivineBeast extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player == null) || !player.hasServitors())
 		{
@@ -55,7 +55,7 @@ public class DivineBeast extends AbstractNpcAI
 			cancelQuestTimer(event, npc, player);
 			player.getServitors().values().forEach(summon -> summon.unSummon(player));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
index bbff4608fc..8812882c93 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
@@ -69,7 +69,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
index 7d1abb4769..187fbae9dd 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
@@ -56,7 +56,7 @@ public class NewbieGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("0"))
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
index acc83d72d8..27ab7e4f74 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
@@ -69,7 +69,7 @@ public class OlyBuffer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.startsWith("giveBuff;") && (npc.getScriptValue() < 5))
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index 201f3843ba..f08fb759ac 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -70,7 +70,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
index 21d281c6c9..435f293345 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
@@ -84,7 +84,7 @@ public class Proclaimer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("giveBuff"))
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
index ea0a8a16da..1fc1737173 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
@@ -79,7 +79,7 @@ public class ProvisionalHalls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/RandomWalkingGuards.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
index 8138dee3ee..ffe4fd87f1 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
@@ -48,7 +48,7 @@ public class RandomWalkingGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("RANDOM_WALK") && (npc != null))
 		{
@@ -59,7 +59,7 @@ public class RandomWalkingGuards extends AbstractNpcAI
 			}
 			startQuestTimer("RANDOM_WALK", getRandom(MIN_WALK_DELAY, MAX_WALK_DELAY), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/Servitors/SinEater.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/Servitors/SinEater.java
index 1ed8d645a5..d7536614e8 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/Servitors/SinEater.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/Servitors/SinEater.java
@@ -48,7 +48,7 @@ public class SinEater extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TALK") && (player != null) && (player.getPet() != null))
 		{
@@ -79,7 +79,7 @@ public class SinEater extends AbstractNpcAI
 			}
 			startQuestTimer("TALK", 60000, null, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_CREATURE_DEATH)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
index 59d7caa30e..30731ac83e 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
@@ -51,7 +51,7 @@ public class SymbolMaker extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
index 04d4672c76..b595c4d6d4 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
@@ -86,7 +86,7 @@ public class ToIVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int npcId = npc.getId();
 		
@@ -132,7 +132,7 @@ public class ToIVortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index 356236cfc7..bf5b0506dc 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -188,7 +188,7 @@ public class WyvernManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
index 0c2e7586c9..c49be5297b 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
@@ -36,7 +36,7 @@ public class DelevelManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.DELEVEL_MANAGER_ENABLED)
 		{
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
index ff6d40ec0e..4713803f1d 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
@@ -54,7 +54,7 @@ public class FactionSystem extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class FactionSystem extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
index 8b9c676ad5..771c8a9058 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
@@ -34,7 +34,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -77,7 +77,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 				npc.broadcastInfo(); // update flag status
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
index 669fcfc85c..ddf7e923eb 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
@@ -39,7 +39,7 @@ public class NoblessMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.NOBLESS_MASTER_ENABLED)
 		{
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
index 4f0f0c988a..5ba22124c1 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
@@ -215,7 +215,7 @@ public class NpcLocationInfo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (Util.isDigit(event))
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
index 8e1f84c102..3a9b5b4bdc 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
@@ -169,7 +169,7 @@ public class Deathmatch extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
index 1eb84eca93..b92bbe7f77 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
@@ -213,7 +213,7 @@ public class Rabbits extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/events/Race/Race.java
index ff9fc462f6..6ac325ca6f 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/events/Race/Race.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/events/Race/Race.java
@@ -320,7 +320,7 @@ public class Race extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index e827184ae4..60da9f13d3 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -186,7 +186,7 @@ public class TvT extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index 53d917a5c7..a00de57ae5 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -44,7 +44,7 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/events/HappyHours/HappyHours.java
index e76af2108a..eb247dbbb3 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/events/HappyHours/HappyHours.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/events/HappyHours/HappyHours.java
@@ -49,7 +49,7 @@ public class HappyHours extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/events/LetterCollector/LetterCollector.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
index 9030e46d76..da0d972c5b 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
@@ -73,7 +73,7 @@ public class LetterCollector extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
index 762cde5596..245342a91e 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
@@ -45,7 +45,7 @@ public class ThePowerOfLove extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/events/TotalRecall/TotalRecall.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
index 4486ac5f36..a5448d4db5 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
@@ -42,7 +42,7 @@ public class TotalRecall extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
index 5de1a19cd2..3e745b3d08 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
@@ -354,7 +354,7 @@ public class WatermelonNinja extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java
index ff61dd4a39..f1a3a2df02 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java
@@ -87,7 +87,7 @@ public class MonsterArena extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/instances/ResidenceOfKingIgnis/ResidenceOfKingIgnis.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/instances/ResidenceOfKingIgnis/ResidenceOfKingIgnis.java
index e751cffbb9..aa4b1b8ebe 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/instances/ResidenceOfKingIgnis/ResidenceOfKingIgnis.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/instances/ResidenceOfKingIgnis/ResidenceOfKingIgnis.java
@@ -70,7 +70,7 @@ public class ResidenceOfKingIgnis extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/instances/ResidenceOfKingPetram/ResidenceOfKingPetram.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/instances/ResidenceOfKingPetram/ResidenceOfKingPetram.java
index df955bf126..9fc1dfcd13 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/instances/ResidenceOfKingPetram/ResidenceOfKingPetram.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/instances/ResidenceOfKingPetram/ResidenceOfKingPetram.java
@@ -55,7 +55,7 @@ public class ResidenceOfKingPetram extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/instances/ResidenceOfKingProcella/ResidenceOfKingProcella.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/instances/ResidenceOfKingProcella/ResidenceOfKingProcella.java
index 43a715ab2e..08d2de3463 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/instances/ResidenceOfKingProcella/ResidenceOfKingProcella.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/instances/ResidenceOfKingProcella/ResidenceOfKingProcella.java
@@ -55,7 +55,7 @@ public class ResidenceOfKingProcella extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/instances/ResidenceOfQueenNebula/ResidenceOfQueenNebula.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/instances/ResidenceOfQueenNebula/ResidenceOfQueenNebula.java
index 0e53cd55e0..401dfac407 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/instances/ResidenceOfQueenNebula/ResidenceOfQueenNebula.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/instances/ResidenceOfQueenNebula/ResidenceOfQueenNebula.java
@@ -62,7 +62,7 @@ public class ResidenceOfQueenNebula extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java
index 79f364a54e..cf2473bc19 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java
@@ -84,7 +84,7 @@ public class Q00070_SagaOfThePhoenixKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java
index 1c5ee20575..703208bf2e 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java
@@ -85,7 +85,7 @@ public class Q00071_SagaOfEvasTemplar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java
index 91ba4811de..0808d1601b 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java
@@ -85,7 +85,7 @@ public class Q00072_SagaOfTheSwordMuse extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java
index 896f16438e..7e6fda1667 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java
@@ -85,7 +85,7 @@ public class Q00073_SagaOfTheDuelist extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java
index 1a98d4d200..fd0a03550d 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java
@@ -85,7 +85,7 @@ public class Q00074_SagaOfTheDreadnought extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java
index e5e6b39427..428c1caa43 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java
@@ -85,7 +85,7 @@ public class Q00075_SagaOfTheTitan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java
index a977722f62..ccfff282a0 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java
@@ -85,7 +85,7 @@ public class Q00076_SagaOfTheGrandKhavatari extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java
index 508438d67a..43f8ff9d78 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java
@@ -85,7 +85,7 @@ public class Q00077_SagaOfTheDominator extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java
index 75c3d73024..1ed3216c29 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java
@@ -85,7 +85,7 @@ public class Q00078_SagaOfTheDoomcryer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java
index 3df5908a15..8dc5a8c81a 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java
@@ -85,7 +85,7 @@ public class Q00079_SagaOfTheAdventurer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java
index 2074a51b96..c542de4c19 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java
@@ -85,7 +85,7 @@ public class Q00080_SagaOfTheWindRider extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java
index 67ca500398..73e5ca9f03 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java
@@ -85,7 +85,7 @@ public class Q00081_SagaOfTheGhostHunter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java
index 52f64dc817..b143f8b56b 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java
@@ -85,7 +85,7 @@ public class Q00082_SagaOfTheSagittarius extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java
index 2818994337..c7cb95b044 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java
@@ -85,7 +85,7 @@ public class Q00083_SagaOfTheMoonlightSentinel extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java
index 5c4722209e..39a2839627 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java
@@ -85,7 +85,7 @@ public class Q00084_SagaOfTheGhostSentinel extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java
index e32cc7ded0..f72865632a 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java
@@ -85,7 +85,7 @@ public class Q00085_SagaOfTheCardinal extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java
index c0b50b130e..4dd2385ff8 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java
@@ -85,7 +85,7 @@ public class Q00086_SagaOfTheHierophant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java
index 76719ec38e..1837ccacda 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java
@@ -85,7 +85,7 @@ public class Q00087_SagaOfEvasSaint extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java
index 4901af8961..e87a6913ce 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java
@@ -84,7 +84,7 @@ public class Q00088_SagaOfTheArchmage extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java
index cbf08d12cc..524e8dbdc1 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java
@@ -84,7 +84,7 @@ public class Q00089_SagaOfTheMysticMuse extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java
index 9b236936e0..26c9bb3dd4 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java
@@ -84,7 +84,7 @@ public class Q00090_SagaOfTheStormScreamer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java
index 751f487099..15c7611dc3 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java
@@ -85,7 +85,7 @@ public class Q00091_SagaOfTheArcanaLord extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java
index 6f98a643f7..337e3070d1 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java
@@ -84,7 +84,7 @@ public class Q00092_SagaOfTheElementalMaster extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java
index f77b67dd6a..61acb45c50 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java
@@ -84,7 +84,7 @@ public class Q00093_SagaOfTheSpectralMaster extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java
index 12d4bc28d6..24004acd96 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java
@@ -84,7 +84,7 @@ public class Q00094_SagaOfTheSoultaker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java
index a104ed14ed..6174d9f79d 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java
@@ -85,7 +85,7 @@ public class Q00095_SagaOfTheHellKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java
index 7c08220d8d..5deb250ad9 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java
@@ -84,7 +84,7 @@ public class Q00096_SagaOfTheSpectralDancer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java
index dee5c701e3..7f93f9bb4b 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java
@@ -84,7 +84,7 @@ public class Q00097_SagaOfTheShillienTemplar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java
index c21ebb5e13..7d89d5cabc 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java
@@ -85,7 +85,7 @@ public class Q00098_SagaOfTheShillienSaint extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java
index a63b4710c7..e9113ef4a7 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java
@@ -84,7 +84,7 @@ public class Q00099_SagaOfTheFortuneSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java
index 349f583104..8ec0ec7a61 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java
@@ -84,7 +84,7 @@ public class Q00100_SagaOfTheMaestro extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
index 24aa967f60..f348ed1ada 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
@@ -52,7 +52,7 @@ public class Q00127_FishingSpecialistsRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
index 6b7de9bd96..18b11d47ae 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
@@ -76,7 +76,7 @@ public class Q00211_TrialOfTheChallenger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
index efde71ba49..2e70c4f9b1 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
@@ -86,7 +86,7 @@ public class Q00212_TrialOfDuty extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
index a0f8f915b3..1f4f42c490 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
@@ -92,7 +92,7 @@ public class Q00213_TrialOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
index 94bba112f2..6dfacfa116 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
@@ -120,7 +120,7 @@ public class Q00214_TrialOfTheScholar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
index da0399c8ce..a555adb852 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
@@ -77,7 +77,7 @@ public class Q00215_TrialOfThePilgrim extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
index 05aade19d6..82ef5fe081 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
@@ -94,7 +94,7 @@ public class Q00216_TrialOfTheGuildsman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
index 32a88e353e..86edef3008 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
@@ -107,7 +107,7 @@ public class Q00217_TestimonyOfTrust extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
index a5d3455060..05ed9df156 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
@@ -104,7 +104,7 @@ public class Q00218_TestimonyOfLife extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
index 5e3eb02369..9eae62eb6e 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
@@ -107,7 +107,7 @@ public class Q00219_TestimonyOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
index 24d8bf39f4..e22e3a6c92 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
@@ -121,7 +121,7 @@ public class Q00220_TestimonyOfGlory extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
index a276b60f56..dff82abd5d 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
@@ -124,7 +124,7 @@ public class Q00221_TestimonyOfProsperity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
index 761bdeb64a..3f03f3e509 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
@@ -88,7 +88,7 @@ public class Q00222_TestOfTheDuelist extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
index bd794eef75..d0bbb73b4f 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
@@ -85,7 +85,7 @@ public class Q00223_TestOfTheChampion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
index 163aa900f4..346538dc45 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
@@ -94,7 +94,7 @@ public class Q00224_TestOfSagittarius extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
index ae9bb5fb4d..e7a6b7ef1a 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
@@ -91,7 +91,7 @@ public class Q00225_TestOfTheSearcher extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
index c3dc04f3f1..9d8e8a161d 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
@@ -81,7 +81,7 @@ public class Q00226_TestOfTheHealer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
index ba1fc6097e..dac23aac62 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
@@ -114,7 +114,7 @@ public class Q00227_TestOfTheReformer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("DESPAWN".equals(event))
 		{
@@ -127,7 +127,7 @@ public class Q00227_TestOfTheReformer extends Quest
 			{
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
index 6ca6b63f34..42f8db1e54 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
@@ -99,7 +99,7 @@ public class Q00228_TestOfMagus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
index 954c6b4142..706fc8fb29 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
@@ -115,7 +115,7 @@ public class Q00229_TestOfWitchcraft extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
index 2d810c2bb4..9e61822eca 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
@@ -163,7 +163,7 @@ public class Q00230_TestOfTheSummoner extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
index ea9ab4c98d..0b1696278f 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
@@ -81,7 +81,7 @@ public class Q00231_TestOfTheMaestro extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
index bdd4cb26b5..8aaeb13125 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
@@ -106,7 +106,7 @@ public class Q00232_TestOfTheLord extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
index a8f0d1a2a5..3c14c2ef63 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
@@ -106,7 +106,7 @@ public class Q00233_TestOfTheWarSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
index f41ac170e9..9c179c34ac 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
@@ -143,7 +143,7 @@ public class Q00255_Tutorial extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
index a98a9a317b..3f8ecbb375 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
@@ -88,7 +88,7 @@ public class Q00257_TheGuardIsBusy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
index ddd656d3ad..c19e69fd3d 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
@@ -66,7 +66,7 @@ public class Q00258_BringWolfPelts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30001-03.html"))
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
index 02efc29fd9..88ca56e754 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
@@ -70,7 +70,7 @@ public class Q00259_RequestFromTheFarmOwner extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
index 6e63d6faf4..e3e252ec97 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
@@ -63,7 +63,7 @@ public class Q00260_OrcHunting extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
index b68a525827..ff6e0e01fc 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
@@ -61,7 +61,7 @@ public class Q00261_CollectorsDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30222-03.htm"))
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
index 66e0e4e4c4..f82992431c 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
@@ -59,7 +59,7 @@ public class Q00262_TradeWithTheIvoryTower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30137-03.htm"))
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
index 1bdeec4a83..950346cf59 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
@@ -61,7 +61,7 @@ public class Q00263_OrcSubjugation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
index 20ddbeac20..bd848ee2cf 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
@@ -68,7 +68,7 @@ public class Q00264_KeenClaws extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30136-03.htm"))
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
index d90ce43946..195dc0675d 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
@@ -58,7 +58,7 @@ public class Q00265_BondsOfSlavery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
index 68c5dd1cc3..87c949919f 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
@@ -72,7 +72,7 @@ public class Q00266_PleasOfPixies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("31852-04.htm"))
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
index aa676c5d46..5b26a51d59 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
@@ -50,7 +50,7 @@ public class Q00267_WrathOfVerdure extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
index b6c64f4db7..52a1ad5ec8 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
@@ -54,7 +54,7 @@ public class Q00271_ProofOfValor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30577-04.htm"))
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
index 0c0748e735..8fc6eb06c2 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
@@ -54,7 +54,7 @@ public class Q00272_WrathOfAncestors extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30572-04.htm"))
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
index b3f9d4bb1b..00afdb3a51 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
@@ -60,7 +60,7 @@ public class Q00273_InvadersOfTheHolyLand extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
index f45e185d3f..de06f688b3 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
@@ -57,7 +57,7 @@ public class Q00274_SkirmishWithTheWerewolves extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30569-04.htm"))
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
index 1e6a02f4f9..31e70fba32 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
@@ -59,7 +59,7 @@ public class Q00275_DarkWingedSpies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30567-03.htm"))
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
index 74935e9104..e8f904d1f6 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
@@ -74,7 +74,7 @@ public class Q00276_TotemOfTheHestui extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30571-03.htm"))
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
index 156b85fdf6..6b507503c3 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
@@ -51,7 +51,7 @@ public class Q00277_GatekeepersOffering extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30576-03.htm"))
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
index 8e245d375c..48ed318353 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
@@ -68,7 +68,7 @@ public class Q00292_BrigandsSweep extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
index 227398a92d..93d41b6c06 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
@@ -59,7 +59,7 @@ public class Q00293_TheHiddenVeins extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
index 554161d862..a56345d2f9 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
@@ -62,7 +62,7 @@ public class Q00294_CovertBusiness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && qs.isCreated() && event.equals("30534-03.htm"))
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
index 98daa7c06c..2e8d1c601d 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
@@ -51,7 +51,7 @@ public class Q00295_DreamingOfTheSkies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && qs.isCreated() && event.equals("30536-03.htm"))
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
index 4d1d5b1777..9dc8ba9904 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
@@ -56,7 +56,7 @@ public class Q00296_TarantulasSpiderSilk extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
index e0b5bc2986..099201eb88 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
@@ -52,7 +52,7 @@ public class Q00297_GatekeepersFavor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30540-03.htm"))
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
index a7c0756abb..24aef6ae0c 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
@@ -66,7 +66,7 @@ public class Q00300_HuntingLetoLizardman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
index 65317d4367..8960b5ee57 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
@@ -49,7 +49,7 @@ public class Q00303_CollectArrowheads extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30029-04.htm"))
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
index 20009b3457..e520a0cd92 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
@@ -65,7 +65,7 @@ public class Q00306_CrystalOfFireAndIce extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
index 69cbcdbf2a..a1eb4478d8 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
@@ -51,7 +51,7 @@ public class Q00313_CollectSpores extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
index fb42e610a9..5c4fe19392 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
@@ -70,7 +70,7 @@ public class Q00316_DestroyPlagueCarriers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
index 86a347b60b..b69fd606ea 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
@@ -52,7 +52,7 @@ public class Q00317_CatchTheWind extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
index e88feb95e2..fc8f958e8c 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
@@ -54,7 +54,7 @@ public class Q00319_ScentOfDeath extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
index 8fd327d6b5..49cc3a2f09 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
@@ -55,7 +55,7 @@ public class Q00320_BonesTellTheFuture extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30359-04.htm"))
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
index a97a566c92..03cf67028d 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
@@ -60,7 +60,7 @@ public class Q00324_SweetestVenom extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
index 233ae4efea..308b9d1e12 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
@@ -79,7 +79,7 @@ public class Q00325_GrimCollector extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
index dc3eb65ec4..2566d50918 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
@@ -69,7 +69,7 @@ public class Q00326_VanquishRemnants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
index 1956e2923e..99a18a2d23 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
@@ -105,7 +105,7 @@ public class Q00327_RecoverTheFarmland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
index 64cc6ef8e9..b8d1a39d6c 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
@@ -70,7 +70,7 @@ public class Q00328_SenseForBusiness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
index 72407eabc3..25eb32f4d0 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
@@ -62,7 +62,7 @@ public class Q00329_CuriosityOfADwarf extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
index 518d845bcc..dd71a57310 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
@@ -65,7 +65,7 @@ public class Q00331_ArrowOfVengeance extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
index 498b165be2..02f12606c7 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
@@ -121,7 +121,7 @@ public class Q00333_HuntOfTheBlackLion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		final int chance = getRandom(100);
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
index 5f664a5fed..1031fbb7fb 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
@@ -85,7 +85,7 @@ public class Q00344_1000YearsTheEndOfLamentation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java
index da8086521c..eb49b8dc51 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java
@@ -59,7 +59,7 @@ public class Q00348_AnArrogantSearch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
index fd775bbe73..bc785abac1 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
@@ -60,7 +60,7 @@ public class Q00354_ConquestOfAlligatorIsland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
index ee19b7e4ab..fbcd365dc3 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
@@ -87,7 +87,7 @@ public class Q00355_FamilyHonor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
index e1633226d2..c200224cfa 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
@@ -61,7 +61,7 @@ public class Q00356_DigUpTheSeaOfSpores extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
index aca7242c87..8b51394b23 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
@@ -68,7 +68,7 @@ public class Q00358_IllegitimateChildOfTheGoddess extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
index ed0f544adc..2407d92d0f 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
@@ -59,7 +59,7 @@ public class Q00360_PlunderTheirSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
index aaf517b7a9..e910c1e70e 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
@@ -68,7 +68,7 @@ public class Q00369_CollectorOfJewels extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
index d24b38b112..c6c223f5a1 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
@@ -70,7 +70,7 @@ public class Q00370_AnElderSowsSeeds extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java
index 26bbe0c26a..510e73c602 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java
@@ -58,7 +58,7 @@ public class Q00374_WhisperOfDreamsPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java
index 370ba1f6b8..f37a2720b9 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java
@@ -56,7 +56,7 @@ public class Q00375_WhisperOfDreamsPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
index 7773083c9a..c29c87b26d 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
@@ -65,7 +65,7 @@ public class Q00401_PathOfTheWarrior extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
index 73be798601..f90aa18585 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
@@ -90,7 +90,7 @@ public class Q00402_PathOfTheHumanKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
index bd13a4bbe9..9bd736acaa 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
@@ -93,7 +93,7 @@ public class Q00403_PathOfTheRogue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
index 4b0285fcef..ac44dd64d6 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
@@ -72,7 +72,7 @@ public class Q00404_PathOfTheHumanWizard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
index 455a88115a..b7ad34d507 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
@@ -68,7 +68,7 @@ public class Q00405_PathOfTheCleric extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
index 60a2100263..fcb92b0837 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
@@ -73,7 +73,7 @@ public class Q00406_PathOfTheElvenKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
index e8ae130e75..89dbb1cea4 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
@@ -67,7 +67,7 @@ public class Q00407_PathOfTheElvenScout extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
index e35ea8444b..86dd94df1f 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
@@ -70,7 +70,7 @@ public class Q00408_PathOfTheElvenWizard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
index 809b741536..1e788f366f 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
@@ -66,7 +66,7 @@ public class Q00409_PathOfTheElvenOracle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
index 261122d3ff..727d4148f0 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
@@ -62,7 +62,7 @@ public class Q00410_PathOfThePalusKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
index d0849cb9a0..b6bd1f946a 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
@@ -62,7 +62,7 @@ public class Q00411_PathOfTheAssassin extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
index a2a12199b7..fda1cd4beb 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
@@ -69,7 +69,7 @@ public class Q00412_PathOfTheDarkWizard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
index cf84a5a883..55897e0028 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
@@ -66,7 +66,7 @@ public class Q00413_PathOfTheShillienOracle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
index 9bd2adec48..34d1af1f9c 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
@@ -65,7 +65,7 @@ public class Q00414_PathOfTheOrcRaider extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
index 0d21264633..3b6f7f4fb5 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
@@ -90,7 +90,7 @@ public class Q00415_PathOfTheOrcMonk extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
index 6a0fb18a23..1b62cbad54 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
@@ -88,7 +88,7 @@ public class Q00416_PathOfTheOrcShaman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
index 2e9a9937b5..973de273fc 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
@@ -84,7 +84,7 @@ public class Q00417_PathOfTheScavenger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
index 23061e130c..43770b4eb1 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
@@ -66,7 +66,7 @@ public class Q00418_PathOfTheArtisan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
index 580ce30c7b..1b7cebae69 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
@@ -68,7 +68,7 @@ public class Q00500_BrothersBoundInChains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
index c6c6541b90..e40f43ea81 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
@@ -82,7 +82,7 @@ public class Q00662_AGameOfCards extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss.java
index 6b14892016..e986187f8e 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss.java
@@ -51,7 +51,7 @@ public class Q00933_ExploringTheWestWingOfTheDungeonOfAbyss extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss.java
index ba47f428b9..c8765f54cf 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss.java
@@ -51,7 +51,7 @@ public class Q00935_ExploringTheEastWingOfTheDungeonOfAbyss extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q10866_PunitiveOperationOnTheDevilIsle/Q10866_PunitiveOperationOnTheDevilIsle.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q10866_PunitiveOperationOnTheDevilIsle/Q10866_PunitiveOperationOnTheDevilIsle.java
index 236a65502b..fa4bf40711 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q10866_PunitiveOperationOnTheDevilIsle/Q10866_PunitiveOperationOnTheDevilIsle.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q10866_PunitiveOperationOnTheDevilIsle/Q10866_PunitiveOperationOnTheDevilIsle.java
@@ -52,7 +52,7 @@ public class Q10866_PunitiveOperationOnTheDevilIsle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q10993_FutureDwarves/Q10993_FutureDwarves.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q10993_FutureDwarves/Q10993_FutureDwarves.java
index b76c4327b3..221901dc1c 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q10993_FutureDwarves/Q10993_FutureDwarves.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q10993_FutureDwarves/Q10993_FutureDwarves.java
@@ -57,7 +57,7 @@ public class Q10993_FutureDwarves extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q10994_FutureOrcs/Q10994_FutureOrcs.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q10994_FutureOrcs/Q10994_FutureOrcs.java
index b2397d915a..d4d6479353 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q10994_FutureOrcs/Q10994_FutureOrcs.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q10994_FutureOrcs/Q10994_FutureOrcs.java
@@ -56,7 +56,7 @@ public class Q10994_FutureOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java
index 7c85f8822b..1c1dd0364d 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java
@@ -73,7 +73,7 @@ public class Q10995_MutualBenefit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java
index 16ce909551..631067b7a1 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java
@@ -71,7 +71,7 @@ public class Q10996_TemplesDecorations extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q10997_LoserPriest1/Q10997_LoserPriest1.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q10997_LoserPriest1/Q10997_LoserPriest1.java
index 2ed08fc50c..8e9a9c27ea 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q10997_LoserPriest1/Q10997_LoserPriest1.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q10997_LoserPriest1/Q10997_LoserPriest1.java
@@ -65,7 +65,7 @@ public class Q10997_LoserPriest1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java
index 5bf66e5740..f558135c8c 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java
@@ -67,7 +67,7 @@ public class Q10998_LoserPriest2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java
index 7a6abe643a..42f08ebc69 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java
@@ -70,7 +70,7 @@ public class Q10999_LoserPriest3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11000_MoonKnight/Q11000_MoonKnight.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11000_MoonKnight/Q11000_MoonKnight.java
index f5b2632cfc..990ed4ca8c 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11000_MoonKnight/Q11000_MoonKnight.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11000_MoonKnight/Q11000_MoonKnight.java
@@ -87,7 +87,7 @@ public class Q11000_MoonKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java
index d785928ae4..30433b7906 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java
@@ -71,7 +71,7 @@ public class Q11001_TombsOfAncestors extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java
index 8721acf2af..f91df843e3 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java
@@ -70,7 +70,7 @@ public class Q11002_HelpWithTempleRestoration extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java
index 129deca6dc..cdd446e816 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java
@@ -69,7 +69,7 @@ public class Q11003_PerfectLeatherArmor1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java
index cb6a7a0ee9..da42f6b60d 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java
@@ -71,7 +71,7 @@ public class Q11004_PerfectLeatherArmor2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java
index 405848b6c2..d7a0f220be 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java
@@ -71,7 +71,7 @@ public class Q11005_PerfectLeatherArmor3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11006_FuturePeople/Q11006_FuturePeople.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11006_FuturePeople/Q11006_FuturePeople.java
index 4c017c9982..86f13b4fa2 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11006_FuturePeople/Q11006_FuturePeople.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11006_FuturePeople/Q11006_FuturePeople.java
@@ -61,7 +61,7 @@ public class Q11006_FuturePeople extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java
index eb48ad1fa4..49c35c4534 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java
@@ -71,7 +71,7 @@ public class Q11007_NoiseInWoods extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java
index 6234d1f496..502b9b9d24 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java
@@ -72,7 +72,7 @@ public class Q11008_PreparationForDungeon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java
index 5efbb08add..93e5cd7383 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java
@@ -66,7 +66,7 @@ public class Q11009_NewPotionDevelopment1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java
index 6fc7075973..5aa513eabc 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java
@@ -68,7 +68,7 @@ public class Q11010_NewPotionDevelopment2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java
index f2e64bdfe7..e71754ecd3 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java
@@ -67,7 +67,7 @@ public class Q11011_NewPotionDevelopment3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11012_FutureElves/Q11012_FutureElves.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11012_FutureElves/Q11012_FutureElves.java
index ab957c6430..a771e855d2 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11012_FutureElves/Q11012_FutureElves.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11012_FutureElves/Q11012_FutureElves.java
@@ -57,7 +57,7 @@ public class Q11012_FutureElves extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java
index 59082963ba..abdcd1da60 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java
@@ -73,7 +73,7 @@ public class Q11013_ShilensHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java
index 1f376d04a6..41a4c1e0ee 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java
@@ -72,7 +72,7 @@ public class Q11014_SurpriseGift extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java
index 8ea5b69558..a3772b0f31 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java
@@ -69,7 +69,7 @@ public class Q11015_PrepareForTrade1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java
index 911eaff20a..f194ab0ffe 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java
@@ -71,7 +71,7 @@ public class Q11016_PrepareForTrade2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java
index 48c8a15d51..911a806b55 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java
@@ -71,7 +71,7 @@ public class Q11017_PrepareForTrade3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11018_FutureDarkElves/Q11018_FutureDarkElves.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11018_FutureDarkElves/Q11018_FutureDarkElves.java
index d6c98287af..1fb7ef5309 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11018_FutureDarkElves/Q11018_FutureDarkElves.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11018_FutureDarkElves/Q11018_FutureDarkElves.java
@@ -59,7 +59,7 @@ public class Q11018_FutureDarkElves extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java
index dcc694115b..5c9f57e024 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java
@@ -72,7 +72,7 @@ public class Q11019_TribalBenefit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java
index 8209d11d8d..432afa42b1 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java
@@ -69,7 +69,7 @@ public class Q11020_BlacksmithsRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java
index 200ca15bb5..62766dbf94 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java
@@ -67,7 +67,7 @@ public class Q11021_RedGemNecklace1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java
index 1e5796e1d0..8f5191d574 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java
@@ -69,7 +69,7 @@ public class Q11022_RedGemNecklace2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java
index 53d77fa2e6..5c6641ea5e 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java
@@ -67,7 +67,7 @@ public class Q11023_RedGemNecklace3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
index 06ea44ceb1..6698687a4e 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
@@ -45,7 +45,7 @@ public class AllianceMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!"9001-01.htm".equals(event) && (player.getClan() == null))
 		{
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
index b69c69d8d0..b9cae10d1b 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
@@ -74,7 +74,7 @@ public class ClanMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LEADER_REQUIRED.containsKey(event) && !player.isClanLeader())
 		{
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
index 472b265d19..7560171dd1 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
@@ -61,7 +61,7 @@ public class DarkElfChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
index 9bed690c7f..db6419750d 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
@@ -74,7 +74,7 @@ public class DarkElfChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
index b90395d96a..fe46f96453 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
@@ -50,7 +50,7 @@ public class DwarfBlacksmithChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
index b658cd201b..95f42d44e2 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
@@ -55,7 +55,7 @@ public class DwarfBlacksmithChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
index 187710070c..df7368de42 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
@@ -50,7 +50,7 @@ public class DwarfWarehouseChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
index bcd1325051..e18b5c69e4 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
@@ -54,7 +54,7 @@ public class DwarfWarehouseChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
index b093c78e1d..bb0473e235 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
@@ -58,7 +58,7 @@ public class ElfHumanClericChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
index c0cf3513d7..eff155a55f 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
@@ -59,7 +59,7 @@ public class ElfHumanFighterChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
index 2095c50482..d43d533d9a 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
@@ -73,7 +73,7 @@ public class ElfHumanFighterChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
index ed623b52b0..c5b843fdc1 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
@@ -57,7 +57,7 @@ public class ElfHumanWizardChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
index 78b198c5a5..6482a77a8e 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
@@ -62,7 +62,7 @@ public class ElfHumanWizardChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
index acf6f9bc2f..1a231cd5d9 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
@@ -53,7 +53,7 @@ public class FirstClassTransferTalk extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return event;
 	}
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
index e3c48b1f33..324f48a504 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
@@ -51,7 +51,7 @@ public class OrcChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
index c78c927bae..221cff8bde 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
@@ -62,7 +62,7 @@ public class OrcChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/quest/Quest.java
index f343e5d8e9..252c508537 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/quest/Quest.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/quest/Quest.java
@@ -245,7 +245,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -267,7 +267,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -558,7 +558,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 			{
 				player.setSimulatedTalking(false);
 			}
-			res = onAdvEvent(event, npc, player);
+			res = onEvent(event, npc, player);
 		}
 		catch (Exception e)
 		{
@@ -1020,12 +1020,11 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 */
 	public String onDeath(Creature killer, Creature victim, QuestState qs)
 	{
-		return onAdvEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
+		return onEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
 	}
 	
 	/**
 	 * This function is called whenever a player clicks on a link in a quest dialog and whenever a timer fires.<br>
-	 * If is not overridden by a subclass, then default to the returned value of the simpler (and older) {@link #onEvent(String, QuestState)} override.<br>
 	 * If the player has a quest state, use it as parameter in the next call, otherwise return null.
 	 * @param event this parameter contains a string identifier for the event.<br>
 	 *            Generally, this string is passed directly via the link.<br>
@@ -1044,35 +1043,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 *            This parameter may be {@code null} in certain circumstances.
 	 * @return the text returned by the event (may be {@code null}, a filename or just text)
 	 */
-	public String onAdvEvent(String event, Npc npc, Player player)
-	{
-		if (player != null)
-		{
-			final QuestState qs = player.getQuestState(getName());
-			if (qs != null)
-			{
-				return onEvent(event, qs);
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * This function is called in place of {@link #onAdvEvent(String, Npc, Player)} if the former is not implemented.<br>
-	 * If a script contains both {@link #onAdvEvent(String, Npc, Player)} and this implementation, then this method will never be called unless the script's {@link #onAdvEvent(String, Npc, Player)} explicitly calls this method.
-	 * @param event this parameter contains a string identifier for the event.<br>
-	 *            Generally, this string is passed directly via the link.<br>
-	 *            For example:<br>
-	 *            <code>
-	 *            &lt;a action="bypass -h Quest 626_ADarkTwilight 31517-01.htm"&gt;hello&lt;/a&gt;
-	 *            </code><br>
-	 *            The above link sets the event variable to "31517-01.htm" for the quest 626_ADarkTwilight.<br>
-	 *            In the case of timers, this will be the name of the timer.<br>
-	 *            This parameter serves as a sort of identifier.
-	 * @param qs this parameter contains a reference to the quest state of the player who used the link or started the timer.
-	 * @return the text returned by the event (may be {@code null}, a filename or just text)
-	 */
-	public String onEvent(String event, QuestState qs)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return null;
 	}
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java
index 3817e1be30..db707fe326 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java
@@ -49,7 +49,7 @@ public class Fellow extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/DungeonOfAbyssZone.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/DungeonOfAbyssZone.java
index 439e3d440e..440119f080 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/DungeonOfAbyssZone.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/DungeonOfAbyssZone.java
@@ -53,7 +53,7 @@ public class DungeonOfAbyssZone extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("EXIT_PLAYER") && (player != null))
 		{
@@ -90,7 +90,7 @@ public class DungeonOfAbyssZone extends AbstractNpcAI
 				player.teleToLocation(EXIT_LOCATION_4);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Ingrit.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Ingrit.java
index 8d6242081a..34a9393fad 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Ingrit.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Ingrit.java
@@ -59,7 +59,7 @@ public class Ingrit extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc.getId() == SOUL_TRACKER_INRGIT)
 		{
@@ -99,7 +99,7 @@ public class Ingrit extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Iris.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Iris.java
index 6077a611dd..78c008e99d 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Iris.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Iris.java
@@ -59,7 +59,7 @@ public class Iris extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc.getId() == SOUL_TRACKER_IRIS)
 		{
@@ -99,7 +99,7 @@ public class Iris extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Magrit.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Magrit.java
index 420cffb53a..e69b4d1f47 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Magrit.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Magrit.java
@@ -59,7 +59,7 @@ public class Magrit extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc.getId() == SOUL_TRACKER_MARGIT)
 		{
@@ -99,7 +99,7 @@ public class Magrit extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Rosammy.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Rosammy.java
index e2dadf67e9..0d0b09c0c7 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Rosammy.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Rosammy.java
@@ -59,7 +59,7 @@ public class Rosammy extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc.getId() == SOUL_TRACKER_ROSAMMY)
 		{
@@ -99,7 +99,7 @@ public class Rosammy extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/Tores/Tores.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/Tores/Tores.java
index ab4f6e34c2..cabb6b15c7 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/Tores/Tores.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/DungeonOfAbyss/Tores/Tores.java
@@ -55,7 +55,7 @@ public class Tores extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -86,7 +86,7 @@ public class Tores extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
index a26e6075fd..31fc2ba199 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
@@ -43,12 +43,12 @@ public class Toma extends AbstractNpcAI
 	private Toma()
 	{
 		addFirstTalkId(TOMA);
-		onAdvEvent("RESPAWN_TOMA", null, null);
+		onEvent("RESPAWN_TOMA", null, null);
 		startQuestTimer("RESPAWN_TOMA", TELEPORT_DELAY, null, null, true);
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("RESPAWN_TOMA"))
 		{
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
index 6f8858a2a4..dd735beeaa 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
@@ -41,7 +41,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -54,7 +54,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 				npc.deleteMe();
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_DAY_NIGHT_CHANGE)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
index 76379f11ef..9e3b09ef23 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
@@ -38,14 +38,14 @@ public class Roxxy extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TEXT_SPAM") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SPEAK_WITH_ME_ABOUT_TRAVELING_AROUND_ADEN, 1000);
 			startQuestTimer("TEXT_SPAM", getRandom(10000, 30000), npc, null, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
index 143e9f48cd..158b1a72e0 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
@@ -49,7 +49,7 @@ public class Arushinai extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("30401-1.htm") || event.equals("30401-2.htm"))
 		{
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java
index d918a2bfc3..801a77996a 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java
@@ -49,7 +49,7 @@ public class Ateld extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
index 6ee6719c50..ec7aecde57 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
@@ -47,7 +47,7 @@ public class DimensionalVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("30952-1.htm") || event.equals("30952-2.htm") || event.equals("30952-3.htm"))
 		{
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index d236e19d43..a5157acfc7 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -193,7 +193,7 @@ public class Antharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -605,7 +605,7 @@ public class Antharas extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 4a01a9e786..b5610ec889 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -164,7 +164,7 @@ public class Baium extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -478,7 +478,7 @@ public class Baium extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/bosses/Core/Core.java
index 71150c1323..b9dcb38092 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -142,7 +142,7 @@ public class Core extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
@@ -161,7 +161,7 @@ public class Core extends AbstractNpcAI
 			_minions.forEach(Attackable::decayMe);
 			_minions.clear();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/bosses/LimitBarrier.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/bosses/LimitBarrier.java
index 1ef4c5773d..cd5437f3fc 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/bosses/LimitBarrier.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/bosses/LimitBarrier.java
@@ -150,7 +150,7 @@ public class LimitBarrier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -179,7 +179,7 @@ public class LimitBarrier extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index c263b212f3..b2d3b91356 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -180,7 +180,7 @@ public class Orfen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -263,7 +263,7 @@ public class Orfen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 93735c996b..72e174bb65 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -155,7 +155,7 @@ public class QueenAnt extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -239,7 +239,7 @@ public class QueenAnt extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java
index 51bd8a03e0..daa7e95811 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java
@@ -76,7 +76,7 @@ public class SevenSignsRBs extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
index c26bb52f9c..31de5b2324 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
@@ -70,13 +70,13 @@ public class Zaken extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("zaken_unlock"))
 		{
 			spawnBoss();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private void spawnBoss()
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index 04fed5ab1b..b95d115b2c 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -59,7 +59,7 @@ public class ArenaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -124,7 +124,7 @@ public class ArenaManager extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java
index c65d275482..7a1750b82f 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java
@@ -44,7 +44,7 @@ public class AttributeMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("learn".equalsIgnoreCase(event))
 		{
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
index b07792cd2d..11b8786523 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
@@ -57,7 +57,7 @@ public class CastleBlacksmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return (event.equalsIgnoreCase(npc.getId() + "-02.html") && hasRights(player, npc)) ? event : null;
 	}
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
index bb01178f53..0a2d84b789 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
@@ -393,7 +393,7 @@ public class CastleChamberlain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Castle castle = npc.getCastle();
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
index b9c1f3faf5..70bae86615 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
@@ -72,7 +72,7 @@ public class CastleDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
index bb32dde319..a319e3977f 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
@@ -56,7 +56,7 @@ public class CastleMercenaryManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index a2bf4617a1..06a742f8c8 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -78,7 +78,7 @@ public class CastleTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
@@ -168,7 +168,7 @@ public class CastleTeleporter extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
index bffed40bcc..ea1b40c41c 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
@@ -52,7 +52,7 @@ public class CastleWarehouse extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final boolean isMyLord = player.isClanLeader() && (player.getClan().getCastleId() == (npc.getCastle() != null ? npc.getCastle().getResidenceId() : -1));
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index 8dbfc4efd2..4a991c8495 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -64,7 +64,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
index a86581206e..afd7250ca4 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
@@ -57,7 +57,7 @@ public class ClanHallDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 490a87012a..c43403fae7 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -98,7 +98,7 @@ public class ClanHallManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index fbf06e9737..7b6a27fc36 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -235,7 +235,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		if (!_isEnabled)
 		{
@@ -902,7 +902,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	{
 		if (event.getCommand().startsWith("Quest ClassMaster "))
 		{
-			final String html = onAdvEvent(event.getCommand().substring(18), null, event.getPlayer());
+			final String html = onEvent(event.getCommand().substring(18), null, event.getPlayer());
 			event.getPlayer().sendPacket(TutorialCloseHtml.STATIC_PACKET);
 			showResult(event.getPlayer(), html);
 		}
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java
index afd9963ad2..8513f066dd 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java
@@ -52,7 +52,7 @@ public class DimensionalMerchant extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/DivineBeast.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/DivineBeast.java
index 1f247a7b35..3f3a076992 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/DivineBeast.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/DivineBeast.java
@@ -44,7 +44,7 @@ public class DivineBeast extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player == null) || !player.hasServitors())
 		{
@@ -55,7 +55,7 @@ public class DivineBeast extends AbstractNpcAI
 			cancelQuestTimer(event, npc, player);
 			player.getServitors().values().forEach(summon -> summon.unSummon(player));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
index bbff4608fc..8812882c93 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
@@ -69,7 +69,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
index 7d1abb4769..187fbae9dd 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
@@ -56,7 +56,7 @@ public class NewbieGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("0"))
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
index acc83d72d8..27ab7e4f74 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
@@ -69,7 +69,7 @@ public class OlyBuffer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.startsWith("giveBuff;") && (npc.getScriptValue() < 5))
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index 201f3843ba..f08fb759ac 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -70,7 +70,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
index 21d281c6c9..435f293345 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
@@ -84,7 +84,7 @@ public class Proclaimer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("giveBuff"))
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
index ea0a8a16da..1fc1737173 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
@@ -79,7 +79,7 @@ public class ProvisionalHalls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/RandomWalkingGuards.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
index 8138dee3ee..ffe4fd87f1 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
@@ -48,7 +48,7 @@ public class RandomWalkingGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("RANDOM_WALK") && (npc != null))
 		{
@@ -59,7 +59,7 @@ public class RandomWalkingGuards extends AbstractNpcAI
 			}
 			startQuestTimer("RANDOM_WALK", getRandom(MIN_WALK_DELAY, MAX_WALK_DELAY), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/Servitors/SinEater.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/Servitors/SinEater.java
index 1ed8d645a5..d7536614e8 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/Servitors/SinEater.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/Servitors/SinEater.java
@@ -48,7 +48,7 @@ public class SinEater extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TALK") && (player != null) && (player.getPet() != null))
 		{
@@ -79,7 +79,7 @@ public class SinEater extends AbstractNpcAI
 			}
 			startQuestTimer("TALK", 60000, null, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_CREATURE_DEATH)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
index 59d7caa30e..30731ac83e 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
@@ -51,7 +51,7 @@ public class SymbolMaker extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
index 04d4672c76..b595c4d6d4 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
@@ -86,7 +86,7 @@ public class ToIVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int npcId = npc.getId();
 		
@@ -132,7 +132,7 @@ public class ToIVortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index 356236cfc7..bf5b0506dc 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -188,7 +188,7 @@ public class WyvernManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
index 0c2e7586c9..c49be5297b 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
@@ -36,7 +36,7 @@ public class DelevelManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.DELEVEL_MANAGER_ENABLED)
 		{
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
index ff6d40ec0e..4713803f1d 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
@@ -54,7 +54,7 @@ public class FactionSystem extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class FactionSystem extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
index 8b9c676ad5..771c8a9058 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
@@ -34,7 +34,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -77,7 +77,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 				npc.broadcastInfo(); // update flag status
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
index 669fcfc85c..ddf7e923eb 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
@@ -39,7 +39,7 @@ public class NoblessMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.NOBLESS_MASTER_ENABLED)
 		{
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
index 4f0f0c988a..5ba22124c1 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
@@ -215,7 +215,7 @@ public class NpcLocationInfo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (Util.isDigit(event))
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
index 8e1f84c102..3a9b5b4bdc 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
@@ -169,7 +169,7 @@ public class Deathmatch extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
index 1eb84eca93..b92bbe7f77 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
@@ -213,7 +213,7 @@ public class Rabbits extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/events/Race/Race.java
index ff9fc462f6..6ac325ca6f 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/events/Race/Race.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/events/Race/Race.java
@@ -320,7 +320,7 @@ public class Race extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index e827184ae4..60da9f13d3 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -186,7 +186,7 @@ public class TvT extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index 53d917a5c7..a00de57ae5 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -44,7 +44,7 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/events/HappyHours/HappyHours.java
index 609afa94d8..23c485a96a 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/events/HappyHours/HappyHours.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/events/HappyHours/HappyHours.java
@@ -49,7 +49,7 @@ public class HappyHours extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/events/LetterCollector/LetterCollector.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
index 9030e46d76..da0d972c5b 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
@@ -73,7 +73,7 @@ public class LetterCollector extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
index 762cde5596..245342a91e 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
@@ -45,7 +45,7 @@ public class ThePowerOfLove extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/events/TotalRecall/TotalRecall.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
index 4486ac5f36..a5448d4db5 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
@@ -42,7 +42,7 @@ public class TotalRecall extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
index 5de1a19cd2..3e745b3d08 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
@@ -354,7 +354,7 @@ public class WatermelonNinja extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java
index 5c7f1dfd06..b489560d58 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java
@@ -166,7 +166,7 @@ public class LastImperialTomb extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java
index c1334f906a..96dcb6d101 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java
@@ -62,7 +62,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java
index 385ed785ea..405186c523 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java
@@ -92,7 +92,7 @@ public class MonsterArena extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/instances/ResidenceOfKingIgnis/ResidenceOfKingIgnis.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/instances/ResidenceOfKingIgnis/ResidenceOfKingIgnis.java
index e751cffbb9..aa4b1b8ebe 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/instances/ResidenceOfKingIgnis/ResidenceOfKingIgnis.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/instances/ResidenceOfKingIgnis/ResidenceOfKingIgnis.java
@@ -70,7 +70,7 @@ public class ResidenceOfKingIgnis extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/instances/ResidenceOfKingPetram/ResidenceOfKingPetram.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/instances/ResidenceOfKingPetram/ResidenceOfKingPetram.java
index df955bf126..9fc1dfcd13 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/instances/ResidenceOfKingPetram/ResidenceOfKingPetram.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/instances/ResidenceOfKingPetram/ResidenceOfKingPetram.java
@@ -55,7 +55,7 @@ public class ResidenceOfKingPetram extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/instances/ResidenceOfKingProcella/ResidenceOfKingProcella.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/instances/ResidenceOfKingProcella/ResidenceOfKingProcella.java
index 43a715ab2e..08d2de3463 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/instances/ResidenceOfKingProcella/ResidenceOfKingProcella.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/instances/ResidenceOfKingProcella/ResidenceOfKingProcella.java
@@ -55,7 +55,7 @@ public class ResidenceOfKingProcella extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/instances/ResidenceOfQueenNebula/ResidenceOfQueenNebula.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/instances/ResidenceOfQueenNebula/ResidenceOfQueenNebula.java
index 0e53cd55e0..401dfac407 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/instances/ResidenceOfQueenNebula/ResidenceOfQueenNebula.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/instances/ResidenceOfQueenNebula/ResidenceOfQueenNebula.java
@@ -62,7 +62,7 @@ public class ResidenceOfQueenNebula extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
index 24aa967f60..f348ed1ada 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
@@ -52,7 +52,7 @@ public class Q00127_FishingSpecialistsRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
index d911f2eea7..295af8d9b4 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
@@ -141,7 +141,7 @@ public class Q00255_Tutorial extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
index a7c0756abb..24aef6ae0c 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
@@ -66,7 +66,7 @@ public class Q00300_HuntingLetoLizardman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
index dc3eb65ec4..2566d50918 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
@@ -69,7 +69,7 @@ public class Q00326_VanquishRemnants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
index 1956e2923e..99a18a2d23 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
@@ -105,7 +105,7 @@ public class Q00327_RecoverTheFarmland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
index 64cc6ef8e9..b8d1a39d6c 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
@@ -70,7 +70,7 @@ public class Q00328_SenseForBusiness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
index 72407eabc3..25eb32f4d0 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
@@ -62,7 +62,7 @@ public class Q00329_CuriosityOfADwarf extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
index 518d845bcc..dd71a57310 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
@@ -65,7 +65,7 @@ public class Q00331_ArrowOfVengeance extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
index 498b165be2..02f12606c7 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
@@ -121,7 +121,7 @@ public class Q00333_HuntOfTheBlackLion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		final int chance = getRandom(100);
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
index 5f664a5fed..1031fbb7fb 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
@@ -85,7 +85,7 @@ public class Q00344_1000YearsTheEndOfLamentation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java
index da8086521c..eb49b8dc51 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java
@@ -59,7 +59,7 @@ public class Q00348_AnArrogantSearch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
index fd775bbe73..bc785abac1 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
@@ -60,7 +60,7 @@ public class Q00354_ConquestOfAlligatorIsland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
index ee19b7e4ab..fbcd365dc3 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
@@ -87,7 +87,7 @@ public class Q00355_FamilyHonor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
index e1633226d2..c200224cfa 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
@@ -61,7 +61,7 @@ public class Q00356_DigUpTheSeaOfSpores extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
index aca7242c87..8b51394b23 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
@@ -68,7 +68,7 @@ public class Q00358_IllegitimateChildOfTheGoddess extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
index ed0f544adc..2407d92d0f 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
@@ -59,7 +59,7 @@ public class Q00360_PlunderTheirSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
index aaf517b7a9..e910c1e70e 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
@@ -68,7 +68,7 @@ public class Q00369_CollectorOfJewels extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
index d24b38b112..c6c223f5a1 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
@@ -70,7 +70,7 @@ public class Q00370_AnElderSowsSeeds extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
index 580ce30c7b..1b7cebae69 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
@@ -68,7 +68,7 @@ public class Q00500_BrothersBoundInChains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
index c6c6541b90..e40f43ea81 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
@@ -82,7 +82,7 @@ public class Q00662_AGameOfCards extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss.java
index 6b14892016..e986187f8e 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss.java
@@ -51,7 +51,7 @@ public class Q00933_ExploringTheWestWingOfTheDungeonOfAbyss extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss.java
index ba47f428b9..c8765f54cf 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss.java
@@ -51,7 +51,7 @@ public class Q00935_ExploringTheEastWingOfTheDungeonOfAbyss extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java
index 3cbd2a66ed..b4aa8f3a1e 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java
@@ -116,7 +116,7 @@ public class Q10673_SagaOfLegend extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10866_PunitiveOperationOnTheDevilIsle/Q10866_PunitiveOperationOnTheDevilIsle.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10866_PunitiveOperationOnTheDevilIsle/Q10866_PunitiveOperationOnTheDevilIsle.java
index 236a65502b..fa4bf40711 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10866_PunitiveOperationOnTheDevilIsle/Q10866_PunitiveOperationOnTheDevilIsle.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10866_PunitiveOperationOnTheDevilIsle/Q10866_PunitiveOperationOnTheDevilIsle.java
@@ -52,7 +52,7 @@ public class Q10866_PunitiveOperationOnTheDevilIsle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10981_UnbearableWolvesHowling/Q10981_UnbearableWolvesHowling.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10981_UnbearableWolvesHowling/Q10981_UnbearableWolvesHowling.java
index 93a6c8f22b..cdc9574043 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10981_UnbearableWolvesHowling/Q10981_UnbearableWolvesHowling.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10981_UnbearableWolvesHowling/Q10981_UnbearableWolvesHowling.java
@@ -71,7 +71,7 @@ public class Q10981_UnbearableWolvesHowling extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java
index 939b4232e5..8642c8f767 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java
@@ -95,7 +95,7 @@ public class Q10982_SpiderHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10983_TroubledForest/Q10983_TroubledForest.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10983_TroubledForest/Q10983_TroubledForest.java
index fca2b14b35..8c96b8c83f 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10983_TroubledForest/Q10983_TroubledForest.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10983_TroubledForest/Q10983_TroubledForest.java
@@ -71,7 +71,7 @@ public class Q10983_TroubledForest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java
index 6a7d5970ba..e0baffbda3 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java
@@ -91,7 +91,7 @@ public class Q10984_CollectSpiderweb extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10985_CleaningUpTheGround/Q10985_CleaningUpTheGround.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10985_CleaningUpTheGround/Q10985_CleaningUpTheGround.java
index b8b18bae34..230bcf939b 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10985_CleaningUpTheGround/Q10985_CleaningUpTheGround.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10985_CleaningUpTheGround/Q10985_CleaningUpTheGround.java
@@ -72,7 +72,7 @@ public class Q10985_CleaningUpTheGround extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java
index 5cfd3ac079..e90fd072be 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java
@@ -96,7 +96,7 @@ public class Q10986_SwampMonster extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10987_PlunderedGraves/Q10987_PlunderedGraves.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10987_PlunderedGraves/Q10987_PlunderedGraves.java
index 4149a87cc6..f197edf4a4 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10987_PlunderedGraves/Q10987_PlunderedGraves.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10987_PlunderedGraves/Q10987_PlunderedGraves.java
@@ -72,7 +72,7 @@ public class Q10987_PlunderedGraves extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java
index 9b44e1dc51..7f7cc8caf0 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java
@@ -96,7 +96,7 @@ public class Q10988_Conspiracy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10989_DangerousPredators/Q10989_DangerousPredators.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10989_DangerousPredators/Q10989_DangerousPredators.java
index 5a948cb6fd..5b8147d3c1 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10989_DangerousPredators/Q10989_DangerousPredators.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10989_DangerousPredators/Q10989_DangerousPredators.java
@@ -72,7 +72,7 @@ public class Q10989_DangerousPredators extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java
index 906a438dd2..01b21dd564 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java
@@ -94,7 +94,7 @@ public class Q10990_PoisonExtraction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
index 06ea44ceb1..6698687a4e 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
@@ -45,7 +45,7 @@ public class AllianceMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!"9001-01.htm".equals(event) && (player.getClan() == null))
 		{
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
index b69c69d8d0..b9cae10d1b 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
@@ -74,7 +74,7 @@ public class ClanMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LEADER_REQUIRED.containsKey(event) && !player.isClanLeader())
 		{
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
index 472b265d19..7560171dd1 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
@@ -61,7 +61,7 @@ public class DarkElfChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
index 9bed690c7f..db6419750d 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
@@ -74,7 +74,7 @@ public class DarkElfChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
index b90395d96a..fe46f96453 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
@@ -50,7 +50,7 @@ public class DwarfBlacksmithChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
index b658cd201b..95f42d44e2 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
@@ -55,7 +55,7 @@ public class DwarfBlacksmithChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
index 187710070c..df7368de42 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
@@ -50,7 +50,7 @@ public class DwarfWarehouseChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
index bcd1325051..e18b5c69e4 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
@@ -54,7 +54,7 @@ public class DwarfWarehouseChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
index b093c78e1d..bb0473e235 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
@@ -58,7 +58,7 @@ public class ElfHumanClericChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
index c0cf3513d7..eff155a55f 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
@@ -59,7 +59,7 @@ public class ElfHumanFighterChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
index 2095c50482..d43d533d9a 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
@@ -73,7 +73,7 @@ public class ElfHumanFighterChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
index ed623b52b0..c5b843fdc1 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
@@ -57,7 +57,7 @@ public class ElfHumanWizardChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
index 78b198c5a5..6482a77a8e 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
@@ -62,7 +62,7 @@ public class ElfHumanWizardChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
index acf6f9bc2f..1a231cd5d9 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
@@ -53,7 +53,7 @@ public class FirstClassTransferTalk extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return event;
 	}
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
index e3c48b1f33..324f48a504 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
@@ -51,7 +51,7 @@ public class OrcChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
index c78c927bae..221cff8bde 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
@@ -62,7 +62,7 @@ public class OrcChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/quest/Quest.java
index f343e5d8e9..252c508537 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/quest/Quest.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/quest/Quest.java
@@ -245,7 +245,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -267,7 +267,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -558,7 +558,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 			{
 				player.setSimulatedTalking(false);
 			}
-			res = onAdvEvent(event, npc, player);
+			res = onEvent(event, npc, player);
 		}
 		catch (Exception e)
 		{
@@ -1020,12 +1020,11 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 */
 	public String onDeath(Creature killer, Creature victim, QuestState qs)
 	{
-		return onAdvEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
+		return onEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
 	}
 	
 	/**
 	 * This function is called whenever a player clicks on a link in a quest dialog and whenever a timer fires.<br>
-	 * If is not overridden by a subclass, then default to the returned value of the simpler (and older) {@link #onEvent(String, QuestState)} override.<br>
 	 * If the player has a quest state, use it as parameter in the next call, otherwise return null.
 	 * @param event this parameter contains a string identifier for the event.<br>
 	 *            Generally, this string is passed directly via the link.<br>
@@ -1044,35 +1043,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 *            This parameter may be {@code null} in certain circumstances.
 	 * @return the text returned by the event (may be {@code null}, a filename or just text)
 	 */
-	public String onAdvEvent(String event, Npc npc, Player player)
-	{
-		if (player != null)
-		{
-			final QuestState qs = player.getQuestState(getName());
-			if (qs != null)
-			{
-				return onEvent(event, qs);
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * This function is called in place of {@link #onAdvEvent(String, Npc, Player)} if the former is not implemented.<br>
-	 * If a script contains both {@link #onAdvEvent(String, Npc, Player)} and this implementation, then this method will never be called unless the script's {@link #onAdvEvent(String, Npc, Player)} explicitly calls this method.
-	 * @param event this parameter contains a string identifier for the event.<br>
-	 *            Generally, this string is passed directly via the link.<br>
-	 *            For example:<br>
-	 *            <code>
-	 *            &lt;a action="bypass -h Quest 626_ADarkTwilight 31517-01.htm"&gt;hello&lt;/a&gt;
-	 *            </code><br>
-	 *            The above link sets the event variable to "31517-01.htm" for the quest 626_ADarkTwilight.<br>
-	 *            In the case of timers, this will be the name of the timer.<br>
-	 *            This parameter serves as a sort of identifier.
-	 * @param qs this parameter contains a reference to the quest state of the player who used the link or started the timer.
-	 * @return the text returned by the event (may be {@code null}, a filename or just text)
-	 */
-	public String onEvent(String event, QuestState qs)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return null;
 	}
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java
index 3817e1be30..db707fe326 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java
@@ -49,7 +49,7 @@ public class Fellow extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/DungeonOfAbyss/DungeonOfAbyssZone.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/DungeonOfAbyss/DungeonOfAbyssZone.java
index 439e3d440e..440119f080 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/DungeonOfAbyss/DungeonOfAbyssZone.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/DungeonOfAbyss/DungeonOfAbyssZone.java
@@ -53,7 +53,7 @@ public class DungeonOfAbyssZone extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("EXIT_PLAYER") && (player != null))
 		{
@@ -90,7 +90,7 @@ public class DungeonOfAbyssZone extends AbstractNpcAI
 				player.teleToLocation(EXIT_LOCATION_4);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Ingrit.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Ingrit.java
index 8d6242081a..34a9393fad 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Ingrit.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Ingrit.java
@@ -59,7 +59,7 @@ public class Ingrit extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc.getId() == SOUL_TRACKER_INRGIT)
 		{
@@ -99,7 +99,7 @@ public class Ingrit extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Iris.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Iris.java
index 6077a611dd..78c008e99d 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Iris.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Iris.java
@@ -59,7 +59,7 @@ public class Iris extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc.getId() == SOUL_TRACKER_IRIS)
 		{
@@ -99,7 +99,7 @@ public class Iris extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Magrit.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Magrit.java
index 420cffb53a..e69b4d1f47 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Magrit.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Magrit.java
@@ -59,7 +59,7 @@ public class Magrit extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc.getId() == SOUL_TRACKER_MARGIT)
 		{
@@ -99,7 +99,7 @@ public class Magrit extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Rosammy.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Rosammy.java
index e2dadf67e9..0d0b09c0c7 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Rosammy.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Rosammy.java
@@ -59,7 +59,7 @@ public class Rosammy extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc.getId() == SOUL_TRACKER_ROSAMMY)
 		{
@@ -99,7 +99,7 @@ public class Rosammy extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/DungeonOfAbyss/Tores/Tores.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/DungeonOfAbyss/Tores/Tores.java
index ab4f6e34c2..cabb6b15c7 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/DungeonOfAbyss/Tores/Tores.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/DungeonOfAbyss/Tores/Tores.java
@@ -55,7 +55,7 @@ public class Tores extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -86,7 +86,7 @@ public class Tores extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
index a26e6075fd..31fc2ba199 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
@@ -43,12 +43,12 @@ public class Toma extends AbstractNpcAI
 	private Toma()
 	{
 		addFirstTalkId(TOMA);
-		onAdvEvent("RESPAWN_TOMA", null, null);
+		onEvent("RESPAWN_TOMA", null, null);
 		startQuestTimer("RESPAWN_TOMA", TELEPORT_DELAY, null, null, true);
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("RESPAWN_TOMA"))
 		{
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
index 6f8858a2a4..dd735beeaa 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
@@ -41,7 +41,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -54,7 +54,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 				npc.deleteMe();
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_DAY_NIGHT_CHANGE)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
index 76379f11ef..9e3b09ef23 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
@@ -38,14 +38,14 @@ public class Roxxy extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TEXT_SPAM") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SPEAK_WITH_ME_ABOUT_TRAVELING_AROUND_ADEN, 1000);
 			startQuestTimer("TEXT_SPAM", getRandom(10000, 30000), npc, null, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
index 143e9f48cd..158b1a72e0 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
@@ -49,7 +49,7 @@ public class Arushinai extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("30401-1.htm") || event.equals("30401-2.htm"))
 		{
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java
index d918a2bfc3..801a77996a 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java
@@ -49,7 +49,7 @@ public class Ateld extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
index 6ee6719c50..ec7aecde57 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
@@ -47,7 +47,7 @@ public class DimensionalVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("30952-1.htm") || event.equals("30952-2.htm") || event.equals("30952-3.htm"))
 		{
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index d236e19d43..a5157acfc7 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -193,7 +193,7 @@ public class Antharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -605,7 +605,7 @@ public class Antharas extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 4a01a9e786..b5610ec889 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -164,7 +164,7 @@ public class Baium extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -478,7 +478,7 @@ public class Baium extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Core/Core.java
index 71150c1323..b9dcb38092 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -142,7 +142,7 @@ public class Core extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
@@ -161,7 +161,7 @@ public class Core extends AbstractNpcAI
 			_minions.forEach(Attackable::decayMe);
 			_minions.clear();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/bosses/LimitBarrier.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/bosses/LimitBarrier.java
index 0bc01da7c8..3ec6403956 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/bosses/LimitBarrier.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/bosses/LimitBarrier.java
@@ -150,7 +150,7 @@ public class LimitBarrier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -179,7 +179,7 @@ public class LimitBarrier extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index c263b212f3..b2d3b91356 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -180,7 +180,7 @@ public class Orfen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -263,7 +263,7 @@ public class Orfen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 93735c996b..72e174bb65 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -155,7 +155,7 @@ public class QueenAnt extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -239,7 +239,7 @@ public class QueenAnt extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java
index 51bd8a03e0..daa7e95811 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java
@@ -76,7 +76,7 @@ public class SevenSignsRBs extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
index c26bb52f9c..31de5b2324 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
@@ -70,13 +70,13 @@ public class Zaken extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("zaken_unlock"))
 		{
 			spawnBoss();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private void spawnBoss()
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index 04fed5ab1b..b95d115b2c 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -59,7 +59,7 @@ public class ArenaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -124,7 +124,7 @@ public class ArenaManager extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java
index c65d275482..7a1750b82f 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java
@@ -44,7 +44,7 @@ public class AttributeMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("learn".equalsIgnoreCase(event))
 		{
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
index b07792cd2d..11b8786523 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
@@ -57,7 +57,7 @@ public class CastleBlacksmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return (event.equalsIgnoreCase(npc.getId() + "-02.html") && hasRights(player, npc)) ? event : null;
 	}
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
index bb01178f53..0a2d84b789 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
@@ -393,7 +393,7 @@ public class CastleChamberlain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Castle castle = npc.getCastle();
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
index b9c1f3faf5..70bae86615 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
@@ -72,7 +72,7 @@ public class CastleDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
index bb32dde319..a319e3977f 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
@@ -56,7 +56,7 @@ public class CastleMercenaryManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index a2bf4617a1..06a742f8c8 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -78,7 +78,7 @@ public class CastleTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
@@ -168,7 +168,7 @@ public class CastleTeleporter extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
index bffed40bcc..ea1b40c41c 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
@@ -52,7 +52,7 @@ public class CastleWarehouse extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final boolean isMyLord = player.isClanLeader() && (player.getClan().getCastleId() == (npc.getCastle() != null ? npc.getCastle().getResidenceId() : -1));
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index 62d432cf52..c04c4e5ab1 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -64,7 +64,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
index a86581206e..afd7250ca4 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
@@ -57,7 +57,7 @@ public class ClanHallDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 490a87012a..c43403fae7 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -98,7 +98,7 @@ public class ClanHallManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index fbf06e9737..7b6a27fc36 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -235,7 +235,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		if (!_isEnabled)
 		{
@@ -902,7 +902,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	{
 		if (event.getCommand().startsWith("Quest ClassMaster "))
 		{
-			final String html = onAdvEvent(event.getCommand().substring(18), null, event.getPlayer());
+			final String html = onEvent(event.getCommand().substring(18), null, event.getPlayer());
 			event.getPlayer().sendPacket(TutorialCloseHtml.STATIC_PACKET);
 			showResult(event.getPlayer(), html);
 		}
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/DivineBeast.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/DivineBeast.java
index 1f247a7b35..3f3a076992 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/DivineBeast.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/DivineBeast.java
@@ -44,7 +44,7 @@ public class DivineBeast extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player == null) || !player.hasServitors())
 		{
@@ -55,7 +55,7 @@ public class DivineBeast extends AbstractNpcAI
 			cancelQuestTimer(event, npc, player);
 			player.getServitors().values().forEach(summon -> summon.unSummon(player));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
index bbff4608fc..8812882c93 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
@@ -69,7 +69,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
index 7d1abb4769..187fbae9dd 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
@@ -56,7 +56,7 @@ public class NewbieGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("0"))
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
index acc83d72d8..27ab7e4f74 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
@@ -69,7 +69,7 @@ public class OlyBuffer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.startsWith("giveBuff;") && (npc.getScriptValue() < 5))
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index 201f3843ba..f08fb759ac 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -70,7 +70,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
index 21d281c6c9..435f293345 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
@@ -84,7 +84,7 @@ public class Proclaimer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("giveBuff"))
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
index ea0a8a16da..1fc1737173 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
@@ -79,7 +79,7 @@ public class ProvisionalHalls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/RandomWalkingGuards.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
index 8138dee3ee..ffe4fd87f1 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
@@ -48,7 +48,7 @@ public class RandomWalkingGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("RANDOM_WALK") && (npc != null))
 		{
@@ -59,7 +59,7 @@ public class RandomWalkingGuards extends AbstractNpcAI
 			}
 			startQuestTimer("RANDOM_WALK", getRandom(MIN_WALK_DELAY, MAX_WALK_DELAY), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/Servitors/SinEater.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/Servitors/SinEater.java
index 1ed8d645a5..d7536614e8 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/Servitors/SinEater.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/Servitors/SinEater.java
@@ -48,7 +48,7 @@ public class SinEater extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TALK") && (player != null) && (player.getPet() != null))
 		{
@@ -79,7 +79,7 @@ public class SinEater extends AbstractNpcAI
 			}
 			startQuestTimer("TALK", 60000, null, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_CREATURE_DEATH)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
index 59d7caa30e..30731ac83e 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
@@ -51,7 +51,7 @@ public class SymbolMaker extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
index 04d4672c76..b595c4d6d4 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
@@ -86,7 +86,7 @@ public class ToIVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int npcId = npc.getId();
 		
@@ -132,7 +132,7 @@ public class ToIVortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index 356236cfc7..bf5b0506dc 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -188,7 +188,7 @@ public class WyvernManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
index 0c2e7586c9..c49be5297b 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
@@ -36,7 +36,7 @@ public class DelevelManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.DELEVEL_MANAGER_ENABLED)
 		{
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
index ff6d40ec0e..4713803f1d 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
@@ -54,7 +54,7 @@ public class FactionSystem extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class FactionSystem extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
index 8b9c676ad5..771c8a9058 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
@@ -34,7 +34,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -77,7 +77,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 				npc.broadcastInfo(); // update flag status
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
index 669fcfc85c..ddf7e923eb 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
@@ -39,7 +39,7 @@ public class NoblessMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.NOBLESS_MASTER_ENABLED)
 		{
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
index 4f0f0c988a..5ba22124c1 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
@@ -215,7 +215,7 @@ public class NpcLocationInfo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (Util.isDigit(event))
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
index 8e1f84c102..3a9b5b4bdc 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
@@ -169,7 +169,7 @@ public class Deathmatch extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
index 1eb84eca93..b92bbe7f77 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
@@ -213,7 +213,7 @@ public class Rabbits extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/events/Race/Race.java
index ff9fc462f6..6ac325ca6f 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/events/Race/Race.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/events/Race/Race.java
@@ -320,7 +320,7 @@ public class Race extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index e827184ae4..60da9f13d3 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -186,7 +186,7 @@ public class TvT extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index 53d917a5c7..a00de57ae5 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -44,7 +44,7 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/events/HappyHours/HappyHours.java
index e76af2108a..eb247dbbb3 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/events/HappyHours/HappyHours.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/events/HappyHours/HappyHours.java
@@ -49,7 +49,7 @@ public class HappyHours extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/events/LetterCollector/LetterCollector.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
index 9030e46d76..da0d972c5b 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
@@ -73,7 +73,7 @@ public class LetterCollector extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
index 762cde5596..245342a91e 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
@@ -45,7 +45,7 @@ public class ThePowerOfLove extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/events/TotalRecall/TotalRecall.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
index 4486ac5f36..a5448d4db5 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
@@ -42,7 +42,7 @@ public class TotalRecall extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
index 5de1a19cd2..3e745b3d08 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
@@ -354,7 +354,7 @@ public class WatermelonNinja extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java
index 5c7f1dfd06..b489560d58 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java
@@ -166,7 +166,7 @@ public class LastImperialTomb extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java
index c1334f906a..96dcb6d101 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java
@@ -62,7 +62,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java
index ff61dd4a39..f1a3a2df02 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java
@@ -87,7 +87,7 @@ public class MonsterArena extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/instances/ResidenceOfKingIgnis/ResidenceOfKingIgnis.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/instances/ResidenceOfKingIgnis/ResidenceOfKingIgnis.java
index e751cffbb9..aa4b1b8ebe 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/instances/ResidenceOfKingIgnis/ResidenceOfKingIgnis.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/instances/ResidenceOfKingIgnis/ResidenceOfKingIgnis.java
@@ -70,7 +70,7 @@ public class ResidenceOfKingIgnis extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/instances/ResidenceOfKingPetram/ResidenceOfKingPetram.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/instances/ResidenceOfKingPetram/ResidenceOfKingPetram.java
index df955bf126..9fc1dfcd13 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/instances/ResidenceOfKingPetram/ResidenceOfKingPetram.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/instances/ResidenceOfKingPetram/ResidenceOfKingPetram.java
@@ -55,7 +55,7 @@ public class ResidenceOfKingPetram extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/instances/ResidenceOfKingProcella/ResidenceOfKingProcella.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/instances/ResidenceOfKingProcella/ResidenceOfKingProcella.java
index 43a715ab2e..08d2de3463 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/instances/ResidenceOfKingProcella/ResidenceOfKingProcella.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/instances/ResidenceOfKingProcella/ResidenceOfKingProcella.java
@@ -55,7 +55,7 @@ public class ResidenceOfKingProcella extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/instances/ResidenceOfQueenNebula/ResidenceOfQueenNebula.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/instances/ResidenceOfQueenNebula/ResidenceOfQueenNebula.java
index 0e53cd55e0..401dfac407 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/instances/ResidenceOfQueenNebula/ResidenceOfQueenNebula.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/instances/ResidenceOfQueenNebula/ResidenceOfQueenNebula.java
@@ -62,7 +62,7 @@ public class ResidenceOfQueenNebula extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java
index 79f364a54e..cf2473bc19 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java
@@ -84,7 +84,7 @@ public class Q00070_SagaOfThePhoenixKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java
index 1c5ee20575..703208bf2e 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java
@@ -85,7 +85,7 @@ public class Q00071_SagaOfEvasTemplar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java
index 91ba4811de..0808d1601b 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java
@@ -85,7 +85,7 @@ public class Q00072_SagaOfTheSwordMuse extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java
index 896f16438e..7e6fda1667 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java
@@ -85,7 +85,7 @@ public class Q00073_SagaOfTheDuelist extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java
index 1a98d4d200..fd0a03550d 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java
@@ -85,7 +85,7 @@ public class Q00074_SagaOfTheDreadnought extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java
index e5e6b39427..428c1caa43 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java
@@ -85,7 +85,7 @@ public class Q00075_SagaOfTheTitan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java
index a977722f62..ccfff282a0 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java
@@ -85,7 +85,7 @@ public class Q00076_SagaOfTheGrandKhavatari extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java
index 508438d67a..43f8ff9d78 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java
@@ -85,7 +85,7 @@ public class Q00077_SagaOfTheDominator extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java
index 75c3d73024..1ed3216c29 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java
@@ -85,7 +85,7 @@ public class Q00078_SagaOfTheDoomcryer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java
index 3df5908a15..8dc5a8c81a 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java
@@ -85,7 +85,7 @@ public class Q00079_SagaOfTheAdventurer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java
index 2074a51b96..c542de4c19 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java
@@ -85,7 +85,7 @@ public class Q00080_SagaOfTheWindRider extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java
index 67ca500398..73e5ca9f03 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java
@@ -85,7 +85,7 @@ public class Q00081_SagaOfTheGhostHunter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java
index 52f64dc817..b143f8b56b 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java
@@ -85,7 +85,7 @@ public class Q00082_SagaOfTheSagittarius extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java
index 2818994337..c7cb95b044 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java
@@ -85,7 +85,7 @@ public class Q00083_SagaOfTheMoonlightSentinel extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java
index 5c4722209e..39a2839627 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java
@@ -85,7 +85,7 @@ public class Q00084_SagaOfTheGhostSentinel extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java
index e32cc7ded0..f72865632a 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java
@@ -85,7 +85,7 @@ public class Q00085_SagaOfTheCardinal extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java
index c0b50b130e..4dd2385ff8 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java
@@ -85,7 +85,7 @@ public class Q00086_SagaOfTheHierophant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java
index 76719ec38e..1837ccacda 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java
@@ -85,7 +85,7 @@ public class Q00087_SagaOfEvasSaint extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java
index 4901af8961..e87a6913ce 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java
@@ -84,7 +84,7 @@ public class Q00088_SagaOfTheArchmage extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java
index cbf08d12cc..524e8dbdc1 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java
@@ -84,7 +84,7 @@ public class Q00089_SagaOfTheMysticMuse extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java
index 9b236936e0..26c9bb3dd4 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java
@@ -84,7 +84,7 @@ public class Q00090_SagaOfTheStormScreamer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java
index 751f487099..15c7611dc3 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java
@@ -85,7 +85,7 @@ public class Q00091_SagaOfTheArcanaLord extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java
index 6f98a643f7..337e3070d1 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java
@@ -84,7 +84,7 @@ public class Q00092_SagaOfTheElementalMaster extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java
index f77b67dd6a..61acb45c50 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java
@@ -84,7 +84,7 @@ public class Q00093_SagaOfTheSpectralMaster extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java
index 12d4bc28d6..24004acd96 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java
@@ -84,7 +84,7 @@ public class Q00094_SagaOfTheSoultaker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java
index a104ed14ed..6174d9f79d 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java
@@ -85,7 +85,7 @@ public class Q00095_SagaOfTheHellKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java
index 7c08220d8d..5deb250ad9 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java
@@ -84,7 +84,7 @@ public class Q00096_SagaOfTheSpectralDancer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java
index dee5c701e3..7f93f9bb4b 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java
@@ -84,7 +84,7 @@ public class Q00097_SagaOfTheShillienTemplar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java
index c21ebb5e13..7d89d5cabc 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java
@@ -85,7 +85,7 @@ public class Q00098_SagaOfTheShillienSaint extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java
index a63b4710c7..e9113ef4a7 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java
@@ -84,7 +84,7 @@ public class Q00099_SagaOfTheFortuneSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java
index 349f583104..8ec0ec7a61 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java
@@ -84,7 +84,7 @@ public class Q00100_SagaOfTheMaestro extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
index 24aa967f60..f348ed1ada 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
@@ -52,7 +52,7 @@ public class Q00127_FishingSpecialistsRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
index 6b7de9bd96..18b11d47ae 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
@@ -76,7 +76,7 @@ public class Q00211_TrialOfTheChallenger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
index efde71ba49..2e70c4f9b1 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
@@ -86,7 +86,7 @@ public class Q00212_TrialOfDuty extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
index a0f8f915b3..1f4f42c490 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
@@ -92,7 +92,7 @@ public class Q00213_TrialOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
index 94bba112f2..6dfacfa116 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
@@ -120,7 +120,7 @@ public class Q00214_TrialOfTheScholar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
index da0399c8ce..a555adb852 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
@@ -77,7 +77,7 @@ public class Q00215_TrialOfThePilgrim extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
index 05aade19d6..82ef5fe081 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
@@ -94,7 +94,7 @@ public class Q00216_TrialOfTheGuildsman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
index 32a88e353e..86edef3008 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
@@ -107,7 +107,7 @@ public class Q00217_TestimonyOfTrust extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
index a5d3455060..05ed9df156 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
@@ -104,7 +104,7 @@ public class Q00218_TestimonyOfLife extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
index 5e3eb02369..9eae62eb6e 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
@@ -107,7 +107,7 @@ public class Q00219_TestimonyOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
index 24d8bf39f4..e22e3a6c92 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
@@ -121,7 +121,7 @@ public class Q00220_TestimonyOfGlory extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
index a276b60f56..dff82abd5d 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
@@ -124,7 +124,7 @@ public class Q00221_TestimonyOfProsperity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
index 761bdeb64a..3f03f3e509 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
@@ -88,7 +88,7 @@ public class Q00222_TestOfTheDuelist extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
index bd794eef75..d0bbb73b4f 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
@@ -85,7 +85,7 @@ public class Q00223_TestOfTheChampion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
index 163aa900f4..346538dc45 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
@@ -94,7 +94,7 @@ public class Q00224_TestOfSagittarius extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
index ae9bb5fb4d..e7a6b7ef1a 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
@@ -91,7 +91,7 @@ public class Q00225_TestOfTheSearcher extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
index c3dc04f3f1..9d8e8a161d 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
@@ -81,7 +81,7 @@ public class Q00226_TestOfTheHealer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
index ba1fc6097e..dac23aac62 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
@@ -114,7 +114,7 @@ public class Q00227_TestOfTheReformer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("DESPAWN".equals(event))
 		{
@@ -127,7 +127,7 @@ public class Q00227_TestOfTheReformer extends Quest
 			{
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
index 6ca6b63f34..42f8db1e54 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
@@ -99,7 +99,7 @@ public class Q00228_TestOfMagus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
index 954c6b4142..706fc8fb29 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
@@ -115,7 +115,7 @@ public class Q00229_TestOfWitchcraft extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
index 2d810c2bb4..9e61822eca 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
@@ -163,7 +163,7 @@ public class Q00230_TestOfTheSummoner extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
index ea9ab4c98d..0b1696278f 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
@@ -81,7 +81,7 @@ public class Q00231_TestOfTheMaestro extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
index bdd4cb26b5..8aaeb13125 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
@@ -106,7 +106,7 @@ public class Q00232_TestOfTheLord extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
index a8f0d1a2a5..3c14c2ef63 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
@@ -106,7 +106,7 @@ public class Q00233_TestOfTheWarSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
index f41ac170e9..9c179c34ac 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
@@ -143,7 +143,7 @@ public class Q00255_Tutorial extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
index a98a9a317b..3f8ecbb375 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
@@ -88,7 +88,7 @@ public class Q00257_TheGuardIsBusy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
index ddd656d3ad..c19e69fd3d 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
@@ -66,7 +66,7 @@ public class Q00258_BringWolfPelts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30001-03.html"))
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
index 02efc29fd9..88ca56e754 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
@@ -70,7 +70,7 @@ public class Q00259_RequestFromTheFarmOwner extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
index 6e63d6faf4..e3e252ec97 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
@@ -63,7 +63,7 @@ public class Q00260_OrcHunting extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
index b68a525827..ff6e0e01fc 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
@@ -61,7 +61,7 @@ public class Q00261_CollectorsDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30222-03.htm"))
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
index 95721f08dc..29b898dc6d 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
@@ -59,7 +59,7 @@ public class Q00262_TradeWithTheIvoryTower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30137-03.htm"))
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
index 1bdeec4a83..950346cf59 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
@@ -61,7 +61,7 @@ public class Q00263_OrcSubjugation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
index 20ddbeac20..bd848ee2cf 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
@@ -68,7 +68,7 @@ public class Q00264_KeenClaws extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30136-03.htm"))
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
index d90ce43946..195dc0675d 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
@@ -58,7 +58,7 @@ public class Q00265_BondsOfSlavery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
index 68c5dd1cc3..87c949919f 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
@@ -72,7 +72,7 @@ public class Q00266_PleasOfPixies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("31852-04.htm"))
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
index aa676c5d46..5b26a51d59 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
@@ -50,7 +50,7 @@ public class Q00267_WrathOfVerdure extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
index b6c64f4db7..52a1ad5ec8 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
@@ -54,7 +54,7 @@ public class Q00271_ProofOfValor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30577-04.htm"))
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
index 0c0748e735..8fc6eb06c2 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
@@ -54,7 +54,7 @@ public class Q00272_WrathOfAncestors extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30572-04.htm"))
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
index b3f9d4bb1b..00afdb3a51 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
@@ -60,7 +60,7 @@ public class Q00273_InvadersOfTheHolyLand extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
index f45e185d3f..de06f688b3 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
@@ -57,7 +57,7 @@ public class Q00274_SkirmishWithTheWerewolves extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30569-04.htm"))
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
index 1e6a02f4f9..31e70fba32 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
@@ -59,7 +59,7 @@ public class Q00275_DarkWingedSpies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30567-03.htm"))
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
index 74935e9104..e8f904d1f6 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
@@ -74,7 +74,7 @@ public class Q00276_TotemOfTheHestui extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30571-03.htm"))
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
index 156b85fdf6..6b507503c3 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
@@ -51,7 +51,7 @@ public class Q00277_GatekeepersOffering extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30576-03.htm"))
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
index 8e245d375c..48ed318353 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
@@ -68,7 +68,7 @@ public class Q00292_BrigandsSweep extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
index 227398a92d..93d41b6c06 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
@@ -59,7 +59,7 @@ public class Q00293_TheHiddenVeins extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
index 554161d862..a56345d2f9 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
@@ -62,7 +62,7 @@ public class Q00294_CovertBusiness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && qs.isCreated() && event.equals("30534-03.htm"))
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
index 98daa7c06c..2e8d1c601d 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
@@ -51,7 +51,7 @@ public class Q00295_DreamingOfTheSkies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && qs.isCreated() && event.equals("30536-03.htm"))
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
index 4d1d5b1777..9dc8ba9904 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
@@ -56,7 +56,7 @@ public class Q00296_TarantulasSpiderSilk extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
index e0b5bc2986..099201eb88 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
@@ -52,7 +52,7 @@ public class Q00297_GatekeepersFavor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30540-03.htm"))
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
index a7c0756abb..24aef6ae0c 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
@@ -66,7 +66,7 @@ public class Q00300_HuntingLetoLizardman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
index 65317d4367..8960b5ee57 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
@@ -49,7 +49,7 @@ public class Q00303_CollectArrowheads extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30029-04.htm"))
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
index 20009b3457..e520a0cd92 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
@@ -65,7 +65,7 @@ public class Q00306_CrystalOfFireAndIce extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
index 69cbcdbf2a..a1eb4478d8 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
@@ -51,7 +51,7 @@ public class Q00313_CollectSpores extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
index fb42e610a9..5c4fe19392 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
@@ -70,7 +70,7 @@ public class Q00316_DestroyPlagueCarriers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
index 86a347b60b..b69fd606ea 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
@@ -52,7 +52,7 @@ public class Q00317_CatchTheWind extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
index e88feb95e2..fc8f958e8c 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
@@ -54,7 +54,7 @@ public class Q00319_ScentOfDeath extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
index 8fd327d6b5..49cc3a2f09 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
@@ -55,7 +55,7 @@ public class Q00320_BonesTellTheFuture extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30359-04.htm"))
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
index a97a566c92..03cf67028d 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
@@ -60,7 +60,7 @@ public class Q00324_SweetestVenom extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
index 233ae4efea..308b9d1e12 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
@@ -79,7 +79,7 @@ public class Q00325_GrimCollector extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
index dc3eb65ec4..2566d50918 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
@@ -69,7 +69,7 @@ public class Q00326_VanquishRemnants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
index 1956e2923e..99a18a2d23 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
@@ -105,7 +105,7 @@ public class Q00327_RecoverTheFarmland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
index 64cc6ef8e9..b8d1a39d6c 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
@@ -70,7 +70,7 @@ public class Q00328_SenseForBusiness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
index 72407eabc3..25eb32f4d0 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
@@ -62,7 +62,7 @@ public class Q00329_CuriosityOfADwarf extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
index 518d845bcc..dd71a57310 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
@@ -65,7 +65,7 @@ public class Q00331_ArrowOfVengeance extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
index 498b165be2..02f12606c7 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
@@ -121,7 +121,7 @@ public class Q00333_HuntOfTheBlackLion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		final int chance = getRandom(100);
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
index 5f664a5fed..1031fbb7fb 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
@@ -85,7 +85,7 @@ public class Q00344_1000YearsTheEndOfLamentation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java
index da8086521c..eb49b8dc51 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java
@@ -59,7 +59,7 @@ public class Q00348_AnArrogantSearch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
index fd775bbe73..bc785abac1 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
@@ -60,7 +60,7 @@ public class Q00354_ConquestOfAlligatorIsland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
index ee19b7e4ab..fbcd365dc3 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
@@ -87,7 +87,7 @@ public class Q00355_FamilyHonor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
index e1633226d2..c200224cfa 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
@@ -61,7 +61,7 @@ public class Q00356_DigUpTheSeaOfSpores extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
index aca7242c87..8b51394b23 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
@@ -68,7 +68,7 @@ public class Q00358_IllegitimateChildOfTheGoddess extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
index ed0f544adc..2407d92d0f 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
@@ -59,7 +59,7 @@ public class Q00360_PlunderTheirSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
index aaf517b7a9..e910c1e70e 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
@@ -68,7 +68,7 @@ public class Q00369_CollectorOfJewels extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
index d24b38b112..c6c223f5a1 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
@@ -70,7 +70,7 @@ public class Q00370_AnElderSowsSeeds extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java
index b3a3806366..fa5550e2a2 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java
@@ -58,7 +58,7 @@ public class Q00374_WhisperOfDreamsPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java
index e0b18fa2f5..04b9844110 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java
@@ -56,7 +56,7 @@ public class Q00375_WhisperOfDreamsPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
index 7773083c9a..c29c87b26d 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
@@ -65,7 +65,7 @@ public class Q00401_PathOfTheWarrior extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
index 1f140e4e80..e6fabbe5e9 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
@@ -90,7 +90,7 @@ public class Q00402_PathOfTheHumanKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
index bd13a4bbe9..9bd736acaa 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
@@ -93,7 +93,7 @@ public class Q00403_PathOfTheRogue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
index 4b0285fcef..ac44dd64d6 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
@@ -72,7 +72,7 @@ public class Q00404_PathOfTheHumanWizard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
index 455a88115a..b7ad34d507 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
@@ -68,7 +68,7 @@ public class Q00405_PathOfTheCleric extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
index 60a2100263..fcb92b0837 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
@@ -73,7 +73,7 @@ public class Q00406_PathOfTheElvenKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
index e8ae130e75..89dbb1cea4 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
@@ -67,7 +67,7 @@ public class Q00407_PathOfTheElvenScout extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
index e35ea8444b..86dd94df1f 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
@@ -70,7 +70,7 @@ public class Q00408_PathOfTheElvenWizard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
index 809b741536..1e788f366f 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
@@ -66,7 +66,7 @@ public class Q00409_PathOfTheElvenOracle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
index 261122d3ff..727d4148f0 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
@@ -62,7 +62,7 @@ public class Q00410_PathOfThePalusKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
index d0849cb9a0..b6bd1f946a 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
@@ -62,7 +62,7 @@ public class Q00411_PathOfTheAssassin extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
index a2a12199b7..fda1cd4beb 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
@@ -69,7 +69,7 @@ public class Q00412_PathOfTheDarkWizard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
index cf84a5a883..55897e0028 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
@@ -66,7 +66,7 @@ public class Q00413_PathOfTheShillienOracle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
index 9bd2adec48..34d1af1f9c 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
@@ -65,7 +65,7 @@ public class Q00414_PathOfTheOrcRaider extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
index 0d21264633..3b6f7f4fb5 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
@@ -90,7 +90,7 @@ public class Q00415_PathOfTheOrcMonk extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
index 6a0fb18a23..1b62cbad54 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
@@ -88,7 +88,7 @@ public class Q00416_PathOfTheOrcShaman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
index 2e9a9937b5..973de273fc 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
@@ -84,7 +84,7 @@ public class Q00417_PathOfTheScavenger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
index 23061e130c..43770b4eb1 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
@@ -66,7 +66,7 @@ public class Q00418_PathOfTheArtisan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
index 580ce30c7b..1b7cebae69 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
@@ -68,7 +68,7 @@ public class Q00500_BrothersBoundInChains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
index c6c6541b90..e40f43ea81 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
@@ -82,7 +82,7 @@ public class Q00662_AGameOfCards extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss.java
index 6b14892016..e986187f8e 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss.java
@@ -51,7 +51,7 @@ public class Q00933_ExploringTheWestWingOfTheDungeonOfAbyss extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss.java
index ba47f428b9..c8765f54cf 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss.java
@@ -51,7 +51,7 @@ public class Q00935_ExploringTheEastWingOfTheDungeonOfAbyss extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q10866_PunitiveOperationOnTheDevilIsle/Q10866_PunitiveOperationOnTheDevilIsle.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q10866_PunitiveOperationOnTheDevilIsle/Q10866_PunitiveOperationOnTheDevilIsle.java
index 236a65502b..fa4bf40711 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q10866_PunitiveOperationOnTheDevilIsle/Q10866_PunitiveOperationOnTheDevilIsle.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q10866_PunitiveOperationOnTheDevilIsle/Q10866_PunitiveOperationOnTheDevilIsle.java
@@ -52,7 +52,7 @@ public class Q10866_PunitiveOperationOnTheDevilIsle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q10993_FutureDwarves/Q10993_FutureDwarves.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q10993_FutureDwarves/Q10993_FutureDwarves.java
index 250e3a8995..013242d4b2 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q10993_FutureDwarves/Q10993_FutureDwarves.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q10993_FutureDwarves/Q10993_FutureDwarves.java
@@ -57,7 +57,7 @@ public class Q10993_FutureDwarves extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q10994_FutureOrcs/Q10994_FutureOrcs.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q10994_FutureOrcs/Q10994_FutureOrcs.java
index 238e0fa458..f96df09a5c 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q10994_FutureOrcs/Q10994_FutureOrcs.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q10994_FutureOrcs/Q10994_FutureOrcs.java
@@ -56,7 +56,7 @@ public class Q10994_FutureOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java
index 7c85f8822b..1c1dd0364d 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java
@@ -73,7 +73,7 @@ public class Q10995_MutualBenefit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java
index 26f7bd0b77..68cf354548 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java
@@ -74,7 +74,7 @@ public class Q10996_TemplesDecorations extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q10997_LoserPriest1/Q10997_LoserPriest1.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q10997_LoserPriest1/Q10997_LoserPriest1.java
index 686ade6c04..63fa9936c2 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q10997_LoserPriest1/Q10997_LoserPriest1.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q10997_LoserPriest1/Q10997_LoserPriest1.java
@@ -68,7 +68,7 @@ public class Q10997_LoserPriest1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java
index 5bf66e5740..f558135c8c 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java
@@ -67,7 +67,7 @@ public class Q10998_LoserPriest2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java
index 7a6abe643a..42f08ebc69 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java
@@ -70,7 +70,7 @@ public class Q10999_LoserPriest3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11000_MoonKnight/Q11000_MoonKnight.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11000_MoonKnight/Q11000_MoonKnight.java
index f5b2632cfc..990ed4ca8c 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11000_MoonKnight/Q11000_MoonKnight.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11000_MoonKnight/Q11000_MoonKnight.java
@@ -87,7 +87,7 @@ public class Q11000_MoonKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java
index d785928ae4..30433b7906 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java
@@ -71,7 +71,7 @@ public class Q11001_TombsOfAncestors extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java
index b96385a241..00197d8383 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java
@@ -73,7 +73,7 @@ public class Q11002_HelpWithTempleRestoration extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java
index 19bad0e3f6..2740ba7cde 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java
@@ -72,7 +72,7 @@ public class Q11003_PerfectLeatherArmor1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java
index cb6a7a0ee9..da42f6b60d 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java
@@ -71,7 +71,7 @@ public class Q11004_PerfectLeatherArmor2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java
index 405848b6c2..d7a0f220be 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java
@@ -71,7 +71,7 @@ public class Q11005_PerfectLeatherArmor3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11006_FuturePeople/Q11006_FuturePeople.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11006_FuturePeople/Q11006_FuturePeople.java
index 926f1dd745..922772d391 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11006_FuturePeople/Q11006_FuturePeople.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11006_FuturePeople/Q11006_FuturePeople.java
@@ -61,7 +61,7 @@ public class Q11006_FuturePeople extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java
index eb48ad1fa4..49c35c4534 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java
@@ -71,7 +71,7 @@ public class Q11007_NoiseInWoods extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java
index ebba66e998..9e31adcb6c 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java
@@ -75,7 +75,7 @@ public class Q11008_PreparationForDungeon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java
index 5efbb08add..93e5cd7383 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java
@@ -66,7 +66,7 @@ public class Q11009_NewPotionDevelopment1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java
index 6fc7075973..5aa513eabc 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java
@@ -68,7 +68,7 @@ public class Q11010_NewPotionDevelopment2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java
index f2e64bdfe7..e71754ecd3 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java
@@ -67,7 +67,7 @@ public class Q11011_NewPotionDevelopment3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11012_FutureElves/Q11012_FutureElves.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11012_FutureElves/Q11012_FutureElves.java
index 10c21ab330..44ee19386e 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11012_FutureElves/Q11012_FutureElves.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11012_FutureElves/Q11012_FutureElves.java
@@ -57,7 +57,7 @@ public class Q11012_FutureElves extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java
index 59082963ba..abdcd1da60 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java
@@ -73,7 +73,7 @@ public class Q11013_ShilensHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java
index 8b5bad8107..aaf4f82a76 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java
@@ -75,7 +75,7 @@ public class Q11014_SurpriseGift extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java
index d94a21b683..352933250b 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java
@@ -72,7 +72,7 @@ public class Q11015_PrepareForTrade1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java
index 911eaff20a..f194ab0ffe 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java
@@ -71,7 +71,7 @@ public class Q11016_PrepareForTrade2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java
index 48c8a15d51..911a806b55 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java
@@ -71,7 +71,7 @@ public class Q11017_PrepareForTrade3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11018_FutureDarkElves/Q11018_FutureDarkElves.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11018_FutureDarkElves/Q11018_FutureDarkElves.java
index bbe6a3fac5..ae2938c9c2 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11018_FutureDarkElves/Q11018_FutureDarkElves.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11018_FutureDarkElves/Q11018_FutureDarkElves.java
@@ -59,7 +59,7 @@ public class Q11018_FutureDarkElves extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java
index dcc694115b..5c9f57e024 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java
@@ -72,7 +72,7 @@ public class Q11019_TribalBenefit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java
index 7ee3670bb9..5a9acbdebe 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java
@@ -72,7 +72,7 @@ public class Q11020_BlacksmithsRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java
index 0aac259082..28377ffe0b 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java
@@ -70,7 +70,7 @@ public class Q11021_RedGemNecklace1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java
index 1e5796e1d0..8f5191d574 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java
@@ -69,7 +69,7 @@ public class Q11022_RedGemNecklace2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java
index 53d77fa2e6..5c6641ea5e 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java
@@ -67,7 +67,7 @@ public class Q11023_RedGemNecklace3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
index 06ea44ceb1..6698687a4e 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
@@ -45,7 +45,7 @@ public class AllianceMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!"9001-01.htm".equals(event) && (player.getClan() == null))
 		{
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
index b69c69d8d0..b9cae10d1b 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
@@ -74,7 +74,7 @@ public class ClanMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LEADER_REQUIRED.containsKey(event) && !player.isClanLeader())
 		{
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
index 472b265d19..7560171dd1 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
@@ -61,7 +61,7 @@ public class DarkElfChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
index 9bed690c7f..db6419750d 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
@@ -74,7 +74,7 @@ public class DarkElfChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
index b90395d96a..fe46f96453 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
@@ -50,7 +50,7 @@ public class DwarfBlacksmithChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
index b658cd201b..95f42d44e2 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
@@ -55,7 +55,7 @@ public class DwarfBlacksmithChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
index 187710070c..df7368de42 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
@@ -50,7 +50,7 @@ public class DwarfWarehouseChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
index bcd1325051..e18b5c69e4 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
@@ -54,7 +54,7 @@ public class DwarfWarehouseChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
index b093c78e1d..bb0473e235 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
@@ -58,7 +58,7 @@ public class ElfHumanClericChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
index c0cf3513d7..eff155a55f 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
@@ -59,7 +59,7 @@ public class ElfHumanFighterChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
index 2095c50482..d43d533d9a 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
@@ -73,7 +73,7 @@ public class ElfHumanFighterChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
index ed623b52b0..c5b843fdc1 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
@@ -57,7 +57,7 @@ public class ElfHumanWizardChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
index 78b198c5a5..6482a77a8e 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
@@ -62,7 +62,7 @@ public class ElfHumanWizardChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
index acf6f9bc2f..1a231cd5d9 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
@@ -53,7 +53,7 @@ public class FirstClassTransferTalk extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return event;
 	}
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
index e3c48b1f33..324f48a504 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
@@ -51,7 +51,7 @@ public class OrcChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
index c78c927bae..221cff8bde 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
@@ -62,7 +62,7 @@ public class OrcChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/Quest.java
index f343e5d8e9..252c508537 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/Quest.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/Quest.java
@@ -245,7 +245,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -267,7 +267,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -558,7 +558,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 			{
 				player.setSimulatedTalking(false);
 			}
-			res = onAdvEvent(event, npc, player);
+			res = onEvent(event, npc, player);
 		}
 		catch (Exception e)
 		{
@@ -1020,12 +1020,11 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 */
 	public String onDeath(Creature killer, Creature victim, QuestState qs)
 	{
-		return onAdvEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
+		return onEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
 	}
 	
 	/**
 	 * This function is called whenever a player clicks on a link in a quest dialog and whenever a timer fires.<br>
-	 * If is not overridden by a subclass, then default to the returned value of the simpler (and older) {@link #onEvent(String, QuestState)} override.<br>
 	 * If the player has a quest state, use it as parameter in the next call, otherwise return null.
 	 * @param event this parameter contains a string identifier for the event.<br>
 	 *            Generally, this string is passed directly via the link.<br>
@@ -1044,35 +1043,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 *            This parameter may be {@code null} in certain circumstances.
 	 * @return the text returned by the event (may be {@code null}, a filename or just text)
 	 */
-	public String onAdvEvent(String event, Npc npc, Player player)
-	{
-		if (player != null)
-		{
-			final QuestState qs = player.getQuestState(getName());
-			if (qs != null)
-			{
-				return onEvent(event, qs);
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * This function is called in place of {@link #onAdvEvent(String, Npc, Player)} if the former is not implemented.<br>
-	 * If a script contains both {@link #onAdvEvent(String, Npc, Player)} and this implementation, then this method will never be called unless the script's {@link #onAdvEvent(String, Npc, Player)} explicitly calls this method.
-	 * @param event this parameter contains a string identifier for the event.<br>
-	 *            Generally, this string is passed directly via the link.<br>
-	 *            For example:<br>
-	 *            <code>
-	 *            &lt;a action="bypass -h Quest 626_ADarkTwilight 31517-01.htm"&gt;hello&lt;/a&gt;
-	 *            </code><br>
-	 *            The above link sets the event variable to "31517-01.htm" for the quest 626_ADarkTwilight.<br>
-	 *            In the case of timers, this will be the name of the timer.<br>
-	 *            This parameter serves as a sort of identifier.
-	 * @param qs this parameter contains a reference to the quest state of the player who used the link or started the timer.
-	 * @return the text returned by the event (may be {@code null}, a filename or just text)
-	 */
-	public String onEvent(String event, QuestState qs)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return null;
 	}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java
index 3817e1be30..db707fe326 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java
@@ -49,7 +49,7 @@ public class Fellow extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DungeonOfAbyss/DungeonOfAbyssZone.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DungeonOfAbyss/DungeonOfAbyssZone.java
index 439e3d440e..440119f080 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DungeonOfAbyss/DungeonOfAbyssZone.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DungeonOfAbyss/DungeonOfAbyssZone.java
@@ -53,7 +53,7 @@ public class DungeonOfAbyssZone extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("EXIT_PLAYER") && (player != null))
 		{
@@ -90,7 +90,7 @@ public class DungeonOfAbyssZone extends AbstractNpcAI
 				player.teleToLocation(EXIT_LOCATION_4);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Ingrit.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Ingrit.java
index 8d6242081a..34a9393fad 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Ingrit.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Ingrit.java
@@ -59,7 +59,7 @@ public class Ingrit extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc.getId() == SOUL_TRACKER_INRGIT)
 		{
@@ -99,7 +99,7 @@ public class Ingrit extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Iris.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Iris.java
index 6077a611dd..78c008e99d 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Iris.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Iris.java
@@ -59,7 +59,7 @@ public class Iris extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc.getId() == SOUL_TRACKER_IRIS)
 		{
@@ -99,7 +99,7 @@ public class Iris extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Magrit.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Magrit.java
index 420cffb53a..e69b4d1f47 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Magrit.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Magrit.java
@@ -59,7 +59,7 @@ public class Magrit extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc.getId() == SOUL_TRACKER_MARGIT)
 		{
@@ -99,7 +99,7 @@ public class Magrit extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Rosammy.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Rosammy.java
index e2dadf67e9..0d0b09c0c7 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Rosammy.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DungeonOfAbyss/SoulTracker/Rosammy.java
@@ -59,7 +59,7 @@ public class Rosammy extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc.getId() == SOUL_TRACKER_ROSAMMY)
 		{
@@ -99,7 +99,7 @@ public class Rosammy extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DungeonOfAbyss/Tores/Tores.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DungeonOfAbyss/Tores/Tores.java
index ab4f6e34c2..cabb6b15c7 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DungeonOfAbyss/Tores/Tores.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DungeonOfAbyss/Tores/Tores.java
@@ -55,7 +55,7 @@ public class Tores extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -86,7 +86,7 @@ public class Tores extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
index a26e6075fd..31fc2ba199 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
@@ -43,12 +43,12 @@ public class Toma extends AbstractNpcAI
 	private Toma()
 	{
 		addFirstTalkId(TOMA);
-		onAdvEvent("RESPAWN_TOMA", null, null);
+		onEvent("RESPAWN_TOMA", null, null);
 		startQuestTimer("RESPAWN_TOMA", TELEPORT_DELAY, null, null, true);
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("RESPAWN_TOMA"))
 		{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
index 6f8858a2a4..dd735beeaa 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
@@ -41,7 +41,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -54,7 +54,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 				npc.deleteMe();
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_DAY_NIGHT_CHANGE)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
index 76379f11ef..9e3b09ef23 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
@@ -38,14 +38,14 @@ public class Roxxy extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TEXT_SPAM") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SPEAK_WITH_ME_ABOUT_TRAVELING_AROUND_ADEN, 1000);
 			startQuestTimer("TEXT_SPAM", getRandom(10000, 30000), npc, null, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
index 143e9f48cd..158b1a72e0 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
@@ -49,7 +49,7 @@ public class Arushinai extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("30401-1.htm") || event.equals("30401-2.htm"))
 		{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java
index d918a2bfc3..801a77996a 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java
@@ -49,7 +49,7 @@ public class Ateld extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
index 6ee6719c50..ec7aecde57 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
@@ -47,7 +47,7 @@ public class DimensionalVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("30952-1.htm") || event.equals("30952-2.htm") || event.equals("30952-3.htm"))
 		{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index d236e19d43..a5157acfc7 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -193,7 +193,7 @@ public class Antharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -605,7 +605,7 @@ public class Antharas extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 4a01a9e786..b5610ec889 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -164,7 +164,7 @@ public class Baium extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -478,7 +478,7 @@ public class Baium extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Core/Core.java
index 71150c1323..b9dcb38092 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -142,7 +142,7 @@ public class Core extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
@@ -161,7 +161,7 @@ public class Core extends AbstractNpcAI
 			_minions.forEach(Attackable::decayMe);
 			_minions.clear();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/LimitBarrier.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/LimitBarrier.java
index 519a03b7d5..af21137169 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/LimitBarrier.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/LimitBarrier.java
@@ -150,7 +150,7 @@ public class LimitBarrier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -179,7 +179,7 @@ public class LimitBarrier extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index c263b212f3..b2d3b91356 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -180,7 +180,7 @@ public class Orfen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -263,7 +263,7 @@ public class Orfen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 93735c996b..72e174bb65 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -155,7 +155,7 @@ public class QueenAnt extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -239,7 +239,7 @@ public class QueenAnt extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java
index 51bd8a03e0..daa7e95811 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java
@@ -76,7 +76,7 @@ public class SevenSignsRBs extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
index c26bb52f9c..31de5b2324 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
@@ -70,13 +70,13 @@ public class Zaken extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("zaken_unlock"))
 		{
 			spawnBoss();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private void spawnBoss()
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index 04fed5ab1b..b95d115b2c 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -59,7 +59,7 @@ public class ArenaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -124,7 +124,7 @@ public class ArenaManager extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java
index c65d275482..7a1750b82f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java
@@ -44,7 +44,7 @@ public class AttributeMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("learn".equalsIgnoreCase(event))
 		{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
index b07792cd2d..11b8786523 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
@@ -57,7 +57,7 @@ public class CastleBlacksmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return (event.equalsIgnoreCase(npc.getId() + "-02.html") && hasRights(player, npc)) ? event : null;
 	}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
index bb01178f53..0a2d84b789 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
@@ -393,7 +393,7 @@ public class CastleChamberlain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Castle castle = npc.getCastle();
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
index b9c1f3faf5..70bae86615 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
@@ -72,7 +72,7 @@ public class CastleDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
index bb32dde319..a319e3977f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
@@ -56,7 +56,7 @@ public class CastleMercenaryManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index a2bf4617a1..06a742f8c8 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -78,7 +78,7 @@ public class CastleTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
@@ -168,7 +168,7 @@ public class CastleTeleporter extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
index bffed40bcc..ea1b40c41c 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
@@ -52,7 +52,7 @@ public class CastleWarehouse extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final boolean isMyLord = player.isClanLeader() && (player.getClan().getCastleId() == (npc.getCastle() != null ? npc.getCastle().getResidenceId() : -1));
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index 62d432cf52..c04c4e5ab1 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -64,7 +64,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
index a86581206e..afd7250ca4 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
@@ -57,7 +57,7 @@ public class ClanHallDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 490a87012a..c43403fae7 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -98,7 +98,7 @@ public class ClanHallManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 53c4644013..6a40a48f58 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -232,7 +232,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		if (!_isEnabled)
 		{
@@ -823,7 +823,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	{
 		if (event.getCommand().startsWith("Quest ClassMaster "))
 		{
-			final String html = onAdvEvent(event.getCommand().substring(18), null, event.getPlayer());
+			final String html = onEvent(event.getCommand().substring(18), null, event.getPlayer());
 			event.getPlayer().sendPacket(TutorialCloseHtml.STATIC_PACKET);
 			showResult(event.getPlayer(), html);
 		}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java
index afd9963ad2..8513f066dd 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java
@@ -52,7 +52,7 @@ public class DimensionalMerchant extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/DivineBeast.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/DivineBeast.java
index 1f247a7b35..3f3a076992 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/DivineBeast.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/DivineBeast.java
@@ -44,7 +44,7 @@ public class DivineBeast extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player == null) || !player.hasServitors())
 		{
@@ -55,7 +55,7 @@ public class DivineBeast extends AbstractNpcAI
 			cancelQuestTimer(event, npc, player);
 			player.getServitors().values().forEach(summon -> summon.unSummon(player));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
index bebd43fe6c..241ad279cd 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
@@ -68,7 +68,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
index 8124bbbfcc..40455ac26a 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
@@ -57,7 +57,7 @@ public class NewbieGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("0"))
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
index acc83d72d8..27ab7e4f74 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
@@ -69,7 +69,7 @@ public class OlyBuffer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.startsWith("giveBuff;") && (npc.getScriptValue() < 5))
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index 201f3843ba..f08fb759ac 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -70,7 +70,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
index 21d281c6c9..435f293345 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
@@ -84,7 +84,7 @@ public class Proclaimer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("giveBuff"))
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
index ea0a8a16da..1fc1737173 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
@@ -79,7 +79,7 @@ public class ProvisionalHalls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/RandomWalkingGuards.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
index 8138dee3ee..ffe4fd87f1 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
@@ -48,7 +48,7 @@ public class RandomWalkingGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("RANDOM_WALK") && (npc != null))
 		{
@@ -59,7 +59,7 @@ public class RandomWalkingGuards extends AbstractNpcAI
 			}
 			startQuestTimer("RANDOM_WALK", getRandom(MIN_WALK_DELAY, MAX_WALK_DELAY), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/Servitors/SinEater.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/Servitors/SinEater.java
index 1ed8d645a5..d7536614e8 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/Servitors/SinEater.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/Servitors/SinEater.java
@@ -48,7 +48,7 @@ public class SinEater extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TALK") && (player != null) && (player.getPet() != null))
 		{
@@ -79,7 +79,7 @@ public class SinEater extends AbstractNpcAI
 			}
 			startQuestTimer("TALK", 60000, null, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_CREATURE_DEATH)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
index 59d7caa30e..30731ac83e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
@@ -51,7 +51,7 @@ public class SymbolMaker extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
index 04d4672c76..b595c4d6d4 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
@@ -86,7 +86,7 @@ public class ToIVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int npcId = npc.getId();
 		
@@ -132,7 +132,7 @@ public class ToIVortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index 356236cfc7..bf5b0506dc 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -188,7 +188,7 @@ public class WyvernManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
index 0c2e7586c9..c49be5297b 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
@@ -36,7 +36,7 @@ public class DelevelManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.DELEVEL_MANAGER_ENABLED)
 		{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
index ff6d40ec0e..4713803f1d 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
@@ -54,7 +54,7 @@ public class FactionSystem extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class FactionSystem extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
index 8b9c676ad5..771c8a9058 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
@@ -34,7 +34,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -77,7 +77,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 				npc.broadcastInfo(); // update flag status
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
index 669fcfc85c..ddf7e923eb 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
@@ -39,7 +39,7 @@ public class NoblessMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.NOBLESS_MASTER_ENABLED)
 		{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
index 4f0f0c988a..5ba22124c1 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
@@ -215,7 +215,7 @@ public class NpcLocationInfo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (Util.isDigit(event))
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
index 8e1f84c102..3a9b5b4bdc 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
@@ -169,7 +169,7 @@ public class Deathmatch extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
index 1eb84eca93..b92bbe7f77 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
@@ -213,7 +213,7 @@ public class Rabbits extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/events/Race/Race.java
index ff9fc462f6..6ac325ca6f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/events/Race/Race.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/events/Race/Race.java
@@ -320,7 +320,7 @@ public class Race extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index e827184ae4..60da9f13d3 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -186,7 +186,7 @@ public class TvT extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index 53d917a5c7..a00de57ae5 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -44,7 +44,7 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/HappyHours/HappyHours.java
index e76af2108a..eb247dbbb3 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/HappyHours/HappyHours.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/HappyHours/HappyHours.java
@@ -49,7 +49,7 @@ public class HappyHours extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/LetterCollector/LetterCollector.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
index 9030e46d76..da0d972c5b 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/LetterCollector/LetterCollector.java
@@ -73,7 +73,7 @@ public class LetterCollector extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
index 762cde5596..245342a91e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
@@ -45,7 +45,7 @@ public class ThePowerOfLove extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/TotalRecall/TotalRecall.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
index 4486ac5f36..a5448d4db5 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
@@ -42,7 +42,7 @@ public class TotalRecall extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
index 5de1a19cd2..3e745b3d08 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
@@ -354,7 +354,7 @@ public class WatermelonNinja extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/GolbergRoom/GolbergRoom.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/GolbergRoom/GolbergRoom.java
index a196281f12..ebf3e7ed68 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/GolbergRoom/GolbergRoom.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/GolbergRoom/GolbergRoom.java
@@ -137,7 +137,7 @@ public class GolbergRoom extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java
index 5c7f1dfd06..b489560d58 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java
@@ -166,7 +166,7 @@ public class LastImperialTomb extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java
index c1334f906a..96dcb6d101 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java
@@ -62,7 +62,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java
index 385ed785ea..405186c523 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java
@@ -92,7 +92,7 @@ public class MonsterArena extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/ResidenceOfKingIgnis/ResidenceOfKingIgnis.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/ResidenceOfKingIgnis/ResidenceOfKingIgnis.java
index e751cffbb9..aa4b1b8ebe 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/ResidenceOfKingIgnis/ResidenceOfKingIgnis.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/ResidenceOfKingIgnis/ResidenceOfKingIgnis.java
@@ -70,7 +70,7 @@ public class ResidenceOfKingIgnis extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/ResidenceOfKingPetram/ResidenceOfKingPetram.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/ResidenceOfKingPetram/ResidenceOfKingPetram.java
index df955bf126..9fc1dfcd13 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/ResidenceOfKingPetram/ResidenceOfKingPetram.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/ResidenceOfKingPetram/ResidenceOfKingPetram.java
@@ -55,7 +55,7 @@ public class ResidenceOfKingPetram extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/ResidenceOfKingProcella/ResidenceOfKingProcella.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/ResidenceOfKingProcella/ResidenceOfKingProcella.java
index 43a715ab2e..08d2de3463 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/ResidenceOfKingProcella/ResidenceOfKingProcella.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/ResidenceOfKingProcella/ResidenceOfKingProcella.java
@@ -55,7 +55,7 @@ public class ResidenceOfKingProcella extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/ResidenceOfQueenNebula/ResidenceOfQueenNebula.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/ResidenceOfQueenNebula/ResidenceOfQueenNebula.java
index 0e53cd55e0..401dfac407 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/ResidenceOfQueenNebula/ResidenceOfQueenNebula.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/ResidenceOfQueenNebula/ResidenceOfQueenNebula.java
@@ -62,7 +62,7 @@ public class ResidenceOfQueenNebula extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
index 24aa967f60..f348ed1ada 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
@@ -52,7 +52,7 @@ public class Q00127_FishingSpecialistsRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
index a1dc46ce02..80147d284b 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
@@ -146,7 +146,7 @@ public class Q00255_Tutorial extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
index a7c0756abb..24aef6ae0c 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
@@ -66,7 +66,7 @@ public class Q00300_HuntingLetoLizardman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
index dc3eb65ec4..2566d50918 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
@@ -69,7 +69,7 @@ public class Q00326_VanquishRemnants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
index 1956e2923e..99a18a2d23 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
@@ -105,7 +105,7 @@ public class Q00327_RecoverTheFarmland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
index 64cc6ef8e9..b8d1a39d6c 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
@@ -70,7 +70,7 @@ public class Q00328_SenseForBusiness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
index 72407eabc3..25eb32f4d0 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
@@ -62,7 +62,7 @@ public class Q00329_CuriosityOfADwarf extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
index 518d845bcc..dd71a57310 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
@@ -65,7 +65,7 @@ public class Q00331_ArrowOfVengeance extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
index 498b165be2..02f12606c7 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
@@ -121,7 +121,7 @@ public class Q00333_HuntOfTheBlackLion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		final int chance = getRandom(100);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
index 5f664a5fed..1031fbb7fb 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
@@ -85,7 +85,7 @@ public class Q00344_1000YearsTheEndOfLamentation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
index fd775bbe73..bc785abac1 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
@@ -60,7 +60,7 @@ public class Q00354_ConquestOfAlligatorIsland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
index ee19b7e4ab..fbcd365dc3 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
@@ -87,7 +87,7 @@ public class Q00355_FamilyHonor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
index e1633226d2..c200224cfa 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
@@ -61,7 +61,7 @@ public class Q00356_DigUpTheSeaOfSpores extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
index aca7242c87..8b51394b23 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
@@ -68,7 +68,7 @@ public class Q00358_IllegitimateChildOfTheGoddess extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
index ed0f544adc..2407d92d0f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
@@ -59,7 +59,7 @@ public class Q00360_PlunderTheirSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
index aaf517b7a9..e910c1e70e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
@@ -68,7 +68,7 @@ public class Q00369_CollectorOfJewels extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
index d24b38b112..c6c223f5a1 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
@@ -70,7 +70,7 @@ public class Q00370_AnElderSowsSeeds extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
index 580ce30c7b..1b7cebae69 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
@@ -68,7 +68,7 @@ public class Q00500_BrothersBoundInChains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
index c6c6541b90..e40f43ea81 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
@@ -82,7 +82,7 @@ public class Q00662_AGameOfCards extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss.java
index 6b14892016..e986187f8e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss.java
@@ -51,7 +51,7 @@ public class Q00933_ExploringTheWestWingOfTheDungeonOfAbyss extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss.java
index ba47f428b9..c8765f54cf 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss.java
@@ -51,7 +51,7 @@ public class Q00935_ExploringTheEastWingOfTheDungeonOfAbyss extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java
index 53477281a9..2af545868d 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java
@@ -116,7 +116,7 @@ public class Q10673_SagaOfLegend extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10866_PunitiveOperationOnTheDevilIsle/Q10866_PunitiveOperationOnTheDevilIsle.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10866_PunitiveOperationOnTheDevilIsle/Q10866_PunitiveOperationOnTheDevilIsle.java
index 236a65502b..fa4bf40711 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10866_PunitiveOperationOnTheDevilIsle/Q10866_PunitiveOperationOnTheDevilIsle.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10866_PunitiveOperationOnTheDevilIsle/Q10866_PunitiveOperationOnTheDevilIsle.java
@@ -52,7 +52,7 @@ public class Q10866_PunitiveOperationOnTheDevilIsle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10961_EffectiveTraining/Q10961_EffectiveTraining.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10961_EffectiveTraining/Q10961_EffectiveTraining.java
index 193ce43783..7c1ff9901a 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10961_EffectiveTraining/Q10961_EffectiveTraining.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10961_EffectiveTraining/Q10961_EffectiveTraining.java
@@ -73,7 +73,7 @@ public class Q10961_EffectiveTraining extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java
index 601a9f6d22..4e98a4ea33 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java
@@ -96,7 +96,7 @@ public class Q10962_NewHorizons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10963_ExploringTheAntNest/Q10963_ExploringTheAntNest.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10963_ExploringTheAntNest/Q10963_ExploringTheAntNest.java
index 1457bd3b8d..e9e4c3d5de 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10963_ExploringTheAntNest/Q10963_ExploringTheAntNest.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10963_ExploringTheAntNest/Q10963_ExploringTheAntNest.java
@@ -73,7 +73,7 @@ public class Q10963_ExploringTheAntNest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10964_SecretGarden/Q10964_SecretGarden.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10964_SecretGarden/Q10964_SecretGarden.java
index 7786d4b871..644a0e08a7 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10964_SecretGarden/Q10964_SecretGarden.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10964_SecretGarden/Q10964_SecretGarden.java
@@ -68,7 +68,7 @@ public class Q10964_SecretGarden extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10965_DeathMysteries/Q10965_DeathMysteries.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10965_DeathMysteries/Q10965_DeathMysteries.java
index 096384ddc2..d830411664 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10965_DeathMysteries/Q10965_DeathMysteries.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10965_DeathMysteries/Q10965_DeathMysteries.java
@@ -73,7 +73,7 @@ public class Q10965_DeathMysteries extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10966_ATripBegins/Q10966_ATripBegins.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10966_ATripBegins/Q10966_ATripBegins.java
index 9c406fb1b2..430f000c58 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10966_ATripBegins/Q10966_ATripBegins.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10966_ATripBegins/Q10966_ATripBegins.java
@@ -78,7 +78,7 @@ public class Q10966_ATripBegins extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10967_CulturedAdventurer/Q10967_CulturedAdventurer.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10967_CulturedAdventurer/Q10967_CulturedAdventurer.java
index 5419e24c3c..c355fbf6ea 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10967_CulturedAdventurer/Q10967_CulturedAdventurer.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10967_CulturedAdventurer/Q10967_CulturedAdventurer.java
@@ -65,7 +65,7 @@ public class Q10967_CulturedAdventurer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10981_UnbearableWolvesHowling/Q10981_UnbearableWolvesHowling.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10981_UnbearableWolvesHowling/Q10981_UnbearableWolvesHowling.java
index c0ebd048b0..ab7c7624ca 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10981_UnbearableWolvesHowling/Q10981_UnbearableWolvesHowling.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10981_UnbearableWolvesHowling/Q10981_UnbearableWolvesHowling.java
@@ -71,7 +71,7 @@ public class Q10981_UnbearableWolvesHowling extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java
index b2c5cd9f7c..ef42a235a5 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java
@@ -95,7 +95,7 @@ public class Q10982_SpiderHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10983_TroubledForest/Q10983_TroubledForest.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10983_TroubledForest/Q10983_TroubledForest.java
index 5ac7f5bf65..38963c8a0d 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10983_TroubledForest/Q10983_TroubledForest.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10983_TroubledForest/Q10983_TroubledForest.java
@@ -71,7 +71,7 @@ public class Q10983_TroubledForest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java
index da995b57e2..e646821272 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java
@@ -91,7 +91,7 @@ public class Q10984_CollectSpiderweb extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10985_CleaningUpTheGround/Q10985_CleaningUpTheGround.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10985_CleaningUpTheGround/Q10985_CleaningUpTheGround.java
index 5fd69f2ec7..415a26c548 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10985_CleaningUpTheGround/Q10985_CleaningUpTheGround.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10985_CleaningUpTheGround/Q10985_CleaningUpTheGround.java
@@ -72,7 +72,7 @@ public class Q10985_CleaningUpTheGround extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java
index a7c9d528b1..c966a02daa 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java
@@ -96,7 +96,7 @@ public class Q10986_SwampMonster extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10987_PlunderedGraves/Q10987_PlunderedGraves.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10987_PlunderedGraves/Q10987_PlunderedGraves.java
index 2534cc27ec..a426ce1505 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10987_PlunderedGraves/Q10987_PlunderedGraves.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10987_PlunderedGraves/Q10987_PlunderedGraves.java
@@ -72,7 +72,7 @@ public class Q10987_PlunderedGraves extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java
index 71853fa8c7..ae6187f327 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java
@@ -96,7 +96,7 @@ public class Q10988_Conspiracy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10989_DangerousPredators/Q10989_DangerousPredators.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10989_DangerousPredators/Q10989_DangerousPredators.java
index 00acf59f3d..62dedfce47 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10989_DangerousPredators/Q10989_DangerousPredators.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10989_DangerousPredators/Q10989_DangerousPredators.java
@@ -72,7 +72,7 @@ public class Q10989_DangerousPredators extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java
index 49833b0db6..3d2122f8ba 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java
@@ -94,7 +94,7 @@ public class Q10990_PoisonExtraction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
index 06ea44ceb1..6698687a4e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
@@ -45,7 +45,7 @@ public class AllianceMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!"9001-01.htm".equals(event) && (player.getClan() == null))
 		{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
index b69c69d8d0..b9cae10d1b 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
@@ -74,7 +74,7 @@ public class ClanMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LEADER_REQUIRED.containsKey(event) && !player.isClanLeader())
 		{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
index 472b265d19..7560171dd1 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
@@ -61,7 +61,7 @@ public class DarkElfChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
index 9bed690c7f..db6419750d 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
@@ -74,7 +74,7 @@ public class DarkElfChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
index b90395d96a..fe46f96453 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
@@ -50,7 +50,7 @@ public class DwarfBlacksmithChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
index b658cd201b..95f42d44e2 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
@@ -55,7 +55,7 @@ public class DwarfBlacksmithChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
index 187710070c..df7368de42 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
@@ -50,7 +50,7 @@ public class DwarfWarehouseChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
index bcd1325051..e18b5c69e4 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
@@ -54,7 +54,7 @@ public class DwarfWarehouseChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
index b093c78e1d..bb0473e235 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
@@ -58,7 +58,7 @@ public class ElfHumanClericChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
index c0cf3513d7..eff155a55f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
@@ -59,7 +59,7 @@ public class ElfHumanFighterChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
index 2095c50482..d43d533d9a 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
@@ -73,7 +73,7 @@ public class ElfHumanFighterChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
index ed623b52b0..c5b843fdc1 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
@@ -57,7 +57,7 @@ public class ElfHumanWizardChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
index 78b198c5a5..6482a77a8e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
@@ -62,7 +62,7 @@ public class ElfHumanWizardChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
index acf6f9bc2f..1a231cd5d9 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
@@ -53,7 +53,7 @@ public class FirstClassTransferTalk extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return event;
 	}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
index e3c48b1f33..324f48a504 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
@@ -51,7 +51,7 @@ public class OrcChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
index c78c927bae..221cff8bde 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
@@ -62,7 +62,7 @@ public class OrcChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/Quest.java
index f343e5d8e9..252c508537 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/Quest.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/Quest.java
@@ -245,7 +245,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -267,7 +267,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -558,7 +558,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 			{
 				player.setSimulatedTalking(false);
 			}
-			res = onAdvEvent(event, npc, player);
+			res = onEvent(event, npc, player);
 		}
 		catch (Exception e)
 		{
@@ -1020,12 +1020,11 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 */
 	public String onDeath(Creature killer, Creature victim, QuestState qs)
 	{
-		return onAdvEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
+		return onEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
 	}
 	
 	/**
 	 * This function is called whenever a player clicks on a link in a quest dialog and whenever a timer fires.<br>
-	 * If is not overridden by a subclass, then default to the returned value of the simpler (and older) {@link #onEvent(String, QuestState)} override.<br>
 	 * If the player has a quest state, use it as parameter in the next call, otherwise return null.
 	 * @param event this parameter contains a string identifier for the event.<br>
 	 *            Generally, this string is passed directly via the link.<br>
@@ -1044,35 +1043,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 *            This parameter may be {@code null} in certain circumstances.
 	 * @return the text returned by the event (may be {@code null}, a filename or just text)
 	 */
-	public String onAdvEvent(String event, Npc npc, Player player)
-	{
-		if (player != null)
-		{
-			final QuestState qs = player.getQuestState(getName());
-			if (qs != null)
-			{
-				return onEvent(event, qs);
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * This function is called in place of {@link #onAdvEvent(String, Npc, Player)} if the former is not implemented.<br>
-	 * If a script contains both {@link #onAdvEvent(String, Npc, Player)} and this implementation, then this method will never be called unless the script's {@link #onAdvEvent(String, Npc, Player)} explicitly calls this method.
-	 * @param event this parameter contains a string identifier for the event.<br>
-	 *            Generally, this string is passed directly via the link.<br>
-	 *            For example:<br>
-	 *            <code>
-	 *            &lt;a action="bypass -h Quest 626_ADarkTwilight 31517-01.htm"&gt;hello&lt;/a&gt;
-	 *            </code><br>
-	 *            The above link sets the event variable to "31517-01.htm" for the quest 626_ADarkTwilight.<br>
-	 *            In the case of timers, this will be the name of the timer.<br>
-	 *            This parameter serves as a sort of identifier.
-	 * @param qs this parameter contains a reference to the quest state of the player who used the link or started the timer.
-	 * @return the text returned by the event (may be {@code null}, a filename or just text)
-	 */
-	public String onEvent(String event, QuestState qs)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return null;
 	}
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
index c87c4e9224..a2a2891b57 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java
@@ -56,7 +56,7 @@ public class BabyPets extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("HEAL") && (player != null))
 		{
@@ -78,7 +78,7 @@ public class BabyPets extends AbstractNpcAI
 				cancelQuestTimer("HEAL", null, player);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGOUT)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java
index b92e85550d..34c6a6a8fa 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java
@@ -470,7 +470,7 @@ public class FeedableBeasts extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("polymorph Mad Cow") && (npc != null) && (player != null))
 		{
@@ -495,7 +495,7 @@ public class FeedableBeasts extends AbstractNpcAI
 				npc.deleteMe();
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
index 44943caf9d..7f78529718 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java
@@ -56,7 +56,7 @@ public class ImprovedBabyPets extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player != null)
 		{
@@ -108,7 +108,7 @@ public class ImprovedBabyPets extends AbstractNpcAI
 				}
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
index 6b4a147550..301899a76f 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java
@@ -42,7 +42,7 @@ public class Tunatun extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = getNoQuestMsg(player);
 		switch (event)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
index fe838f52cf..ba359695c2 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/DenOfEvil/FrightenedRagnaOrc.java
@@ -77,7 +77,7 @@ public class FrightenedRagnaOrc extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
index a26e6075fd..31fc2ba199 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
@@ -43,12 +43,12 @@ public class Toma extends AbstractNpcAI
 	private Toma()
 	{
 		addFirstTalkId(TOMA);
-		onAdvEvent("RESPAWN_TOMA", null, null);
+		onEvent("RESPAWN_TOMA", null, null);
 		startQuestTimer("RESPAWN_TOMA", TELEPORT_DELAY, null, null, true);
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("RESPAWN_TOMA"))
 		{
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
index 6f8858a2a4..dd735beeaa 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
@@ -41,7 +41,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -54,7 +54,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 				npc.deleteMe();
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_DAY_NIGHT_CHANGE)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
index 8029a17703..20dfae5ccf 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/ForgeOfTheGods/ForgeOfTheGods.java
@@ -88,7 +88,7 @@ public class ForgeOfTheGods extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
index da739abf54..349e829958 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
@@ -218,7 +218,7 @@ public class FourSepulchers extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
index 37f35f00f8..ac8772d975 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
@@ -108,7 +108,7 @@ public class KetraOrcSupport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
index d398cfc3b8..2901995fbe 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
@@ -82,7 +82,7 @@ public class MonasteryOfSilence extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -130,7 +130,7 @@ public class MonasteryOfSilence extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
index 9a2ee10f60..434807bd9e 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
@@ -62,7 +62,7 @@ public class PaganTeleporters extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
index d9e9db180b..05df3fe25c 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
@@ -179,7 +179,7 @@ public class PrimevalIsle extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -239,7 +239,7 @@ public class PrimevalIsle extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
index 949fb8f279..48ca778074 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
@@ -108,7 +108,7 @@ public class VarkaSilenosSupport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (Util.isDigit(event) && BUFF.containsKey(Integer.parseInt(event)))
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index d236e19d43..a5157acfc7 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -193,7 +193,7 @@ public class Antharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -605,7 +605,7 @@ public class Antharas extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 4a01a9e786..b5610ec889 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -164,7 +164,7 @@ public class Baium extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -478,7 +478,7 @@ public class Baium extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Core/Core.java
index 71150c1323..b9dcb38092 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -142,7 +142,7 @@ public class Core extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
@@ -161,7 +161,7 @@ public class Core extends AbstractNpcAI
 			_minions.forEach(Attackable::decayMe);
 			_minions.clear();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
index 6a5fb89ca1..8da476a790 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
@@ -108,7 +108,7 @@ public class DrChaos extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("reset_drchaos"))
 		{
@@ -194,7 +194,7 @@ public class DrChaos extends AbstractNpcAI
 			}
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
index 05ca06d686..b5c344da20 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java
@@ -165,7 +165,7 @@ public class LastImperialTomb extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
index 282b9f8fbc..254c891bc5 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java
@@ -62,7 +62,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index e74bc817e6..11c8477773 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -180,7 +180,7 @@ public class Orfen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -263,7 +263,7 @@ public class Orfen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 93735c996b..72e174bb65 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -155,7 +155,7 @@ public class QueenAnt extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -239,7 +239,7 @@ public class QueenAnt extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
index ad87d93fe0..20e1572d8a 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
@@ -80,7 +80,7 @@ public class Sailren extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -249,7 +249,7 @@ public class Sailren extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index 70cffca365..2311085a80 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -191,7 +191,7 @@ public class Valakas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -380,7 +380,7 @@ public class Valakas extends AbstractNpcAI
 		{
 			BOSS_ZONE.oustAllPlayers();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
index c26bb52f9c..31de5b2324 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
@@ -70,13 +70,13 @@ public class Zaken extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("zaken_unlock"))
 		{
 			spawnBoss();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private void spawnBoss()
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index b939ece983..849ed827d3 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -63,7 +63,7 @@ public class ArenaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -128,7 +128,7 @@ public class ArenaManager extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
index b07792cd2d..11b8786523 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
@@ -57,7 +57,7 @@ public class CastleBlacksmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return (event.equalsIgnoreCase(npc.getId() + "-02.html") && hasRights(player, npc)) ? event : null;
 	}
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
index f81baa3fd9..84e3992098 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
@@ -393,7 +393,7 @@ public class CastleChamberlain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Castle castle = npc.getCastle();
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
index b9c1f3faf5..70bae86615 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
@@ -72,7 +72,7 @@ public class CastleDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
index bb32dde319..a319e3977f 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
@@ -56,7 +56,7 @@ public class CastleMercenaryManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index ac71c1afad..0e8137bb1d 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -78,7 +78,7 @@ public class CastleTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
@@ -168,7 +168,7 @@ public class CastleTeleporter extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
index bffed40bcc..ea1b40c41c 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
@@ -52,7 +52,7 @@ public class CastleWarehouse extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final boolean isMyLord = player.isClanLeader() && (player.getClan().getCastleId() == (npc.getCastle() != null ? npc.getCastle().getResidenceId() : -1));
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index 62d432cf52..c04c4e5ab1 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -64,7 +64,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
index a86581206e..afd7250ca4 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
@@ -57,7 +57,7 @@ public class ClanHallDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 35e7dc14b6..9af0053822 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -97,7 +97,7 @@ public class ClanHallManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index fbf06e9737..7b6a27fc36 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -235,7 +235,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		if (!_isEnabled)
 		{
@@ -902,7 +902,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	{
 		if (event.getCommand().startsWith("Quest ClassMaster "))
 		{
-			final String html = onAdvEvent(event.getCommand().substring(18), null, event.getPlayer());
+			final String html = onEvent(event.getCommand().substring(18), null, event.getPlayer());
 			event.getPlayer().sendPacket(TutorialCloseHtml.STATIC_PACKET);
 			showResult(event.getPlayer(), html);
 		}
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/DivineBeast.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/DivineBeast.java
index 1f247a7b35..3f3a076992 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/DivineBeast.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/DivineBeast.java
@@ -44,7 +44,7 @@ public class DivineBeast extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player == null) || !player.hasServitors())
 		{
@@ -55,7 +55,7 @@ public class DivineBeast extends AbstractNpcAI
 			cancelQuestTimer(event, npc, player);
 			player.getServitors().values().forEach(summon -> summon.unSummon(player));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/Mammons/BlacksmithOfMammon/BlacksmithOfMammon.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/Mammons/BlacksmithOfMammon/BlacksmithOfMammon.java
index 62e9995689..f6874e2b1a 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/Mammons/BlacksmithOfMammon/BlacksmithOfMammon.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/Mammons/BlacksmithOfMammon/BlacksmithOfMammon.java
@@ -48,12 +48,12 @@ public class BlacksmithOfMammon extends AbstractNpcAI
 	private BlacksmithOfMammon()
 	{
 		addFirstTalkId(BLACKSMITH);
-		onAdvEvent("RESPAWN_BLACKSMITH", null, null);
+		onEvent("RESPAWN_BLACKSMITH", null, null);
 		startQuestTimer("RESPAWN_BLACKSMITH", TELEPORT_DELAY, null, null, true);
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/Mammons/MerchantOfMammon/MerchantOfMammon.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/Mammons/MerchantOfMammon/MerchantOfMammon.java
index 4e07227d53..237a3449b6 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/Mammons/MerchantOfMammon/MerchantOfMammon.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/Mammons/MerchantOfMammon/MerchantOfMammon.java
@@ -50,12 +50,12 @@ public class MerchantOfMammon extends AbstractNpcAI
 	private MerchantOfMammon()
 	{
 		addFirstTalkId(MERCHANT);
-		onAdvEvent("RESPAWN_MERCHANT", null, null);
+		onEvent("RESPAWN_MERCHANT", null, null);
 		startQuestTimer("RESPAWN_MERCHANT", TELEPORT_DELAY, null, null, true);
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/Mammons/PriestOfMammon/PriestOfMammon.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/Mammons/PriestOfMammon/PriestOfMammon.java
index 2daff1a309..121531cdfb 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/Mammons/PriestOfMammon/PriestOfMammon.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/Mammons/PriestOfMammon/PriestOfMammon.java
@@ -45,12 +45,12 @@ public class PriestOfMammon extends AbstractNpcAI
 	private PriestOfMammon()
 	{
 		addFirstTalkId(PRIEST);
-		onAdvEvent("RESPAWN_PRIEST", null, null);
+		onEvent("RESPAWN_PRIEST", null, null);
 		startQuestTimer("RESPAWN_PRIEST", TELEPORT_DELAY, null, null, true);
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
index bbff4608fc..8812882c93 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
@@ -69,7 +69,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
index 7d1abb4769..187fbae9dd 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
@@ -56,7 +56,7 @@ public class NewbieGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("0"))
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
index acc83d72d8..27ab7e4f74 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
@@ -69,7 +69,7 @@ public class OlyBuffer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.startsWith("giveBuff;") && (npc.getScriptValue() < 5))
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index 201f3843ba..f08fb759ac 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -70,7 +70,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
index 21d281c6c9..435f293345 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
@@ -84,7 +84,7 @@ public class Proclaimer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("giveBuff"))
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/RandomWalkingGuards.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
index 8138dee3ee..ffe4fd87f1 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
@@ -48,7 +48,7 @@ public class RandomWalkingGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("RANDOM_WALK") && (npc != null))
 		{
@@ -59,7 +59,7 @@ public class RandomWalkingGuards extends AbstractNpcAI
 			}
 			startQuestTimer("RANDOM_WALK", getRandom(MIN_WALK_DELAY, MAX_WALK_DELAY), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/Servitors/SinEater.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/Servitors/SinEater.java
index 1ed8d645a5..d7536614e8 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/Servitors/SinEater.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/Servitors/SinEater.java
@@ -48,7 +48,7 @@ public class SinEater extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TALK") && (player != null) && (player.getPet() != null))
 		{
@@ -79,7 +79,7 @@ public class SinEater extends AbstractNpcAI
 			}
 			startQuestTimer("TALK", 60000, null, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_CREATURE_DEATH)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
index f6d1e74529..a733b87dad 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
@@ -53,7 +53,7 @@ public class SymbolMaker extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
index 04d4672c76..b595c4d6d4 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
@@ -86,7 +86,7 @@ public class ToIVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int npcId = npc.getId();
 		
@@ -132,7 +132,7 @@ public class ToIVortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
index a94f215970..92b6e98e43 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
@@ -62,7 +62,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = "";
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index 356236cfc7..bf5b0506dc 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -188,7 +188,7 @@ public class WyvernManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
index 0c2e7586c9..c49be5297b 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
@@ -36,7 +36,7 @@ public class DelevelManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.DELEVEL_MANAGER_ENABLED)
 		{
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java
index 9e42c7a5b0..a31c3837ba 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java
@@ -98,7 +98,7 @@ public class EchoCrystals extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = "";
 		if (Util.isDigit(event))
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
index ff6d40ec0e..4713803f1d 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
@@ -54,7 +54,7 @@ public class FactionSystem extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class FactionSystem extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
index 8b9c676ad5..771c8a9058 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
@@ -34,7 +34,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -77,7 +77,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 				npc.broadcastInfo(); // update flag status
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
index 669fcfc85c..ddf7e923eb 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
@@ -39,7 +39,7 @@ public class NoblessMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.NOBLESS_MASTER_ENABLED)
 		{
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
index 4f0f0c988a..5ba22124c1 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
@@ -215,7 +215,7 @@ public class NpcLocationInfo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (Util.isDigit(event))
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
index 8e1f84c102..3a9b5b4bdc 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
@@ -169,7 +169,7 @@ public class Deathmatch extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
index 1eb84eca93..b92bbe7f77 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
@@ -213,7 +213,7 @@ public class Rabbits extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/events/Race/Race.java
index ff9fc462f6..6ac325ca6f 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/events/Race/Race.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/events/Race/Race.java
@@ -320,7 +320,7 @@ public class Race extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index e827184ae4..60da9f13d3 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -186,7 +186,7 @@ public class TvT extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index 53d917a5c7..a00de57ae5 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -44,7 +44,7 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/HappyHours/HappyHours.java
index e76af2108a..eb247dbbb3 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/HappyHours/HappyHours.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/HappyHours/HappyHours.java
@@ -49,7 +49,7 @@ public class HappyHours extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
index 8504fd0c32..d223196f00 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java
@@ -58,7 +58,7 @@ public class RudolphsBlessing extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("rudolph_eat"))
 		{
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
index 762cde5596..245342a91e 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
@@ -45,7 +45,7 @@ public class ThePowerOfLove extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
index 5de1a19cd2..3e745b3d08 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
@@ -354,7 +354,7 @@ public class WatermelonNinja extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
index ab85113705..02fd7814dd 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
@@ -64,7 +64,7 @@ public class Q00032_AnObviousLie extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
index 346e21ba51..3e17f3d69c 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
@@ -53,7 +53,7 @@ public class Q00033_MakeAPairOfDressShoes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
index 30988810b7..32c4a3f461 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
@@ -61,7 +61,7 @@ public class Q00034_InSearchOfCloth extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
index c9b8b6e19c..c2d6566765 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
@@ -57,7 +57,7 @@ public class Q00035_FindGlitteringJewelry extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
index e3bd0e5753..73ae6c433d 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
@@ -53,7 +53,7 @@ public class Q00036_MakeASewingKit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
index 78660c7498..29c1bd2863 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
@@ -54,7 +54,7 @@ public class Q00037_MakeFormalWear extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
index 100213b849..fe31a6ab4e 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
@@ -54,7 +54,7 @@ public class Q00042_HelpTheUncle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
index 9d5f9265df..a5d1225fca 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
@@ -60,7 +60,7 @@ public class Q00043_HelpTheSister extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
index 7cc6c0f337..a13197fc21 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
@@ -55,7 +55,7 @@ public class Q00044_HelpTheSon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java
index 79f364a54e..cf2473bc19 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java
@@ -84,7 +84,7 @@ public class Q00070_SagaOfThePhoenixKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java
index 1c5ee20575..703208bf2e 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java
@@ -85,7 +85,7 @@ public class Q00071_SagaOfEvasTemplar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java
index 91ba4811de..0808d1601b 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java
@@ -85,7 +85,7 @@ public class Q00072_SagaOfTheSwordMuse extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java
index 896f16438e..7e6fda1667 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java
@@ -85,7 +85,7 @@ public class Q00073_SagaOfTheDuelist extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java
index 1a98d4d200..fd0a03550d 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java
@@ -85,7 +85,7 @@ public class Q00074_SagaOfTheDreadnought extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java
index e5e6b39427..428c1caa43 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java
@@ -85,7 +85,7 @@ public class Q00075_SagaOfTheTitan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java
index a977722f62..ccfff282a0 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java
@@ -85,7 +85,7 @@ public class Q00076_SagaOfTheGrandKhavatari extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java
index 508438d67a..43f8ff9d78 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java
@@ -85,7 +85,7 @@ public class Q00077_SagaOfTheDominator extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java
index 75c3d73024..1ed3216c29 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java
@@ -85,7 +85,7 @@ public class Q00078_SagaOfTheDoomcryer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java
index 3df5908a15..8dc5a8c81a 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java
@@ -85,7 +85,7 @@ public class Q00079_SagaOfTheAdventurer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java
index 2074a51b96..c542de4c19 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java
@@ -85,7 +85,7 @@ public class Q00080_SagaOfTheWindRider extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java
index 67ca500398..73e5ca9f03 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java
@@ -85,7 +85,7 @@ public class Q00081_SagaOfTheGhostHunter extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java
index 52f64dc817..b143f8b56b 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java
@@ -85,7 +85,7 @@ public class Q00082_SagaOfTheSagittarius extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java
index 2818994337..c7cb95b044 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java
@@ -85,7 +85,7 @@ public class Q00083_SagaOfTheMoonlightSentinel extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java
index 5c4722209e..39a2839627 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java
@@ -85,7 +85,7 @@ public class Q00084_SagaOfTheGhostSentinel extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java
index e32cc7ded0..f72865632a 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java
@@ -85,7 +85,7 @@ public class Q00085_SagaOfTheCardinal extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java
index c0b50b130e..4dd2385ff8 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java
@@ -85,7 +85,7 @@ public class Q00086_SagaOfTheHierophant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java
index 76719ec38e..1837ccacda 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java
@@ -85,7 +85,7 @@ public class Q00087_SagaOfEvasSaint extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java
index 4901af8961..e87a6913ce 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java
@@ -84,7 +84,7 @@ public class Q00088_SagaOfTheArchmage extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java
index cbf08d12cc..524e8dbdc1 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java
@@ -84,7 +84,7 @@ public class Q00089_SagaOfTheMysticMuse extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java
index 9b236936e0..26c9bb3dd4 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java
@@ -84,7 +84,7 @@ public class Q00090_SagaOfTheStormScreamer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java
index 751f487099..15c7611dc3 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java
@@ -85,7 +85,7 @@ public class Q00091_SagaOfTheArcanaLord extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java
index 6f98a643f7..337e3070d1 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java
@@ -84,7 +84,7 @@ public class Q00092_SagaOfTheElementalMaster extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java
index f77b67dd6a..61acb45c50 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java
@@ -84,7 +84,7 @@ public class Q00093_SagaOfTheSpectralMaster extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java
index 12d4bc28d6..24004acd96 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java
@@ -84,7 +84,7 @@ public class Q00094_SagaOfTheSoultaker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java
index a104ed14ed..6174d9f79d 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java
@@ -85,7 +85,7 @@ public class Q00095_SagaOfTheHellKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java
index 7c08220d8d..5deb250ad9 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java
@@ -84,7 +84,7 @@ public class Q00096_SagaOfTheSpectralDancer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java
index dee5c701e3..7f93f9bb4b 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java
@@ -84,7 +84,7 @@ public class Q00097_SagaOfTheShillienTemplar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java
index c21ebb5e13..7d89d5cabc 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java
@@ -85,7 +85,7 @@ public class Q00098_SagaOfTheShillienSaint extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java
index a63b4710c7..e9113ef4a7 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java
@@ -84,7 +84,7 @@ public class Q00099_SagaOfTheFortuneSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java
index 349f583104..8ec0ec7a61 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java
@@ -84,7 +84,7 @@ public class Q00100_SagaOfTheMaestro extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
index 577bcf3ef6..7b7af2d39e 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
@@ -44,7 +44,7 @@ public class Q00109_InSearchOfTheNest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
index 8dfcd422ca..82e6fe12d2 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
@@ -46,7 +46,7 @@ public class Q00110_ToThePrimevalIsle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java
index 8727edab49..00fa0933e5 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java
@@ -87,7 +87,7 @@ public class Q00111_ElrokianHuntersProof extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
index 84e03ee2a4..cdaa5c33f0 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
@@ -46,7 +46,7 @@ public class Q00124_MeetingTheElroki extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
index 41e17ba8dd..ade81cae18 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
@@ -77,7 +77,7 @@ public class Q00125_TheNameOfEvil1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
index c880bfcd78..2cdaa0aa91 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
@@ -55,7 +55,7 @@ public class Q00126_TheNameOfEvil2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
index ad72f044ca..b9d8feb578 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
@@ -53,7 +53,7 @@ public class Q00127_FishingSpecialistsRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java
index 0a07f81b93..dce29ceec5 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java
@@ -47,7 +47,7 @@ public class Q00210_ObtainAWolfPet extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
index 6b7de9bd96..18b11d47ae 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
@@ -76,7 +76,7 @@ public class Q00211_TrialOfTheChallenger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
index efde71ba49..2e70c4f9b1 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
@@ -86,7 +86,7 @@ public class Q00212_TrialOfDuty extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
index a0f8f915b3..1f4f42c490 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
@@ -92,7 +92,7 @@ public class Q00213_TrialOfTheSeeker extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
index 94bba112f2..6dfacfa116 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
@@ -120,7 +120,7 @@ public class Q00214_TrialOfTheScholar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
index da0399c8ce..a555adb852 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
@@ -77,7 +77,7 @@ public class Q00215_TrialOfThePilgrim extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
index 05aade19d6..82ef5fe081 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
@@ -94,7 +94,7 @@ public class Q00216_TrialOfTheGuildsman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
index 32a88e353e..86edef3008 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
@@ -107,7 +107,7 @@ public class Q00217_TestimonyOfTrust extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
index a5d3455060..05ed9df156 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
@@ -104,7 +104,7 @@ public class Q00218_TestimonyOfLife extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
index 5e3eb02369..9eae62eb6e 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
@@ -107,7 +107,7 @@ public class Q00219_TestimonyOfFate extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
index 24d8bf39f4..e22e3a6c92 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
@@ -121,7 +121,7 @@ public class Q00220_TestimonyOfGlory extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
index a276b60f56..dff82abd5d 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
@@ -124,7 +124,7 @@ public class Q00221_TestimonyOfProsperity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
index 761bdeb64a..3f03f3e509 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
@@ -88,7 +88,7 @@ public class Q00222_TestOfTheDuelist extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
index bd794eef75..d0bbb73b4f 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
@@ -85,7 +85,7 @@ public class Q00223_TestOfTheChampion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
index 163aa900f4..346538dc45 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
@@ -94,7 +94,7 @@ public class Q00224_TestOfSagittarius extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
index ae9bb5fb4d..e7a6b7ef1a 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
@@ -91,7 +91,7 @@ public class Q00225_TestOfTheSearcher extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
index c3dc04f3f1..9d8e8a161d 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
@@ -81,7 +81,7 @@ public class Q00226_TestOfTheHealer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
index ba1fc6097e..dac23aac62 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
@@ -114,7 +114,7 @@ public class Q00227_TestOfTheReformer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("DESPAWN".equals(event))
 		{
@@ -127,7 +127,7 @@ public class Q00227_TestOfTheReformer extends Quest
 			{
 				npc.deleteMe();
 			}
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
index 6ca6b63f34..42f8db1e54 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
@@ -99,7 +99,7 @@ public class Q00228_TestOfMagus extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
index 954c6b4142..706fc8fb29 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
@@ -115,7 +115,7 @@ public class Q00229_TestOfWitchcraft extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
index 2d810c2bb4..9e61822eca 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
@@ -163,7 +163,7 @@ public class Q00230_TestOfTheSummoner extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
index ea9ab4c98d..0b1696278f 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
@@ -81,7 +81,7 @@ public class Q00231_TestOfTheMaestro extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
index bdd4cb26b5..8aaeb13125 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
@@ -106,7 +106,7 @@ public class Q00232_TestOfTheLord extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
index a8f0d1a2a5..3c14c2ef63 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
@@ -106,7 +106,7 @@ public class Q00233_TestOfTheWarSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00234_FatesWhisper/Q00234_FatesWhisper.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00234_FatesWhisper/Q00234_FatesWhisper.java
index cd8ae3fac5..1be0834efd 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00234_FatesWhisper/Q00234_FatesWhisper.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00234_FatesWhisper/Q00234_FatesWhisper.java
@@ -84,7 +84,7 @@ public class Q00234_FatesWhisper extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java
index dab84adb2b..465cf5f984 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java
@@ -51,7 +51,7 @@ public class Q00235_MimirsElixir extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
index f41ac170e9..9c179c34ac 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
@@ -143,7 +143,7 @@ public class Q00255_Tutorial extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
index a98a9a317b..3f8ecbb375 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
@@ -88,7 +88,7 @@ public class Q00257_TheGuardIsBusy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
index ddd656d3ad..c19e69fd3d 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
@@ -66,7 +66,7 @@ public class Q00258_BringWolfPelts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30001-03.html"))
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
index 02efc29fd9..88ca56e754 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
@@ -70,7 +70,7 @@ public class Q00259_RequestFromTheFarmOwner extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
index 6e63d6faf4..e3e252ec97 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
@@ -63,7 +63,7 @@ public class Q00260_OrcHunting extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
index b68a525827..ff6e0e01fc 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
@@ -61,7 +61,7 @@ public class Q00261_CollectorsDream extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30222-03.htm"))
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
index 95721f08dc..29b898dc6d 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
@@ -59,7 +59,7 @@ public class Q00262_TradeWithTheIvoryTower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30137-03.htm"))
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
index 1bdeec4a83..950346cf59 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
@@ -61,7 +61,7 @@ public class Q00263_OrcSubjugation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
index 20ddbeac20..bd848ee2cf 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
@@ -68,7 +68,7 @@ public class Q00264_KeenClaws extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30136-03.htm"))
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
index d90ce43946..195dc0675d 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
@@ -58,7 +58,7 @@ public class Q00265_BondsOfSlavery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
index 68c5dd1cc3..87c949919f 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
@@ -72,7 +72,7 @@ public class Q00266_PleasOfPixies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("31852-04.htm"))
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
index aa676c5d46..5b26a51d59 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
@@ -50,7 +50,7 @@ public class Q00267_WrathOfVerdure extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
index b6c64f4db7..52a1ad5ec8 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
@@ -54,7 +54,7 @@ public class Q00271_ProofOfValor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30577-04.htm"))
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
index 0c0748e735..8fc6eb06c2 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
@@ -54,7 +54,7 @@ public class Q00272_WrathOfAncestors extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30572-04.htm"))
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
index b3f9d4bb1b..00afdb3a51 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
@@ -60,7 +60,7 @@ public class Q00273_InvadersOfTheHolyLand extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
index f45e185d3f..de06f688b3 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
@@ -57,7 +57,7 @@ public class Q00274_SkirmishWithTheWerewolves extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30569-04.htm"))
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
index 1e6a02f4f9..31e70fba32 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
@@ -59,7 +59,7 @@ public class Q00275_DarkWingedSpies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30567-03.htm"))
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
index 74935e9104..e8f904d1f6 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
@@ -74,7 +74,7 @@ public class Q00276_TotemOfTheHestui extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30571-03.htm"))
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
index 156b85fdf6..6b507503c3 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
@@ -51,7 +51,7 @@ public class Q00277_GatekeepersOffering extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30576-03.htm"))
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
index 8e245d375c..48ed318353 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
@@ -68,7 +68,7 @@ public class Q00292_BrigandsSweep extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
index 227398a92d..93d41b6c06 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
@@ -59,7 +59,7 @@ public class Q00293_TheHiddenVeins extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
index 554161d862..a56345d2f9 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
@@ -62,7 +62,7 @@ public class Q00294_CovertBusiness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && qs.isCreated() && event.equals("30534-03.htm"))
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
index 98daa7c06c..2e8d1c601d 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
@@ -51,7 +51,7 @@ public class Q00295_DreamingOfTheSkies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && qs.isCreated() && event.equals("30536-03.htm"))
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
index 4d1d5b1777..9dc8ba9904 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
@@ -56,7 +56,7 @@ public class Q00296_TarantulasSpiderSilk extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String html = null;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
index e0b5bc2986..099201eb88 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
@@ -52,7 +52,7 @@ public class Q00297_GatekeepersFavor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equalsIgnoreCase("30540-03.htm"))
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
index a7c0756abb..24aef6ae0c 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
@@ -66,7 +66,7 @@ public class Q00300_HuntingLetoLizardman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
index 65317d4367..8960b5ee57 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
@@ -49,7 +49,7 @@ public class Q00303_CollectArrowheads extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30029-04.htm"))
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
index 20009b3457..e520a0cd92 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
@@ -65,7 +65,7 @@ public class Q00306_CrystalOfFireAndIce extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
index 69cbcdbf2a..a1eb4478d8 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
@@ -51,7 +51,7 @@ public class Q00313_CollectSpores extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
index fb42e610a9..5c4fe19392 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
@@ -70,7 +70,7 @@ public class Q00316_DestroyPlagueCarriers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
index 86a347b60b..b69fd606ea 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
@@ -52,7 +52,7 @@ public class Q00317_CatchTheWind extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
index e88feb95e2..fc8f958e8c 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
@@ -54,7 +54,7 @@ public class Q00319_ScentOfDeath extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
index 8fd327d6b5..49cc3a2f09 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
@@ -55,7 +55,7 @@ public class Q00320_BonesTellTheFuture extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if ((qs != null) && event.equals("30359-04.htm"))
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
index a97a566c92..03cf67028d 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
@@ -60,7 +60,7 @@ public class Q00324_SweetestVenom extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
index 233ae4efea..308b9d1e12 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
@@ -79,7 +79,7 @@ public class Q00325_GrimCollector extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
index dc3eb65ec4..2566d50918 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
@@ -69,7 +69,7 @@ public class Q00326_VanquishRemnants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
index 1956e2923e..99a18a2d23 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
@@ -105,7 +105,7 @@ public class Q00327_RecoverTheFarmland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
index 64cc6ef8e9..b8d1a39d6c 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
@@ -70,7 +70,7 @@ public class Q00328_SenseForBusiness extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
index 72407eabc3..25eb32f4d0 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
@@ -62,7 +62,7 @@ public class Q00329_CuriosityOfADwarf extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
index 518d845bcc..dd71a57310 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
@@ -65,7 +65,7 @@ public class Q00331_ArrowOfVengeance extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
index 498b165be2..02f12606c7 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
@@ -121,7 +121,7 @@ public class Q00333_HuntOfTheBlackLion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		final int chance = getRandom(100);
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
index 5f664a5fed..1031fbb7fb 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
@@ -85,7 +85,7 @@ public class Q00344_1000YearsTheEndOfLamentation extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java
index da8086521c..eb49b8dc51 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java
@@ -59,7 +59,7 @@ public class Q00348_AnArrogantSearch extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java
index d019848209..1c38678b70 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java
@@ -150,7 +150,7 @@ public class Q00350_EnhanceYourWeapon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
index fd775bbe73..bc785abac1 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
@@ -60,7 +60,7 @@ public class Q00354_ConquestOfAlligatorIsland extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
index ee19b7e4ab..fbcd365dc3 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
@@ -87,7 +87,7 @@ public class Q00355_FamilyHonor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
index e1633226d2..c200224cfa 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
@@ -61,7 +61,7 @@ public class Q00356_DigUpTheSeaOfSpores extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
index aca7242c87..8b51394b23 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
@@ -68,7 +68,7 @@ public class Q00358_IllegitimateChildOfTheGoddess extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
index ed0f544adc..2407d92d0f 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
@@ -59,7 +59,7 @@ public class Q00360_PlunderTheirSupplies extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
index aaf517b7a9..e910c1e70e 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
@@ -68,7 +68,7 @@ public class Q00369_CollectorOfJewels extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
index d24b38b112..c6c223f5a1 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
@@ -70,7 +70,7 @@ public class Q00370_AnElderSowsSeeds extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java
index a64a730995..26dff6e0e8 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java
@@ -144,7 +144,7 @@ public class Q00373_SupplierOfReagents extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState st = getQuestState(player, false);
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java
index 26bbe0c26a..510e73c602 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java
@@ -58,7 +58,7 @@ public class Q00374_WhisperOfDreamsPart1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java
index 370ba1f6b8..f37a2720b9 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java
@@ -56,7 +56,7 @@ public class Q00375_WhisperOfDreamsPart2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
index 7773083c9a..c29c87b26d 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
@@ -65,7 +65,7 @@ public class Q00401_PathOfTheWarrior extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
index 73be798601..f90aa18585 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
@@ -90,7 +90,7 @@ public class Q00402_PathOfTheHumanKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
index bd13a4bbe9..9bd736acaa 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
@@ -93,7 +93,7 @@ public class Q00403_PathOfTheRogue extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
index 4b0285fcef..ac44dd64d6 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
@@ -72,7 +72,7 @@ public class Q00404_PathOfTheHumanWizard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
index 455a88115a..b7ad34d507 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
@@ -68,7 +68,7 @@ public class Q00405_PathOfTheCleric extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
index 60a2100263..fcb92b0837 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
@@ -73,7 +73,7 @@ public class Q00406_PathOfTheElvenKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
index e8ae130e75..89dbb1cea4 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
@@ -67,7 +67,7 @@ public class Q00407_PathOfTheElvenScout extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
index e35ea8444b..86dd94df1f 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
@@ -70,7 +70,7 @@ public class Q00408_PathOfTheElvenWizard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
index 809b741536..1e788f366f 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
@@ -66,7 +66,7 @@ public class Q00409_PathOfTheElvenOracle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
index 261122d3ff..727d4148f0 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
@@ -62,7 +62,7 @@ public class Q00410_PathOfThePalusKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
index d0849cb9a0..b6bd1f946a 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
@@ -62,7 +62,7 @@ public class Q00411_PathOfTheAssassin extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
index a2a12199b7..fda1cd4beb 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
@@ -69,7 +69,7 @@ public class Q00412_PathOfTheDarkWizard extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
index cf84a5a883..55897e0028 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
@@ -66,7 +66,7 @@ public class Q00413_PathOfTheShillienOracle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
index 9bd2adec48..34d1af1f9c 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
@@ -65,7 +65,7 @@ public class Q00414_PathOfTheOrcRaider extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
index 0d21264633..3b6f7f4fb5 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
@@ -90,7 +90,7 @@ public class Q00415_PathOfTheOrcMonk extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
index 6a0fb18a23..1b62cbad54 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
@@ -88,7 +88,7 @@ public class Q00416_PathOfTheOrcShaman extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
index 2e9a9937b5..973de273fc 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
@@ -84,7 +84,7 @@ public class Q00417_PathOfTheScavenger extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
index 23061e130c..43770b4eb1 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
@@ -66,7 +66,7 @@ public class Q00418_PathOfTheArtisan extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
index 11f3b09746..faa5d1c494 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
@@ -130,7 +130,7 @@ public class Q00420_LittleWing extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
index 43f8f13f82..2c62a82cb1 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
@@ -86,7 +86,7 @@ public class Q00421_LittleWingsBigAdventure extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
index 90fc91cb14..8a8d28689c 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
@@ -68,7 +68,7 @@ public class Q00500_BrothersBoundInChains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java
index b9f00a5886..1e0def6fe2 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java
@@ -189,7 +189,7 @@ public class Q00605_AllianceWithKetraOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java
index 7295871177..b5d4efe198 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java
@@ -71,7 +71,7 @@ public class Q00606_BattleAgainstVarkaSilenos extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java
index 29fc347f42..777af2a3ad 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java
@@ -189,7 +189,7 @@ public class Q00611_AllianceWithVarkaSilenos extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java
index ce40b65c65..97fb2a119a 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java
@@ -71,7 +71,7 @@ public class Q00612_BattleAgainstKetraOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
index 6f311354f7..d1322b1913 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
@@ -84,7 +84,7 @@ public class Q00617_GatherTheFlames extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
index b8ab0add96..3c04dfac83 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
@@ -109,7 +109,7 @@ public class Q00620_FourGoblets extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final QuestState qs = player.getQuestState(getName());
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
index e6194c340c..910e6da7ea 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
@@ -62,7 +62,7 @@ public class Q00622_SpecialtyLiquorDelivery extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
index d5eabc02a0..dfeb543a3c 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
@@ -66,7 +66,7 @@ public class Q00623_TheFinestFood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00628_HuntGoldenRam/Q00628_HuntGoldenRam.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00628_HuntGoldenRam/Q00628_HuntGoldenRam.java
index 1108c4a9da..384d2183a6 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00628_HuntGoldenRam/Q00628_HuntGoldenRam.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00628_HuntGoldenRam/Q00628_HuntGoldenRam.java
@@ -68,7 +68,7 @@ public class Q00628_HuntGoldenRam extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00640_TheZeroHour/Q00640_TheZeroHour.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00640_TheZeroHour/Q00640_TheZeroHour.java
index c4cee384d0..cf9f329162 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00640_TheZeroHour/Q00640_TheZeroHour.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00640_TheZeroHour/Q00640_TheZeroHour.java
@@ -67,7 +67,7 @@ public class Q00640_TheZeroHour extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
index 6ab1e34b5a..f7548f5322 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
@@ -57,7 +57,7 @@ public class Q00641_AttackSailren extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
index 3ad4eb9269..f4030b7e1d 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
@@ -66,7 +66,7 @@ public class Q00642_APowerfulPrimevalCreature extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
index c169f31952..82ec8d60ba 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
@@ -103,7 +103,7 @@ public class Q00643_RiseAndFallOfTheElrokiTribe extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
index c6c6541b90..e40f43ea81 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
@@ -82,7 +82,7 @@ public class Q00662_AGameOfCards extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
index 1dfdc81b32..e1e41ba51e 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
@@ -49,7 +49,7 @@ public class Q00688_DefeatTheElrokianRaiders extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss.java
index 6b14892016..e986187f8e 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss/Q00933_ExploringTheWestWingOfTheDungeonOfAbyss.java
@@ -51,7 +51,7 @@ public class Q00933_ExploringTheWestWingOfTheDungeonOfAbyss extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss.java
index ba47f428b9..c8765f54cf 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss/Q00935_ExploringTheEastWingOfTheDungeonOfAbyss.java
@@ -51,7 +51,7 @@ public class Q00935_ExploringTheEastWingOfTheDungeonOfAbyss extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q10866_PunitiveOperationOnTheDevilIsle/Q10866_PunitiveOperationOnTheDevilIsle.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q10866_PunitiveOperationOnTheDevilIsle/Q10866_PunitiveOperationOnTheDevilIsle.java
index 236a65502b..fa4bf40711 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q10866_PunitiveOperationOnTheDevilIsle/Q10866_PunitiveOperationOnTheDevilIsle.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q10866_PunitiveOperationOnTheDevilIsle/Q10866_PunitiveOperationOnTheDevilIsle.java
@@ -52,7 +52,7 @@ public class Q10866_PunitiveOperationOnTheDevilIsle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q10993_FutureDwarves/Q10993_FutureDwarves.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q10993_FutureDwarves/Q10993_FutureDwarves.java
index 250e3a8995..013242d4b2 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q10993_FutureDwarves/Q10993_FutureDwarves.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q10993_FutureDwarves/Q10993_FutureDwarves.java
@@ -57,7 +57,7 @@ public class Q10993_FutureDwarves extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q10994_FutureOrcs/Q10994_FutureOrcs.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q10994_FutureOrcs/Q10994_FutureOrcs.java
index 238e0fa458..f96df09a5c 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q10994_FutureOrcs/Q10994_FutureOrcs.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q10994_FutureOrcs/Q10994_FutureOrcs.java
@@ -56,7 +56,7 @@ public class Q10994_FutureOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java
index 10b21c8ccb..1731f1a504 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java
@@ -73,7 +73,7 @@ public class Q10995_MutualBenefit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java
index b343328309..54c7cde8f1 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java
@@ -71,7 +71,7 @@ public class Q10996_TemplesDecorations extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q10997_LoserPriest1/Q10997_LoserPriest1.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q10997_LoserPriest1/Q10997_LoserPriest1.java
index 2ed08fc50c..8e9a9c27ea 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q10997_LoserPriest1/Q10997_LoserPriest1.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q10997_LoserPriest1/Q10997_LoserPriest1.java
@@ -65,7 +65,7 @@ public class Q10997_LoserPriest1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java
index e0bc059997..e1a368d6e9 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java
@@ -67,7 +67,7 @@ public class Q10998_LoserPriest2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java
index 4100a9d76a..a1626717c1 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java
@@ -70,7 +70,7 @@ public class Q10999_LoserPriest3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11000_MoonKnight/Q11000_MoonKnight.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11000_MoonKnight/Q11000_MoonKnight.java
index f5b2632cfc..990ed4ca8c 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11000_MoonKnight/Q11000_MoonKnight.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11000_MoonKnight/Q11000_MoonKnight.java
@@ -87,7 +87,7 @@ public class Q11000_MoonKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java
index 109741a076..3d0f0ca3fa 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java
@@ -71,7 +71,7 @@ public class Q11001_TombsOfAncestors extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java
index 7d664db921..dbe2182b36 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java
@@ -70,7 +70,7 @@ public class Q11002_HelpWithTempleRestoration extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java
index 6eb635ea92..a1364772b5 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java
@@ -69,7 +69,7 @@ public class Q11003_PerfectLeatherArmor1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java
index 26b15cd67b..de0ee10c5a 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java
@@ -71,7 +71,7 @@ public class Q11004_PerfectLeatherArmor2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java
index 1ff6120ac8..0ea204ef44 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java
@@ -71,7 +71,7 @@ public class Q11005_PerfectLeatherArmor3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11006_FuturePeople/Q11006_FuturePeople.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11006_FuturePeople/Q11006_FuturePeople.java
index 926f1dd745..922772d391 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11006_FuturePeople/Q11006_FuturePeople.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11006_FuturePeople/Q11006_FuturePeople.java
@@ -61,7 +61,7 @@ public class Q11006_FuturePeople extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java
index 8cae258367..3ca9740076 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java
@@ -71,7 +71,7 @@ public class Q11007_NoiseInWoods extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java
index eafe0672dd..765ec9db70 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java
@@ -72,7 +72,7 @@ public class Q11008_PreparationForDungeon extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java
index 8e473640f0..66cf28a04f 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java
@@ -66,7 +66,7 @@ public class Q11009_NewPotionDevelopment1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java
index 8e53e68c2e..09439bfc3e 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java
@@ -68,7 +68,7 @@ public class Q11010_NewPotionDevelopment2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java
index ebd9fbde43..a4acca3489 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java
@@ -67,7 +67,7 @@ public class Q11011_NewPotionDevelopment3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11012_FutureElves/Q11012_FutureElves.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11012_FutureElves/Q11012_FutureElves.java
index 10c21ab330..44ee19386e 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11012_FutureElves/Q11012_FutureElves.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11012_FutureElves/Q11012_FutureElves.java
@@ -57,7 +57,7 @@ public class Q11012_FutureElves extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java
index d6864631c7..2158d46086 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java
@@ -73,7 +73,7 @@ public class Q11013_ShilensHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java
index 7243aa8273..e00ae2ff24 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java
@@ -72,7 +72,7 @@ public class Q11014_SurpriseGift extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java
index 448e542bee..cb0dd085f3 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java
@@ -69,7 +69,7 @@ public class Q11015_PrepareForTrade1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java
index c27e8e693c..ac9601ef20 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java
@@ -71,7 +71,7 @@ public class Q11016_PrepareForTrade2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java
index d58bd7e596..d0d080a05c 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java
@@ -71,7 +71,7 @@ public class Q11017_PrepareForTrade3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11018_FutureDarkElves/Q11018_FutureDarkElves.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11018_FutureDarkElves/Q11018_FutureDarkElves.java
index bbe6a3fac5..ae2938c9c2 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11018_FutureDarkElves/Q11018_FutureDarkElves.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11018_FutureDarkElves/Q11018_FutureDarkElves.java
@@ -59,7 +59,7 @@ public class Q11018_FutureDarkElves extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java
index 724a6bdeca..1e867d1332 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java
@@ -72,7 +72,7 @@ public class Q11019_TribalBenefit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java
index 49bf938e3d..ab9cdbbd3d 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java
@@ -69,7 +69,7 @@ public class Q11020_BlacksmithsRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java
index 493413bc2d..df8d7324af 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java
@@ -67,7 +67,7 @@ public class Q11021_RedGemNecklace1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java
index 3705de9c0c..06c6908ca5 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java
@@ -69,7 +69,7 @@ public class Q11022_RedGemNecklace2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java
index 35767cb0bb..c247de41ad 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java
@@ -67,7 +67,7 @@ public class Q11023_RedGemNecklace3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
index 06ea44ceb1..6698687a4e 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
@@ -45,7 +45,7 @@ public class AllianceMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!"9001-01.htm".equals(event) && (player.getClan() == null))
 		{
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
index b69c69d8d0..b9cae10d1b 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
@@ -74,7 +74,7 @@ public class ClanMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LEADER_REQUIRED.containsKey(event) && !player.isClanLeader())
 		{
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
index 472b265d19..7560171dd1 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
@@ -61,7 +61,7 @@ public class DarkElfChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
index 7ba0619564..f059b8666f 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
@@ -78,7 +78,7 @@ public class DarkElfChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
index 14f49ed1fd..816b96e4a9 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
@@ -51,7 +51,7 @@ public class DwarfBlacksmithChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
index 52812ad4a4..54a365faab 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
@@ -57,7 +57,7 @@ public class DwarfBlacksmithChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
index d372ba5b2a..daafa6d9bc 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
@@ -51,7 +51,7 @@ public class DwarfWarehouseChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
index 552b968cda..537fb2bd4f 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
@@ -57,7 +57,7 @@ public class DwarfWarehouseChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
index 07aac523db..fdd471c3ce 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
@@ -60,7 +60,7 @@ public class ElfHumanClericChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
index 7c238fc992..268027c600 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
@@ -60,7 +60,7 @@ public class ElfHumanFighterChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
index f7e3bba54a..a4f8bcecda 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
@@ -75,7 +75,7 @@ public class ElfHumanFighterChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
index b33e852f7c..1d016bc05a 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
@@ -59,7 +59,7 @@ public class ElfHumanWizardChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
index 90825aebb9..eda8996c5d 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
@@ -64,7 +64,7 @@ public class ElfHumanWizardChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
index acf6f9bc2f..1a231cd5d9 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
@@ -53,7 +53,7 @@ public class FirstClassTransferTalk extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return event;
 	}
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
index 3c595b9827..61020e2b22 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
@@ -52,7 +52,7 @@ public class OrcChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
index 151e59f21e..feb8847d2e 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
@@ -65,7 +65,7 @@ public class OrcChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java
index f343e5d8e9..252c508537 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java
@@ -245,7 +245,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -267,7 +267,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -558,7 +558,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 			{
 				player.setSimulatedTalking(false);
 			}
-			res = onAdvEvent(event, npc, player);
+			res = onEvent(event, npc, player);
 		}
 		catch (Exception e)
 		{
@@ -1020,12 +1020,11 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 */
 	public String onDeath(Creature killer, Creature victim, QuestState qs)
 	{
-		return onAdvEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
+		return onEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
 	}
 	
 	/**
 	 * This function is called whenever a player clicks on a link in a quest dialog and whenever a timer fires.<br>
-	 * If is not overridden by a subclass, then default to the returned value of the simpler (and older) {@link #onEvent(String, QuestState)} override.<br>
 	 * If the player has a quest state, use it as parameter in the next call, otherwise return null.
 	 * @param event this parameter contains a string identifier for the event.<br>
 	 *            Generally, this string is passed directly via the link.<br>
@@ -1044,35 +1043,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 *            This parameter may be {@code null} in certain circumstances.
 	 * @return the text returned by the event (may be {@code null}, a filename or just text)
 	 */
-	public String onAdvEvent(String event, Npc npc, Player player)
-	{
-		if (player != null)
-		{
-			final QuestState qs = player.getQuestState(getName());
-			if (qs != null)
-			{
-				return onEvent(event, qs);
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * This function is called in place of {@link #onAdvEvent(String, Npc, Player)} if the former is not implemented.<br>
-	 * If a script contains both {@link #onAdvEvent(String, Npc, Player)} and this implementation, then this method will never be called unless the script's {@link #onAdvEvent(String, Npc, Player)} explicitly calls this method.
-	 * @param event this parameter contains a string identifier for the event.<br>
-	 *            Generally, this string is passed directly via the link.<br>
-	 *            For example:<br>
-	 *            <code>
-	 *            &lt;a action="bypass -h Quest 626_ADarkTwilight 31517-01.htm"&gt;hello&lt;/a&gt;
-	 *            </code><br>
-	 *            The above link sets the event variable to "31517-01.htm" for the quest 626_ADarkTwilight.<br>
-	 *            In the case of timers, this will be the name of the timer.<br>
-	 *            This parameter serves as a sort of identifier.
-	 * @param qs this parameter contains a reference to the quest state of the player who used the link or started the timer.
-	 * @return the text returned by the event (may be {@code null}, a filename or just text)
-	 */
-	public String onEvent(String event, QuestState qs)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return null;
 	}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java
index 3817e1be30..db707fe326 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java
@@ -49,7 +49,7 @@ public class Fellow extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
index a26e6075fd..31fc2ba199 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
@@ -43,12 +43,12 @@ public class Toma extends AbstractNpcAI
 	private Toma()
 	{
 		addFirstTalkId(TOMA);
-		onAdvEvent("RESPAWN_TOMA", null, null);
+		onEvent("RESPAWN_TOMA", null, null);
 		startQuestTimer("RESPAWN_TOMA", TELEPORT_DELAY, null, null, true);
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("RESPAWN_TOMA"))
 		{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingIgnis.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingIgnis.java
index 6606e36f7e..a2ad870093 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingIgnis.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingIgnis.java
@@ -49,7 +49,7 @@ public class ResidenceOfKingIgnis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingPetram.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingPetram.java
index 0bb5893075..e041afe21d 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingPetram.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingPetram.java
@@ -48,7 +48,7 @@ public class ResidenceOfKingPetram extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingProcella.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingProcella.java
index 9837e1fed4..590574d2ae 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingProcella.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingProcella.java
@@ -62,7 +62,7 @@ public class ResidenceOfKingProcella extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfQueenNebula.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfQueenNebula.java
index 9c3c7ea37b..c897a5d1b1 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfQueenNebula.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfQueenNebula.java
@@ -53,7 +53,7 @@ public class ResidenceOfQueenNebula extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
index 6f8858a2a4..dd735beeaa 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
@@ -41,7 +41,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -54,7 +54,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 				npc.deleteMe();
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_DAY_NIGHT_CHANGE)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java
index 86b549221f..f74231d188 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java
@@ -42,7 +42,7 @@ public class Tarba extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
@@ -55,7 +55,7 @@ public class Tarba extends AbstractNpcAI
 			}
 			return "34134-02.htm";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
index 76379f11ef..9e3b09ef23 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
@@ -38,14 +38,14 @@ public class Roxxy extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TEXT_SPAM") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SPEAK_WITH_ME_ABOUT_TRAVELING_AROUND_ADEN, 1000);
 			startQuestTimer("TEXT_SPAM", getRandom(10000, 30000), npc, null, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
index ce371e1a92..fdb7c42520 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
@@ -49,7 +49,7 @@ public class Arushinai extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("30401-1.htm") || event.equals("30401-2.htm"))
 		{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java
index d918a2bfc3..801a77996a 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java
@@ -49,7 +49,7 @@ public class Ateld extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
index 6ee6719c50..ec7aecde57 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
@@ -47,7 +47,7 @@ public class DimensionalVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("30952-1.htm") || event.equals("30952-2.htm") || event.equals("30952-3.htm"))
 		{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index d236e19d43..a5157acfc7 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -193,7 +193,7 @@ public class Antharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -605,7 +605,7 @@ public class Antharas extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 4a01a9e786..b5610ec889 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -164,7 +164,7 @@ public class Baium extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -478,7 +478,7 @@ public class Baium extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Core/Core.java
index 71150c1323..b9dcb38092 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -142,7 +142,7 @@ public class Core extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
@@ -161,7 +161,7 @@ public class Core extends AbstractNpcAI
 			_minions.forEach(Attackable::decayMe);
 			_minions.clear();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/LimitBarrier.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/LimitBarrier.java
index 0bc01da7c8..3ec6403956 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/LimitBarrier.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/LimitBarrier.java
@@ -150,7 +150,7 @@ public class LimitBarrier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -179,7 +179,7 @@ public class LimitBarrier extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 84e7cbcd06..b288e64003 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -106,7 +106,7 @@ public class Orfen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -133,7 +133,7 @@ public class Orfen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 93735c996b..72e174bb65 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -155,7 +155,7 @@ public class QueenAnt extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -239,7 +239,7 @@ public class QueenAnt extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java
index 51bd8a03e0..daa7e95811 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java
@@ -76,7 +76,7 @@ public class SevenSignsRBs extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
index 539094a886..f0c5d33ed2 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
@@ -71,13 +71,13 @@ public class Zaken extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("zaken_unlock"))
 		{
 			spawnBoss();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private void spawnBoss()
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/AdditionalServicesAdvisor/AdditionalServicesAdvisor.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/AdditionalServicesAdvisor/AdditionalServicesAdvisor.java
index 3bc7a530fa..e17c76f8fd 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/AdditionalServicesAdvisor/AdditionalServicesAdvisor.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/AdditionalServicesAdvisor/AdditionalServicesAdvisor.java
@@ -63,7 +63,7 @@ public class AdditionalServicesAdvisor extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String html = null;
 		switch (npc.getId())
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index 04fed5ab1b..b95d115b2c 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -59,7 +59,7 @@ public class ArenaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -124,7 +124,7 @@ public class ArenaManager extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java
index c65d275482..7a1750b82f 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java
@@ -44,7 +44,7 @@ public class AttributeMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("learn".equalsIgnoreCase(event))
 		{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
index b07792cd2d..11b8786523 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
@@ -57,7 +57,7 @@ public class CastleBlacksmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return (event.equalsIgnoreCase(npc.getId() + "-02.html") && hasRights(player, npc)) ? event : null;
 	}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
index d57854042c..dd16a656dd 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
@@ -393,7 +393,7 @@ public class CastleChamberlain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Castle castle = npc.getCastle();
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
index b9c1f3faf5..70bae86615 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
@@ -72,7 +72,7 @@ public class CastleDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
index bb32dde319..a319e3977f 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
@@ -56,7 +56,7 @@ public class CastleMercenaryManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index a2bf4617a1..06a742f8c8 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -78,7 +78,7 @@ public class CastleTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
@@ -168,7 +168,7 @@ public class CastleTeleporter extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
index bffed40bcc..ea1b40c41c 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
@@ -52,7 +52,7 @@ public class CastleWarehouse extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final boolean isMyLord = player.isClanLeader() && (player.getClan().getCastleId() == (npc.getCastle() != null ? npc.getCastle().getResidenceId() : -1));
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index 95c47896a6..97a5271aa2 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -64,7 +64,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
index a86581206e..afd7250ca4 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
@@ -57,7 +57,7 @@ public class ClanHallDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 95eaa5d842..d47d6e06bd 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -98,7 +98,7 @@ public class ClanHallManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ClanStrongholdDevice/ClanStrongholdDevice.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ClanStrongholdDevice/ClanStrongholdDevice.java
index ffa8811a99..a5a10d01bb 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ClanStrongholdDevice/ClanStrongholdDevice.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ClanStrongholdDevice/ClanStrongholdDevice.java
@@ -75,18 +75,18 @@ public class ClanStrongholdDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getTemplate().getId() != CLAN_STRONGHOLD_DEVICE) || (player == null) || (event == null))
 		{
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		if (event.equals("capture"))
 		{
 			if (npc.isAlikeDead())
 			{
-				return super.onAdvEvent(event, npc, player);
+				return super.onEvent(event, npc, player);
 			}
 			
 			if (CURRENT_CLAN_ID.containsKey(npc.getScriptValue()))
@@ -112,13 +112,13 @@ public class ClanStrongholdDevice extends AbstractNpcAI
 		{
 			if (npc.isAlikeDead())
 			{
-				return super.onAdvEvent(event, npc, player);
+				return super.onEvent(event, npc, player);
 			}
 			
 			return npc.getId() + (CURRENT_CLAN_ID.containsKey(npc.getScriptValue()) ? "-02" : "") + ".htm";
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 58cd9d74b4..a5f5b00f5b 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -232,7 +232,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		if (!_isEnabled)
 		{
@@ -853,7 +853,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	{
 		if (event.getCommand().startsWith("Quest ClassMaster "))
 		{
-			final String html = onAdvEvent(event.getCommand().substring(18), null, event.getPlayer());
+			final String html = onEvent(event.getCommand().substring(18), null, event.getPlayer());
 			event.getPlayer().sendPacket(TutorialCloseHtml.STATIC_PACKET);
 			showResult(event.getPlayer(), html);
 		}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/DivineBeast.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/DivineBeast.java
index 1f247a7b35..3f3a076992 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/DivineBeast.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/DivineBeast.java
@@ -44,7 +44,7 @@ public class DivineBeast extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player == null) || !player.hasServitors())
 		{
@@ -55,7 +55,7 @@ public class DivineBeast extends AbstractNpcAI
 			cancelQuestTimer(event, npc, player);
 			player.getServitors().values().forEach(summon -> summon.unSummon(player));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
index 3121af70a3..db63ab13a2 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
@@ -108,7 +108,7 @@ public class GameAssistant extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
index bebd43fe6c..241ad279cd 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
@@ -68,7 +68,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
index 8124bbbfcc..40455ac26a 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
@@ -57,7 +57,7 @@ public class NewbieGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("0"))
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
index acc83d72d8..27ab7e4f74 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
@@ -69,7 +69,7 @@ public class OlyBuffer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.startsWith("giveBuff;") && (npc.getScriptValue() < 5))
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index f09174eb23..5fed0b483c 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -70,7 +70,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
index 21d281c6c9..435f293345 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
@@ -84,7 +84,7 @@ public class Proclaimer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("giveBuff"))
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
index ea0a8a16da..1fc1737173 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
@@ -79,7 +79,7 @@ public class ProvisionalHalls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/RandomWalkingGuards.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
index 8138dee3ee..ffe4fd87f1 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
@@ -48,7 +48,7 @@ public class RandomWalkingGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("RANDOM_WALK") && (npc != null))
 		{
@@ -59,7 +59,7 @@ public class RandomWalkingGuards extends AbstractNpcAI
 			}
 			startQuestTimer("RANDOM_WALK", getRandom(MIN_WALK_DELAY, MAX_WALK_DELAY), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/Servitors/SinEater.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/Servitors/SinEater.java
index 1ed8d645a5..d7536614e8 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/Servitors/SinEater.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/Servitors/SinEater.java
@@ -48,7 +48,7 @@ public class SinEater extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TALK") && (player != null) && (player.getPet() != null))
 		{
@@ -79,7 +79,7 @@ public class SinEater extends AbstractNpcAI
 			}
 			startQuestTimer("TALK", 60000, null, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_CREATURE_DEATH)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
index 59d7caa30e..30731ac83e 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
@@ -51,7 +51,7 @@ public class SymbolMaker extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
index 04d4672c76..b595c4d6d4 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
@@ -86,7 +86,7 @@ public class ToIVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int npcId = npc.getId();
 		
@@ -132,7 +132,7 @@ public class ToIVortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index 2dedad14e3..68545dd1b6 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -188,7 +188,7 @@ public class WyvernManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
index 0c2e7586c9..c49be5297b 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
@@ -36,7 +36,7 @@ public class DelevelManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.DELEVEL_MANAGER_ENABLED)
 		{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
index ff6d40ec0e..4713803f1d 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
@@ -54,7 +54,7 @@ public class FactionSystem extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class FactionSystem extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
index 8b9c676ad5..771c8a9058 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
@@ -34,7 +34,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -77,7 +77,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 				npc.broadcastInfo(); // update flag status
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
index 669fcfc85c..ddf7e923eb 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
@@ -39,7 +39,7 @@ public class NoblessMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.NOBLESS_MASTER_ENABLED)
 		{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
index 4f0f0c988a..5ba22124c1 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
@@ -215,7 +215,7 @@ public class NpcLocationInfo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (Util.isDigit(event))
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
index 8e1f84c102..3a9b5b4bdc 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
@@ -169,7 +169,7 @@ public class Deathmatch extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
index 1eb84eca93..b92bbe7f77 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
@@ -213,7 +213,7 @@ public class Rabbits extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/events/Race/Race.java
index ff9fc462f6..6ac325ca6f 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/events/Race/Race.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/events/Race/Race.java
@@ -320,7 +320,7 @@ public class Race extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index e827184ae4..60da9f13d3 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -186,7 +186,7 @@ public class TvT extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java
index 0e8a9686d7..53603f1d34 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java
@@ -41,7 +41,7 @@ public class BlossomFestival extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index 53d917a5c7..a00de57ae5 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -44,7 +44,7 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/HappyHours/HappyHours.java
index e76af2108a..eb247dbbb3 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/HappyHours/HappyHours.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/HappyHours/HappyHours.java
@@ -49,7 +49,7 @@ public class HappyHours extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
index 762cde5596..245342a91e 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
@@ -45,7 +45,7 @@ public class ThePowerOfLove extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/TotalRecall/TotalRecall.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
index 4486ac5f36..a5448d4db5 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
@@ -42,7 +42,7 @@ public class TotalRecall extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
index ab13115459..6a7beda1f4 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
@@ -321,7 +321,7 @@ public class WatermelonNinja extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java
index d1698bbf65..f8e75c1c7e 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java
@@ -153,7 +153,7 @@ public class DwellingOfSpirits extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -200,7 +200,7 @@ public class DwellingOfSpirits extends AbstractInstance
 			}
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/GolbergRoom/GolbergRoom.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/GolbergRoom/GolbergRoom.java
index b1a8dcb0a7..4ebb2515e5 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/GolbergRoom/GolbergRoom.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/GolbergRoom/GolbergRoom.java
@@ -50,7 +50,7 @@ public class GolbergRoom extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java
index 436059ddb1..305c7e152d 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java
@@ -166,7 +166,7 @@ public class LastImperialTomb extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java
index c1334f906a..96dcb6d101 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java
@@ -62,7 +62,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java
index 31cf01348e..ee04feb336 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java
@@ -103,7 +103,7 @@ public class MonsterArena extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
index 3465ec2a61..5b72bc9f5b 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
@@ -127,7 +127,7 @@ public class TimedHunting extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("ENTER"))
 		{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
index 24aa967f60..f348ed1ada 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
@@ -52,7 +52,7 @@ public class Q00127_FishingSpecialistsRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
index a8650086e5..d71a038e27 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
@@ -146,7 +146,7 @@ public class Q00255_Tutorial extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		// Null check.
 		if (player == null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q00502_BrothersBoundInChains/Q00502_BrothersBoundInChains.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q00502_BrothersBoundInChains/Q00502_BrothersBoundInChains.java
index 5783cff4ad..0cf2729e63 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q00502_BrothersBoundInChains/Q00502_BrothersBoundInChains.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q00502_BrothersBoundInChains/Q00502_BrothersBoundInChains.java
@@ -68,7 +68,7 @@ public class Q00502_BrothersBoundInChains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
index c6c6541b90..e40f43ea81 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
@@ -82,7 +82,7 @@ public class Q00662_AGameOfCards extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java
index f12448cd35..cc2abfc3d5 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java
@@ -117,7 +117,7 @@ public class Q10673_SagaOfLegend extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10957_TheLifeOfADeathKnight/Q10957_TheLifeOfADeathKnight.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10957_TheLifeOfADeathKnight/Q10957_TheLifeOfADeathKnight.java
index 2fec573afe..df9b3d12bb 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10957_TheLifeOfADeathKnight/Q10957_TheLifeOfADeathKnight.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10957_TheLifeOfADeathKnight/Q10957_TheLifeOfADeathKnight.java
@@ -62,7 +62,7 @@ public class Q10957_TheLifeOfADeathKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10958_ExploringNewOpportunities/Q10958_ExploringNewOpportunities.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10958_ExploringNewOpportunities/Q10958_ExploringNewOpportunities.java
index 018e4e95d5..db5d91e536 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10958_ExploringNewOpportunities/Q10958_ExploringNewOpportunities.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10958_ExploringNewOpportunities/Q10958_ExploringNewOpportunities.java
@@ -66,7 +66,7 @@ public class Q10958_ExploringNewOpportunities extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10959_ChallengingYourDestiny/Q10959_ChallengingYourDestiny.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10959_ChallengingYourDestiny/Q10959_ChallengingYourDestiny.java
index 77dd769dcf..638fee3057 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10959_ChallengingYourDestiny/Q10959_ChallengingYourDestiny.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10959_ChallengingYourDestiny/Q10959_ChallengingYourDestiny.java
@@ -74,7 +74,7 @@ public class Q10959_ChallengingYourDestiny extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10961_EffectiveTraining/Q10961_EffectiveTraining.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10961_EffectiveTraining/Q10961_EffectiveTraining.java
index e3fa1c2f86..7096794ead 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10961_EffectiveTraining/Q10961_EffectiveTraining.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10961_EffectiveTraining/Q10961_EffectiveTraining.java
@@ -73,7 +73,7 @@ public class Q10961_EffectiveTraining extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java
index 7c1a04c861..7ec0076c4b 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java
@@ -81,7 +81,7 @@ public class Q10962_NewHorizons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10964_SecretGarden/Q10964_SecretGarden.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10964_SecretGarden/Q10964_SecretGarden.java
index 0ee5a011d3..20cae72bb2 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10964_SecretGarden/Q10964_SecretGarden.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10964_SecretGarden/Q10964_SecretGarden.java
@@ -73,7 +73,7 @@ public class Q10964_SecretGarden extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10965_DeathMysteries/Q10965_DeathMysteries.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10965_DeathMysteries/Q10965_DeathMysteries.java
index 37ee2123a8..b6a6b30e23 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10965_DeathMysteries/Q10965_DeathMysteries.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10965_DeathMysteries/Q10965_DeathMysteries.java
@@ -74,7 +74,7 @@ public class Q10965_DeathMysteries extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10966_ATripBegins/Q10966_ATripBegins.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10966_ATripBegins/Q10966_ATripBegins.java
index 9d6a50446d..809eb43b60 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10966_ATripBegins/Q10966_ATripBegins.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10966_ATripBegins/Q10966_ATripBegins.java
@@ -84,7 +84,7 @@ public class Q10966_ATripBegins extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10967_CulturedAdventurer/Q10967_CulturedAdventurer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10967_CulturedAdventurer/Q10967_CulturedAdventurer.java
index 88207f42e7..0998a28109 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10967_CulturedAdventurer/Q10967_CulturedAdventurer.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10967_CulturedAdventurer/Q10967_CulturedAdventurer.java
@@ -66,7 +66,7 @@ public class Q10967_CulturedAdventurer extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10968_ThePowerOfTheMagicLamp/Q10968_ThePowerOfTheMagicLamp.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10968_ThePowerOfTheMagicLamp/Q10968_ThePowerOfTheMagicLamp.java
index 6397852d53..95da7212c5 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10968_ThePowerOfTheMagicLamp/Q10968_ThePowerOfTheMagicLamp.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10968_ThePowerOfTheMagicLamp/Q10968_ThePowerOfTheMagicLamp.java
@@ -52,7 +52,7 @@ public class Q10968_ThePowerOfTheMagicLamp extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10969_SporeInfestedPlace/Q10969_SporeInfestedPlace.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10969_SporeInfestedPlace/Q10969_SporeInfestedPlace.java
index 2e1c43c426..a8128d6a27 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10969_SporeInfestedPlace/Q10969_SporeInfestedPlace.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10969_SporeInfestedPlace/Q10969_SporeInfestedPlace.java
@@ -72,7 +72,7 @@ public class Q10969_SporeInfestedPlace extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10970_RespectForGraves/Q10970_RespectForGraves.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10970_RespectForGraves/Q10970_RespectForGraves.java
index 4c9a916ce5..19e8ed24a7 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10970_RespectForGraves/Q10970_RespectForGraves.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10970_RespectForGraves/Q10970_RespectForGraves.java
@@ -71,7 +71,7 @@ public class Q10970_RespectForGraves extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10971_TalismanEnchant/Q10971_TalismanEnchant.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10971_TalismanEnchant/Q10971_TalismanEnchant.java
index 3e1d0864d8..976645757d 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10971_TalismanEnchant/Q10971_TalismanEnchant.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10971_TalismanEnchant/Q10971_TalismanEnchant.java
@@ -49,7 +49,7 @@ public class Q10971_TalismanEnchant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10972_CombiningGems/Q10972_CombiningGems.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10972_CombiningGems/Q10972_CombiningGems.java
index 86f0b52120..be382e0cf1 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10972_CombiningGems/Q10972_CombiningGems.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10972_CombiningGems/Q10972_CombiningGems.java
@@ -46,7 +46,7 @@ public class Q10972_CombiningGems extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10973_EnchantingAgathions/Q10973_EnchantingAgathions.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10973_EnchantingAgathions/Q10973_EnchantingAgathions.java
index dbb98bc9bc..a93a7d44e2 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10973_EnchantingAgathions/Q10973_EnchantingAgathions.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10973_EnchantingAgathions/Q10973_EnchantingAgathions.java
@@ -47,7 +47,7 @@ public class Q10973_EnchantingAgathions extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10974_NewStylishEquipment/Q10974_NewStylishEquipment.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10974_NewStylishEquipment/Q10974_NewStylishEquipment.java
index f336600408..49cedc284e 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10974_NewStylishEquipment/Q10974_NewStylishEquipment.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10974_NewStylishEquipment/Q10974_NewStylishEquipment.java
@@ -56,7 +56,7 @@ public class Q10974_NewStylishEquipment extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10975_LetsPayRespectsToOurFallenBrethren/Q10975_LetsPayRespectsToOurFallenBrethren.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10975_LetsPayRespectsToOurFallenBrethren/Q10975_LetsPayRespectsToOurFallenBrethren.java
index 3324157e6b..79c6b92547 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10975_LetsPayRespectsToOurFallenBrethren/Q10975_LetsPayRespectsToOurFallenBrethren.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10975_LetsPayRespectsToOurFallenBrethren/Q10975_LetsPayRespectsToOurFallenBrethren.java
@@ -75,7 +75,7 @@ public class Q10975_LetsPayRespectsToOurFallenBrethren extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10976_MemoryOfTheGloriousPast/Q10976_MemoryOfTheGloriousPast.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10976_MemoryOfTheGloriousPast/Q10976_MemoryOfTheGloriousPast.java
index 00e95b1501..743348da35 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10976_MemoryOfTheGloriousPast/Q10976_MemoryOfTheGloriousPast.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10976_MemoryOfTheGloriousPast/Q10976_MemoryOfTheGloriousPast.java
@@ -71,7 +71,7 @@ public class Q10976_MemoryOfTheGloriousPast extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10977_TracesOfBattle/Q10977_TracesOfBattle.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10977_TracesOfBattle/Q10977_TracesOfBattle.java
index e9f42a38e6..ea8c5919e1 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10977_TracesOfBattle/Q10977_TracesOfBattle.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10977_TracesOfBattle/Q10977_TracesOfBattle.java
@@ -72,7 +72,7 @@ public class Q10977_TracesOfBattle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10978_MissingPets/Q10978_MissingPets.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10978_MissingPets/Q10978_MissingPets.java
index 3ba4cc84c2..68154775aa 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10978_MissingPets/Q10978_MissingPets.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10978_MissingPets/Q10978_MissingPets.java
@@ -47,7 +47,7 @@ public class Q10978_MissingPets extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10981_UnbearableWolvesHowling/Q10981_UnbearableWolvesHowling.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10981_UnbearableWolvesHowling/Q10981_UnbearableWolvesHowling.java
index c00fe1fb2c..c061824b30 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10981_UnbearableWolvesHowling/Q10981_UnbearableWolvesHowling.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10981_UnbearableWolvesHowling/Q10981_UnbearableWolvesHowling.java
@@ -71,7 +71,7 @@ public class Q10981_UnbearableWolvesHowling extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java
index cc7302cfa6..767e5d2dd8 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java
@@ -80,7 +80,7 @@ public class Q10982_SpiderHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10983_TroubledForest/Q10983_TroubledForest.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10983_TroubledForest/Q10983_TroubledForest.java
index c365b58e47..8a5106ba48 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10983_TroubledForest/Q10983_TroubledForest.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10983_TroubledForest/Q10983_TroubledForest.java
@@ -71,7 +71,7 @@ public class Q10983_TroubledForest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java
index ebe94a7041..ec5024da13 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java
@@ -76,7 +76,7 @@ public class Q10984_CollectSpiderweb extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10985_CleaningUpTheGround/Q10985_CleaningUpTheGround.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10985_CleaningUpTheGround/Q10985_CleaningUpTheGround.java
index 1f96805d55..0b58ef480c 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10985_CleaningUpTheGround/Q10985_CleaningUpTheGround.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10985_CleaningUpTheGround/Q10985_CleaningUpTheGround.java
@@ -72,7 +72,7 @@ public class Q10985_CleaningUpTheGround extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java
index e6f556cb71..85f28033a3 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java
@@ -81,7 +81,7 @@ public class Q10986_SwampMonster extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10987_PlunderedGraves/Q10987_PlunderedGraves.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10987_PlunderedGraves/Q10987_PlunderedGraves.java
index c0390829b6..0dcd587966 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10987_PlunderedGraves/Q10987_PlunderedGraves.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10987_PlunderedGraves/Q10987_PlunderedGraves.java
@@ -72,7 +72,7 @@ public class Q10987_PlunderedGraves extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java
index 26e5961a29..5f09e3a6c1 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java
@@ -81,7 +81,7 @@ public class Q10988_Conspiracy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10989_DangerousPredators/Q10989_DangerousPredators.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10989_DangerousPredators/Q10989_DangerousPredators.java
index 75fa8332a5..fbbb7299ae 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10989_DangerousPredators/Q10989_DangerousPredators.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10989_DangerousPredators/Q10989_DangerousPredators.java
@@ -72,7 +72,7 @@ public class Q10989_DangerousPredators extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java
index a17c45e53f..fcc6642bdc 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java
@@ -68,7 +68,7 @@ public class Q10990_PoisonExtraction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
index 06ea44ceb1..6698687a4e 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
@@ -45,7 +45,7 @@ public class AllianceMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!"9001-01.htm".equals(event) && (player.getClan() == null))
 		{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
index 8d544e2e34..978c0ec647 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
@@ -96,7 +96,7 @@ public class ClanMaster extends AbstractNpcAI
 	};
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LEADER_REQUIRED.containsKey(event) && !player.isClanLeader())
 		{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
index 472b265d19..7560171dd1 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
@@ -61,7 +61,7 @@ public class DarkElfChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
index 9bed690c7f..db6419750d 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
@@ -74,7 +74,7 @@ public class DarkElfChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
index b90395d96a..fe46f96453 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
@@ -50,7 +50,7 @@ public class DwarfBlacksmithChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
index b658cd201b..95f42d44e2 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
@@ -55,7 +55,7 @@ public class DwarfBlacksmithChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
index 187710070c..df7368de42 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
@@ -50,7 +50,7 @@ public class DwarfWarehouseChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
index bcd1325051..e18b5c69e4 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
@@ -54,7 +54,7 @@ public class DwarfWarehouseChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
index b093c78e1d..bb0473e235 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
@@ -58,7 +58,7 @@ public class ElfHumanClericChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
index c0cf3513d7..eff155a55f 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
@@ -59,7 +59,7 @@ public class ElfHumanFighterChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
index 2095c50482..d43d533d9a 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
@@ -73,7 +73,7 @@ public class ElfHumanFighterChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
index ed623b52b0..c5b843fdc1 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
@@ -57,7 +57,7 @@ public class ElfHumanWizardChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
index 78b198c5a5..6482a77a8e 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
@@ -62,7 +62,7 @@ public class ElfHumanWizardChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
index acf6f9bc2f..1a231cd5d9 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
@@ -53,7 +53,7 @@ public class FirstClassTransferTalk extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return event;
 	}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
index e3c48b1f33..324f48a504 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
@@ -51,7 +51,7 @@ public class OrcChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
index c78c927bae..221cff8bde 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
@@ -62,7 +62,7 @@ public class OrcChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/quest/Quest.java
index d396f1fed4..473b65fdc4 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/quest/Quest.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/quest/Quest.java
@@ -252,7 +252,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -274,7 +274,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -565,7 +565,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 			{
 				player.setSimulatedTalking(false);
 			}
-			res = onAdvEvent(event, npc, player);
+			res = onEvent(event, npc, player);
 		}
 		catch (Exception e)
 		{
@@ -1027,12 +1027,11 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 */
 	public String onDeath(Creature killer, Creature victim, QuestState qs)
 	{
-		return onAdvEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
+		return onEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
 	}
 	
 	/**
 	 * This function is called whenever a player clicks on a link in a quest dialog and whenever a timer fires.<br>
-	 * If is not overridden by a subclass, then default to the returned value of the simpler (and older) {@link #onEvent(String, QuestState)} override.<br>
 	 * If the player has a quest state, use it as parameter in the next call, otherwise return null.
 	 * @param event this parameter contains a string identifier for the event.<br>
 	 *            Generally, this string is passed directly via the link.<br>
@@ -1051,35 +1050,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 *            This parameter may be {@code null} in certain circumstances.
 	 * @return the text returned by the event (may be {@code null}, a filename or just text)
 	 */
-	public String onAdvEvent(String event, Npc npc, Player player)
-	{
-		if (player != null)
-		{
-			final QuestState qs = player.getQuestState(getName());
-			if (qs != null)
-			{
-				return onEvent(event, qs);
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * This function is called in place of {@link #onAdvEvent(String, Npc, Player)} if the former is not implemented.<br>
-	 * If a script contains both {@link #onAdvEvent(String, Npc, Player)} and this implementation, then this method will never be called unless the script's {@link #onAdvEvent(String, Npc, Player)} explicitly calls this method.
-	 * @param event this parameter contains a string identifier for the event.<br>
-	 *            Generally, this string is passed directly via the link.<br>
-	 *            For example:<br>
-	 *            <code>
-	 *            &lt;a action="bypass -h Quest 626_ADarkTwilight 31517-01.htm"&gt;hello&lt;/a&gt;
-	 *            </code><br>
-	 *            The above link sets the event variable to "31517-01.htm" for the quest 626_ADarkTwilight.<br>
-	 *            In the case of timers, this will be the name of the timer.<br>
-	 *            This parameter serves as a sort of identifier.
-	 * @param qs this parameter contains a reference to the quest state of the player who used the link or started the timer.
-	 * @return the text returned by the event (may be {@code null}, a filename or just text)
-	 */
-	public String onEvent(String event, QuestState qs)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return null;
 	}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java
index 3817e1be30..db707fe326 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java
@@ -49,7 +49,7 @@ public class Fellow extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
index a26e6075fd..31fc2ba199 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
@@ -43,12 +43,12 @@ public class Toma extends AbstractNpcAI
 	private Toma()
 	{
 		addFirstTalkId(TOMA);
-		onAdvEvent("RESPAWN_TOMA", null, null);
+		onEvent("RESPAWN_TOMA", null, null);
 		startQuestTimer("RESPAWN_TOMA", TELEPORT_DELAY, null, null, true);
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("RESPAWN_TOMA"))
 		{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingIgnis.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingIgnis.java
index 6606e36f7e..a2ad870093 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingIgnis.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingIgnis.java
@@ -49,7 +49,7 @@ public class ResidenceOfKingIgnis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingPetram.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingPetram.java
index 0bb5893075..e041afe21d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingPetram.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingPetram.java
@@ -48,7 +48,7 @@ public class ResidenceOfKingPetram extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingProcella.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingProcella.java
index 9837e1fed4..590574d2ae 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingProcella.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingProcella.java
@@ -62,7 +62,7 @@ public class ResidenceOfKingProcella extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfQueenNebula.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfQueenNebula.java
index 9c3c7ea37b..c897a5d1b1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfQueenNebula.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfQueenNebula.java
@@ -53,7 +53,7 @@ public class ResidenceOfQueenNebula extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
index 6f8858a2a4..dd735beeaa 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
@@ -41,7 +41,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -54,7 +54,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 				npc.deleteMe();
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_DAY_NIGHT_CHANGE)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/FrostCastleZone/FrostLordCastleZone.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/FrostCastleZone/FrostLordCastleZone.java
index f90a79e431..718a93b384 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/FrostCastleZone/FrostLordCastleZone.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/FrostCastleZone/FrostLordCastleZone.java
@@ -129,7 +129,7 @@ public class FrostLordCastleZone extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -180,7 +180,7 @@ public class FrostLordCastleZone extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/Hellbound/HellboundMessenger/HellboundMessenger.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/Hellbound/HellboundMessenger/HellboundMessenger.java
index 084363c2a7..90e5d48753 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/Hellbound/HellboundMessenger/HellboundMessenger.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/Hellbound/HellboundMessenger/HellboundMessenger.java
@@ -42,7 +42,7 @@ public class HellboundMessenger extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == MESSENGER) && event.equals("teleport"))
 		{
@@ -55,7 +55,7 @@ public class HellboundMessenger extends AbstractNpcAI
 			return null;
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java
index 86b549221f..f74231d188 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java
@@ -42,7 +42,7 @@ public class Tarba extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
@@ -55,7 +55,7 @@ public class Tarba extends AbstractNpcAI
 			}
 			return "34134-02.htm";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
index 76379f11ef..9e3b09ef23 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
@@ -38,14 +38,14 @@ public class Roxxy extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TEXT_SPAM") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SPEAK_WITH_ME_ABOUT_TRAVELING_AROUND_ADEN, 1000);
 			startQuestTimer("TEXT_SPAM", getRandom(10000, 30000), npc, null, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
index ce371e1a92..fdb7c42520 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
@@ -49,7 +49,7 @@ public class Arushinai extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("30401-1.htm") || event.equals("30401-2.htm"))
 		{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java
index d918a2bfc3..801a77996a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java
@@ -49,7 +49,7 @@ public class Ateld extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
index 6ee6719c50..ec7aecde57 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
@@ -47,7 +47,7 @@ public class DimensionalVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("30952-1.htm") || event.equals("30952-2.htm") || event.equals("30952-3.htm"))
 		{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index d236e19d43..a5157acfc7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -193,7 +193,7 @@ public class Antharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -605,7 +605,7 @@ public class Antharas extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 4a01a9e786..b5610ec889 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -164,7 +164,7 @@ public class Baium extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -478,7 +478,7 @@ public class Baium extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Core/Core.java
index 71150c1323..b9dcb38092 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -142,7 +142,7 @@ public class Core extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
@@ -161,7 +161,7 @@ public class Core extends AbstractNpcAI
 			_minions.forEach(Attackable::decayMe);
 			_minions.clear();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/LimitBarrier.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/LimitBarrier.java
index 0bc01da7c8..3ec6403956 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/LimitBarrier.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/LimitBarrier.java
@@ -150,7 +150,7 @@ public class LimitBarrier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -179,7 +179,7 @@ public class LimitBarrier extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 84e7cbcd06..b288e64003 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -106,7 +106,7 @@ public class Orfen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -133,7 +133,7 @@ public class Orfen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 4a0cda8c27..01aaaf2461 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -155,7 +155,7 @@ public class QueenAnt extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -239,7 +239,7 @@ public class QueenAnt extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java
index 51bd8a03e0..daa7e95811 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java
@@ -76,7 +76,7 @@ public class SevenSignsRBs extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
index 539094a886..f0c5d33ed2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
@@ -71,13 +71,13 @@ public class Zaken extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("zaken_unlock"))
 		{
 			spawnBoss();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private void spawnBoss()
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/AdditionalServicesAdvisor/AdditionalServicesAdvisor.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/AdditionalServicesAdvisor/AdditionalServicesAdvisor.java
index 3fca5fb70a..50cc6028d8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/AdditionalServicesAdvisor/AdditionalServicesAdvisor.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/AdditionalServicesAdvisor/AdditionalServicesAdvisor.java
@@ -64,7 +64,7 @@ public class AdditionalServicesAdvisor extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String html = null;
 		switch (npc.getId())
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index 04fed5ab1b..b95d115b2c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -59,7 +59,7 @@ public class ArenaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -124,7 +124,7 @@ public class ArenaManager extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java
index c65d275482..7a1750b82f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java
@@ -44,7 +44,7 @@ public class AttributeMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("learn".equalsIgnoreCase(event))
 		{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
index b07792cd2d..11b8786523 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
@@ -57,7 +57,7 @@ public class CastleBlacksmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return (event.equalsIgnoreCase(npc.getId() + "-02.html") && hasRights(player, npc)) ? event : null;
 	}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
index d57854042c..dd16a656dd 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
@@ -393,7 +393,7 @@ public class CastleChamberlain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Castle castle = npc.getCastle();
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
index b9c1f3faf5..70bae86615 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
@@ -72,7 +72,7 @@ public class CastleDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
index bb32dde319..a319e3977f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
@@ -56,7 +56,7 @@ public class CastleMercenaryManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index ce2529e6e1..d97263a476 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -78,7 +78,7 @@ public class CastleTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
@@ -168,7 +168,7 @@ public class CastleTeleporter extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
index bffed40bcc..ea1b40c41c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
@@ -52,7 +52,7 @@ public class CastleWarehouse extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final boolean isMyLord = player.isClanLeader() && (player.getClan().getCastleId() == (npc.getCastle() != null ? npc.getCastle().getResidenceId() : -1));
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index 05751de2da..be64661acc 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -64,7 +64,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
index a86581206e..afd7250ca4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
@@ -57,7 +57,7 @@ public class ClanHallDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 95eaa5d842..d47d6e06bd 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -98,7 +98,7 @@ public class ClanHallManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ClanStrongholdDevice/ClanStrongholdDevice.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ClanStrongholdDevice/ClanStrongholdDevice.java
index ffa8811a99..a5a10d01bb 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ClanStrongholdDevice/ClanStrongholdDevice.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ClanStrongholdDevice/ClanStrongholdDevice.java
@@ -75,18 +75,18 @@ public class ClanStrongholdDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getTemplate().getId() != CLAN_STRONGHOLD_DEVICE) || (player == null) || (event == null))
 		{
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		if (event.equals("capture"))
 		{
 			if (npc.isAlikeDead())
 			{
-				return super.onAdvEvent(event, npc, player);
+				return super.onEvent(event, npc, player);
 			}
 			
 			if (CURRENT_CLAN_ID.containsKey(npc.getScriptValue()))
@@ -112,13 +112,13 @@ public class ClanStrongholdDevice extends AbstractNpcAI
 		{
 			if (npc.isAlikeDead())
 			{
-				return super.onAdvEvent(event, npc, player);
+				return super.onEvent(event, npc, player);
 			}
 			
 			return npc.getId() + (CURRENT_CLAN_ID.containsKey(npc.getScriptValue()) ? "-02" : "") + ".htm";
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 9f568f4a2a..c5e205c83b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -232,7 +232,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		if (!_isEnabled)
 		{
@@ -863,7 +863,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	{
 		if (event.getCommand().startsWith("Quest ClassMaster "))
 		{
-			final String html = onAdvEvent(event.getCommand().substring(18), null, event.getPlayer());
+			final String html = onEvent(event.getCommand().substring(18), null, event.getPlayer());
 			event.getPlayer().sendPacket(TutorialCloseHtml.STATIC_PACKET);
 			showResult(event.getPlayer(), html);
 		}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/DivineBeast.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/DivineBeast.java
index 1f247a7b35..3f3a076992 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/DivineBeast.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/DivineBeast.java
@@ -44,7 +44,7 @@ public class DivineBeast extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player == null) || !player.hasServitors())
 		{
@@ -55,7 +55,7 @@ public class DivineBeast extends AbstractNpcAI
 			cancelQuestTimer(event, npc, player);
 			player.getServitors().values().forEach(summon -> summon.unSummon(player));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
index 229d6bbeb3..524a97346b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
@@ -84,7 +84,7 @@ public class GameAssistant extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
index bebd43fe6c..241ad279cd 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
@@ -68,7 +68,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
index 8124bbbfcc..40455ac26a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
@@ -57,7 +57,7 @@ public class NewbieGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("0"))
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
index acc83d72d8..27ab7e4f74 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
@@ -69,7 +69,7 @@ public class OlyBuffer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.startsWith("giveBuff;") && (npc.getScriptValue() < 5))
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index f09174eb23..5fed0b483c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -70,7 +70,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
index 21d281c6c9..435f293345 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
@@ -84,7 +84,7 @@ public class Proclaimer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("giveBuff"))
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
index ea0a8a16da..1fc1737173 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
@@ -79,7 +79,7 @@ public class ProvisionalHalls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/RandomWalkingGuards.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
index 8138dee3ee..ffe4fd87f1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
@@ -48,7 +48,7 @@ public class RandomWalkingGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("RANDOM_WALK") && (npc != null))
 		{
@@ -59,7 +59,7 @@ public class RandomWalkingGuards extends AbstractNpcAI
 			}
 			startQuestTimer("RANDOM_WALK", getRandom(MIN_WALK_DELAY, MAX_WALK_DELAY), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/Servitors/SinEater.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/Servitors/SinEater.java
index 1ed8d645a5..d7536614e8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/Servitors/SinEater.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/Servitors/SinEater.java
@@ -48,7 +48,7 @@ public class SinEater extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TALK") && (player != null) && (player.getPet() != null))
 		{
@@ -79,7 +79,7 @@ public class SinEater extends AbstractNpcAI
 			}
 			startQuestTimer("TALK", 60000, null, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_CREATURE_DEATH)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
index 59d7caa30e..30731ac83e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
@@ -51,7 +51,7 @@ public class SymbolMaker extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
index 04d4672c76..b595c4d6d4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
@@ -86,7 +86,7 @@ public class ToIVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int npcId = npc.getId();
 		
@@ -132,7 +132,7 @@ public class ToIVortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index 2dedad14e3..68545dd1b6 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -188,7 +188,7 @@ public class WyvernManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
index 0c2e7586c9..c49be5297b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
@@ -36,7 +36,7 @@ public class DelevelManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.DELEVEL_MANAGER_ENABLED)
 		{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
index ff6d40ec0e..4713803f1d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
@@ -54,7 +54,7 @@ public class FactionSystem extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class FactionSystem extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
index 8b9c676ad5..771c8a9058 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
@@ -34,7 +34,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -77,7 +77,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 				npc.broadcastInfo(); // update flag status
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
index 669fcfc85c..ddf7e923eb 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
@@ -39,7 +39,7 @@ public class NoblessMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.NOBLESS_MASTER_ENABLED)
 		{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
index 4f0f0c988a..5ba22124c1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
@@ -215,7 +215,7 @@ public class NpcLocationInfo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (Util.isDigit(event))
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
index 8e1f84c102..3a9b5b4bdc 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
@@ -169,7 +169,7 @@ public class Deathmatch extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
index 1eb84eca93..b92bbe7f77 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
@@ -213,7 +213,7 @@ public class Rabbits extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/events/Race/Race.java
index ff9fc462f6..6ac325ca6f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/events/Race/Race.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/events/Race/Race.java
@@ -320,7 +320,7 @@ public class Race extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index e827184ae4..60da9f13d3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -186,7 +186,7 @@ public class TvT extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java
index 0e8a9686d7..53603f1d34 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java
@@ -41,7 +41,7 @@ public class BlossomFestival extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/DefeatTheQueen/DefeatTheQueen.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/DefeatTheQueen/DefeatTheQueen.java
index dcb563e0ab..7f22cd0327 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/DefeatTheQueen/DefeatTheQueen.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/DefeatTheQueen/DefeatTheQueen.java
@@ -46,7 +46,7 @@ public class DefeatTheQueen extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!isEventPeriod())
 		{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index 53d917a5c7..a00de57ae5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -44,7 +44,7 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/HappyHours/HappyHours.java
index e76af2108a..eb247dbbb3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/HappyHours/HappyHours.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/HappyHours/HappyHours.java
@@ -49,7 +49,7 @@ public class HappyHours extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
index 762cde5596..245342a91e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
@@ -45,7 +45,7 @@ public class ThePowerOfLove extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/TotalRecall/TotalRecall.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
index 4486ac5f36..a5448d4db5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
@@ -42,7 +42,7 @@ public class TotalRecall extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
index ab13115459..6a7beda1f4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
@@ -321,7 +321,7 @@ public class WatermelonNinja extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java
index d1698bbf65..f8e75c1c7e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java
@@ -153,7 +153,7 @@ public class DwellingOfSpirits extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -200,7 +200,7 @@ public class DwellingOfSpirits extends AbstractInstance
 			}
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/GolbergRoom/GolbergRoom.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/GolbergRoom/GolbergRoom.java
index b1a8dcb0a7..4ebb2515e5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/GolbergRoom/GolbergRoom.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/GolbergRoom/GolbergRoom.java
@@ -50,7 +50,7 @@ public class GolbergRoom extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java
index d3fc3ad06b..7b269cc7b7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java
@@ -166,7 +166,7 @@ public class LastImperialTomb extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java
index c1334f906a..96dcb6d101 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java
@@ -62,7 +62,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java
index 31cf01348e..ee04feb336 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java
@@ -103,7 +103,7 @@ public class MonsterArena extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/QueenAntLair/QueenAntLair.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/QueenAntLair/QueenAntLair.java
index f077e72184..39738ef610 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/QueenAntLair/QueenAntLair.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/QueenAntLair/QueenAntLair.java
@@ -56,7 +56,7 @@ public class QueenAntLair extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
index 3465ec2a61..5b72bc9f5b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
@@ -127,7 +127,7 @@ public class TimedHunting extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("ENTER"))
 		{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
index 24aa967f60..f348ed1ada 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
@@ -52,7 +52,7 @@ public class Q00127_FishingSpecialistsRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
index cb7e0dc279..406899d912 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
@@ -146,7 +146,7 @@ public class Q00255_Tutorial extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		// Null check.
 		if (player == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q00502_BrothersBoundInChains/Q00502_BrothersBoundInChains.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q00502_BrothersBoundInChains/Q00502_BrothersBoundInChains.java
index 5783cff4ad..0cf2729e63 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q00502_BrothersBoundInChains/Q00502_BrothersBoundInChains.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q00502_BrothersBoundInChains/Q00502_BrothersBoundInChains.java
@@ -68,7 +68,7 @@ public class Q00502_BrothersBoundInChains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
index c6c6541b90..e40f43ea81 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
@@ -82,7 +82,7 @@ public class Q00662_AGameOfCards extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10290_ATripBegins/Q10290_ATripBegins.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10290_ATripBegins/Q10290_ATripBegins.java
index a47118948e..34774333d9 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10290_ATripBegins/Q10290_ATripBegins.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10290_ATripBegins/Q10290_ATripBegins.java
@@ -78,7 +78,7 @@ public class Q10290_ATripBegins extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10291_MoreExperience/Q10291_MoreExperience.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10291_MoreExperience/Q10291_MoreExperience.java
index 0ba36764c8..b9cae4b5fe 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10291_MoreExperience/Q10291_MoreExperience.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10291_MoreExperience/Q10291_MoreExperience.java
@@ -68,7 +68,7 @@ public class Q10291_MoreExperience extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10292_SecretGarden/Q10292_SecretGarden.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10292_SecretGarden/Q10292_SecretGarden.java
index b3b6f150c4..f6e4358cc8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10292_SecretGarden/Q10292_SecretGarden.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10292_SecretGarden/Q10292_SecretGarden.java
@@ -76,7 +76,7 @@ public class Q10292_SecretGarden extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10293_DeathMysteries/Q10293_DeathMysteries.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10293_DeathMysteries/Q10293_DeathMysteries.java
index 43cc117f9a..59d3b1275d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10293_DeathMysteries/Q10293_DeathMysteries.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10293_DeathMysteries/Q10293_DeathMysteries.java
@@ -77,7 +77,7 @@ public class Q10293_DeathMysteries extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10294_SporeInfestedPlace/Q10294_SporeInfestedPlace.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10294_SporeInfestedPlace/Q10294_SporeInfestedPlace.java
index 7b7198234f..c0931d9328 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10294_SporeInfestedPlace/Q10294_SporeInfestedPlace.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10294_SporeInfestedPlace/Q10294_SporeInfestedPlace.java
@@ -82,7 +82,7 @@ public class Q10294_SporeInfestedPlace extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10295_RespectForGraves/Q10295_RespectForGraves.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10295_RespectForGraves/Q10295_RespectForGraves.java
index d1ccaa6324..340474266f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10295_RespectForGraves/Q10295_RespectForGraves.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10295_RespectForGraves/Q10295_RespectForGraves.java
@@ -82,7 +82,7 @@ public class Q10295_RespectForGraves extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10296_LetsPayRespectsToOurFallenBrethren/Q10296_LetsPayRespectsToOurFallenBrethren.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10296_LetsPayRespectsToOurFallenBrethren/Q10296_LetsPayRespectsToOurFallenBrethren.java
index 3cd254afc7..a127231f3b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10296_LetsPayRespectsToOurFallenBrethren/Q10296_LetsPayRespectsToOurFallenBrethren.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10296_LetsPayRespectsToOurFallenBrethren/Q10296_LetsPayRespectsToOurFallenBrethren.java
@@ -84,7 +84,7 @@ public class Q10296_LetsPayRespectsToOurFallenBrethren extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10297_MemoryOfTheGloriousPast/Q10297_MemoryOfTheGloriousPast.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10297_MemoryOfTheGloriousPast/Q10297_MemoryOfTheGloriousPast.java
index c54e41026c..41969101e2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10297_MemoryOfTheGloriousPast/Q10297_MemoryOfTheGloriousPast.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10297_MemoryOfTheGloriousPast/Q10297_MemoryOfTheGloriousPast.java
@@ -79,7 +79,7 @@ public class Q10297_MemoryOfTheGloriousPast extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10298_TracesOfBattle/Q10298_TracesOfBattle.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10298_TracesOfBattle/Q10298_TracesOfBattle.java
index e594e43661..e747f822e4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10298_TracesOfBattle/Q10298_TracesOfBattle.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10298_TracesOfBattle/Q10298_TracesOfBattle.java
@@ -80,7 +80,7 @@ public class Q10298_TracesOfBattle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10299_GetIncrediblePower/Q10299_GetIncrediblePower.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10299_GetIncrediblePower/Q10299_GetIncrediblePower.java
index b5dc08278b..8cdf110361 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10299_GetIncrediblePower/Q10299_GetIncrediblePower.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10299_GetIncrediblePower/Q10299_GetIncrediblePower.java
@@ -88,7 +88,7 @@ public class Q10299_GetIncrediblePower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10300_ExploringTheCrumaTower/Q10300_ExploringTheCrumaTower.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10300_ExploringTheCrumaTower/Q10300_ExploringTheCrumaTower.java
index cd51f735a4..08b946b239 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10300_ExploringTheCrumaTower/Q10300_ExploringTheCrumaTower.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10300_ExploringTheCrumaTower/Q10300_ExploringTheCrumaTower.java
@@ -75,7 +75,7 @@ public class Q10300_ExploringTheCrumaTower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10301_NotSoSilentValley/Q10301_NotSoSilentValley.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10301_NotSoSilentValley/Q10301_NotSoSilentValley.java
index 348c8be373..97959e91c6 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10301_NotSoSilentValley/Q10301_NotSoSilentValley.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10301_NotSoSilentValley/Q10301_NotSoSilentValley.java
@@ -72,7 +72,7 @@ public class Q10301_NotSoSilentValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10302_FoilPlansOfTheLizardmen/Q10302_FoilPlansOfTheLizardmen.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10302_FoilPlansOfTheLizardmen/Q10302_FoilPlansOfTheLizardmen.java
index db1ae1d0bb..932908d742 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10302_FoilPlansOfTheLizardmen/Q10302_FoilPlansOfTheLizardmen.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10302_FoilPlansOfTheLizardmen/Q10302_FoilPlansOfTheLizardmen.java
@@ -65,7 +65,7 @@ public class Q10302_FoilPlansOfTheLizardmen extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10303_SymbolOfHubris/Q10303_SymbolOfHubris.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10303_SymbolOfHubris/Q10303_SymbolOfHubris.java
index b855005500..62455711ca 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10303_SymbolOfHubris/Q10303_SymbolOfHubris.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10303_SymbolOfHubris/Q10303_SymbolOfHubris.java
@@ -71,7 +71,7 @@ public class Q10303_SymbolOfHubris extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10304_ChangesintheDragonValley/Q10304_ChangesintheDragonValley.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10304_ChangesintheDragonValley/Q10304_ChangesintheDragonValley.java
index ae3ec5af48..572caf643d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10304_ChangesintheDragonValley/Q10304_ChangesintheDragonValley.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10304_ChangesintheDragonValley/Q10304_ChangesintheDragonValley.java
@@ -79,7 +79,7 @@ public class Q10304_ChangesintheDragonValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10305_DragonsSuspiciousMovements/Q10305_DragonsSuspiciousMovements.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10305_DragonsSuspiciousMovements/Q10305_DragonsSuspiciousMovements.java
index 23d645a564..d143081de0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10305_DragonsSuspiciousMovements/Q10305_DragonsSuspiciousMovements.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10305_DragonsSuspiciousMovements/Q10305_DragonsSuspiciousMovements.java
@@ -68,7 +68,7 @@ public class Q10305_DragonsSuspiciousMovements extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10306_StopSelMahumsTroops/Q10306_StopSelMahumsTroops.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10306_StopSelMahumsTroops/Q10306_StopSelMahumsTroops.java
index 129f8cd191..7a95d60fd0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10306_StopSelMahumsTroops/Q10306_StopSelMahumsTroops.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10306_StopSelMahumsTroops/Q10306_StopSelMahumsTroops.java
@@ -79,7 +79,7 @@ public class Q10306_StopSelMahumsTroops extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10307_TurekOrcsSecret/Q10307_TurekOrcsSecret.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10307_TurekOrcsSecret/Q10307_TurekOrcsSecret.java
index a7d7df2750..a5e969d776 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10307_TurekOrcsSecret/Q10307_TurekOrcsSecret.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10307_TurekOrcsSecret/Q10307_TurekOrcsSecret.java
@@ -72,7 +72,7 @@ public class Q10307_TurekOrcsSecret extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java
index 5ae52b8711..9ab7f84e77 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java
@@ -101,7 +101,7 @@ public class Q10673_SagaOfLegend extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10954_SayhaChildren/Q10954_SayhaChildren.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10954_SayhaChildren/Q10954_SayhaChildren.java
index d1141044c1..f1a8b7cbdd 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10954_SayhaChildren/Q10954_SayhaChildren.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10954_SayhaChildren/Q10954_SayhaChildren.java
@@ -63,7 +63,7 @@ public class Q10954_SayhaChildren extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10955_NewLifeLessons/Q10955_NewLifeLessons.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10955_NewLifeLessons/Q10955_NewLifeLessons.java
index 71f710e805..dcafe594da 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10955_NewLifeLessons/Q10955_NewLifeLessons.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10955_NewLifeLessons/Q10955_NewLifeLessons.java
@@ -70,7 +70,7 @@ public class Q10955_NewLifeLessons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10956_WeSylphs/Q10956_WeSylphs.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10956_WeSylphs/Q10956_WeSylphs.java
index 7554012efb..ae3d8d9cd1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10956_WeSylphs/Q10956_WeSylphs.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10956_WeSylphs/Q10956_WeSylphs.java
@@ -81,7 +81,7 @@ public class Q10956_WeSylphs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10957_TheLifeOfADeathKnight/Q10957_TheLifeOfADeathKnight.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10957_TheLifeOfADeathKnight/Q10957_TheLifeOfADeathKnight.java
index 2fec573afe..df9b3d12bb 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10957_TheLifeOfADeathKnight/Q10957_TheLifeOfADeathKnight.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10957_TheLifeOfADeathKnight/Q10957_TheLifeOfADeathKnight.java
@@ -62,7 +62,7 @@ public class Q10957_TheLifeOfADeathKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10958_ExploringNewOpportunities/Q10958_ExploringNewOpportunities.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10958_ExploringNewOpportunities/Q10958_ExploringNewOpportunities.java
index 018e4e95d5..db5d91e536 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10958_ExploringNewOpportunities/Q10958_ExploringNewOpportunities.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10958_ExploringNewOpportunities/Q10958_ExploringNewOpportunities.java
@@ -66,7 +66,7 @@ public class Q10958_ExploringNewOpportunities extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10959_ChallengingYourDestiny/Q10959_ChallengingYourDestiny.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10959_ChallengingYourDestiny/Q10959_ChallengingYourDestiny.java
index 4e170c036e..e615fd6b6e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10959_ChallengingYourDestiny/Q10959_ChallengingYourDestiny.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10959_ChallengingYourDestiny/Q10959_ChallengingYourDestiny.java
@@ -74,7 +74,7 @@ public class Q10959_ChallengingYourDestiny extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10961_EffectiveTraining/Q10961_EffectiveTraining.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10961_EffectiveTraining/Q10961_EffectiveTraining.java
index e3fa1c2f86..7096794ead 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10961_EffectiveTraining/Q10961_EffectiveTraining.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10961_EffectiveTraining/Q10961_EffectiveTraining.java
@@ -73,7 +73,7 @@ public class Q10961_EffectiveTraining extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java
index 7c1a04c861..7ec0076c4b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java
@@ -81,7 +81,7 @@ public class Q10962_NewHorizons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10968_ThePowerOfTheMagicLamp/Q10968_ThePowerOfTheMagicLamp.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10968_ThePowerOfTheMagicLamp/Q10968_ThePowerOfTheMagicLamp.java
index 35abadf77f..97d601a8eb 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10968_ThePowerOfTheMagicLamp/Q10968_ThePowerOfTheMagicLamp.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10968_ThePowerOfTheMagicLamp/Q10968_ThePowerOfTheMagicLamp.java
@@ -52,7 +52,7 @@ public class Q10968_ThePowerOfTheMagicLamp extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10971_TalismanEnchant/Q10971_TalismanEnchant.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10971_TalismanEnchant/Q10971_TalismanEnchant.java
index bf2ecd6938..8e48754823 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10971_TalismanEnchant/Q10971_TalismanEnchant.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10971_TalismanEnchant/Q10971_TalismanEnchant.java
@@ -49,7 +49,7 @@ public class Q10971_TalismanEnchant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10972_CombiningGems/Q10972_CombiningGems.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10972_CombiningGems/Q10972_CombiningGems.java
index 86f0b52120..be382e0cf1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10972_CombiningGems/Q10972_CombiningGems.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10972_CombiningGems/Q10972_CombiningGems.java
@@ -46,7 +46,7 @@ public class Q10972_CombiningGems extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10973_EnchantingAgathions/Q10973_EnchantingAgathions.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10973_EnchantingAgathions/Q10973_EnchantingAgathions.java
index ac11b50139..54ee8507c8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10973_EnchantingAgathions/Q10973_EnchantingAgathions.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10973_EnchantingAgathions/Q10973_EnchantingAgathions.java
@@ -50,7 +50,7 @@ public class Q10973_EnchantingAgathions extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10974_NewStylishEquipment/Q10974_NewStylishEquipment.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10974_NewStylishEquipment/Q10974_NewStylishEquipment.java
index 7ab80fefd9..a94d1678ae 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10974_NewStylishEquipment/Q10974_NewStylishEquipment.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10974_NewStylishEquipment/Q10974_NewStylishEquipment.java
@@ -57,7 +57,7 @@ public class Q10974_NewStylishEquipment extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10978_MissingPets/Q10978_MissingPets.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10978_MissingPets/Q10978_MissingPets.java
index 3ba4cc84c2..68154775aa 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10978_MissingPets/Q10978_MissingPets.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10978_MissingPets/Q10978_MissingPets.java
@@ -47,7 +47,7 @@ public class Q10978_MissingPets extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10981_UnbearableWolvesHowling/Q10981_UnbearableWolvesHowling.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10981_UnbearableWolvesHowling/Q10981_UnbearableWolvesHowling.java
index c00fe1fb2c..c061824b30 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10981_UnbearableWolvesHowling/Q10981_UnbearableWolvesHowling.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10981_UnbearableWolvesHowling/Q10981_UnbearableWolvesHowling.java
@@ -71,7 +71,7 @@ public class Q10981_UnbearableWolvesHowling extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java
index cc7302cfa6..767e5d2dd8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java
@@ -80,7 +80,7 @@ public class Q10982_SpiderHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10983_TroubledForest/Q10983_TroubledForest.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10983_TroubledForest/Q10983_TroubledForest.java
index c365b58e47..8a5106ba48 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10983_TroubledForest/Q10983_TroubledForest.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10983_TroubledForest/Q10983_TroubledForest.java
@@ -71,7 +71,7 @@ public class Q10983_TroubledForest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java
index ebe94a7041..ec5024da13 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java
@@ -76,7 +76,7 @@ public class Q10984_CollectSpiderweb extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10985_CleaningUpTheGround/Q10985_CleaningUpTheGround.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10985_CleaningUpTheGround/Q10985_CleaningUpTheGround.java
index 1f96805d55..0b58ef480c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10985_CleaningUpTheGround/Q10985_CleaningUpTheGround.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10985_CleaningUpTheGround/Q10985_CleaningUpTheGround.java
@@ -72,7 +72,7 @@ public class Q10985_CleaningUpTheGround extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java
index e6f556cb71..85f28033a3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java
@@ -81,7 +81,7 @@ public class Q10986_SwampMonster extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10987_PlunderedGraves/Q10987_PlunderedGraves.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10987_PlunderedGraves/Q10987_PlunderedGraves.java
index c0390829b6..0dcd587966 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10987_PlunderedGraves/Q10987_PlunderedGraves.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10987_PlunderedGraves/Q10987_PlunderedGraves.java
@@ -72,7 +72,7 @@ public class Q10987_PlunderedGraves extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java
index 26e5961a29..5f09e3a6c1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java
@@ -81,7 +81,7 @@ public class Q10988_Conspiracy extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10989_DangerousPredators/Q10989_DangerousPredators.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10989_DangerousPredators/Q10989_DangerousPredators.java
index 75fa8332a5..fbbb7299ae 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10989_DangerousPredators/Q10989_DangerousPredators.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10989_DangerousPredators/Q10989_DangerousPredators.java
@@ -72,7 +72,7 @@ public class Q10989_DangerousPredators extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java
index a17c45e53f..fcc6642bdc 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java
@@ -68,7 +68,7 @@ public class Q10990_PoisonExtraction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
index 06ea44ceb1..6698687a4e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
@@ -45,7 +45,7 @@ public class AllianceMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!"9001-01.htm".equals(event) && (player.getClan() == null))
 		{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
index 8d544e2e34..978c0ec647 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
@@ -96,7 +96,7 @@ public class ClanMaster extends AbstractNpcAI
 	};
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LEADER_REQUIRED.containsKey(event) && !player.isClanLeader())
 		{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
index 472b265d19..7560171dd1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
@@ -61,7 +61,7 @@ public class DarkElfChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
index 9bed690c7f..db6419750d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
@@ -74,7 +74,7 @@ public class DarkElfChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
index b90395d96a..fe46f96453 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
@@ -50,7 +50,7 @@ public class DwarfBlacksmithChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
index b658cd201b..95f42d44e2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
@@ -55,7 +55,7 @@ public class DwarfBlacksmithChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
index 187710070c..df7368de42 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
@@ -50,7 +50,7 @@ public class DwarfWarehouseChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
index bcd1325051..e18b5c69e4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
@@ -54,7 +54,7 @@ public class DwarfWarehouseChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
index b093c78e1d..bb0473e235 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
@@ -58,7 +58,7 @@ public class ElfHumanClericChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
index c0cf3513d7..eff155a55f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
@@ -59,7 +59,7 @@ public class ElfHumanFighterChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
index 2095c50482..d43d533d9a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
@@ -73,7 +73,7 @@ public class ElfHumanFighterChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
index ed623b52b0..c5b843fdc1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
@@ -57,7 +57,7 @@ public class ElfHumanWizardChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
index 78b198c5a5..6482a77a8e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
@@ -62,7 +62,7 @@ public class ElfHumanWizardChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
index acf6f9bc2f..1a231cd5d9 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
@@ -53,7 +53,7 @@ public class FirstClassTransferTalk extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return event;
 	}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
index e3c48b1f33..324f48a504 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
@@ -51,7 +51,7 @@ public class OrcChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
index c78c927bae..221cff8bde 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
@@ -62,7 +62,7 @@ public class OrcChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/quest/Quest.java
index d396f1fed4..473b65fdc4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/quest/Quest.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/quest/Quest.java
@@ -252,7 +252,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -274,7 +274,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -565,7 +565,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 			{
 				player.setSimulatedTalking(false);
 			}
-			res = onAdvEvent(event, npc, player);
+			res = onEvent(event, npc, player);
 		}
 		catch (Exception e)
 		{
@@ -1027,12 +1027,11 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 */
 	public String onDeath(Creature killer, Creature victim, QuestState qs)
 	{
-		return onAdvEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
+		return onEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
 	}
 	
 	/**
 	 * This function is called whenever a player clicks on a link in a quest dialog and whenever a timer fires.<br>
-	 * If is not overridden by a subclass, then default to the returned value of the simpler (and older) {@link #onEvent(String, QuestState)} override.<br>
 	 * If the player has a quest state, use it as parameter in the next call, otherwise return null.
 	 * @param event this parameter contains a string identifier for the event.<br>
 	 *            Generally, this string is passed directly via the link.<br>
@@ -1051,35 +1050,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 *            This parameter may be {@code null} in certain circumstances.
 	 * @return the text returned by the event (may be {@code null}, a filename or just text)
 	 */
-	public String onAdvEvent(String event, Npc npc, Player player)
-	{
-		if (player != null)
-		{
-			final QuestState qs = player.getQuestState(getName());
-			if (qs != null)
-			{
-				return onEvent(event, qs);
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * This function is called in place of {@link #onAdvEvent(String, Npc, Player)} if the former is not implemented.<br>
-	 * If a script contains both {@link #onAdvEvent(String, Npc, Player)} and this implementation, then this method will never be called unless the script's {@link #onAdvEvent(String, Npc, Player)} explicitly calls this method.
-	 * @param event this parameter contains a string identifier for the event.<br>
-	 *            Generally, this string is passed directly via the link.<br>
-	 *            For example:<br>
-	 *            <code>
-	 *            &lt;a action="bypass -h Quest 626_ADarkTwilight 31517-01.htm"&gt;hello&lt;/a&gt;
-	 *            </code><br>
-	 *            The above link sets the event variable to "31517-01.htm" for the quest 626_ADarkTwilight.<br>
-	 *            In the case of timers, this will be the name of the timer.<br>
-	 *            This parameter serves as a sort of identifier.
-	 * @param qs this parameter contains a reference to the quest state of the player who used the link or started the timer.
-	 * @return the text returned by the event (may be {@code null}, a filename or just text)
-	 */
-	public String onEvent(String event, QuestState qs)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return null;
 	}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java
index 3817e1be30..db707fe326 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java
@@ -49,7 +49,7 @@ public class Fellow extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
index a26e6075fd..31fc2ba199 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
@@ -43,12 +43,12 @@ public class Toma extends AbstractNpcAI
 	private Toma()
 	{
 		addFirstTalkId(TOMA);
-		onAdvEvent("RESPAWN_TOMA", null, null);
+		onEvent("RESPAWN_TOMA", null, null);
 		startQuestTimer("RESPAWN_TOMA", TELEPORT_DELAY, null, null, true);
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("RESPAWN_TOMA"))
 		{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingIgnis.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingIgnis.java
index 6606e36f7e..a2ad870093 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingIgnis.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingIgnis.java
@@ -49,7 +49,7 @@ public class ResidenceOfKingIgnis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingPetram.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingPetram.java
index 0bb5893075..e041afe21d 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingPetram.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingPetram.java
@@ -48,7 +48,7 @@ public class ResidenceOfKingPetram extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingProcella.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingProcella.java
index 9837e1fed4..590574d2ae 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingProcella.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingProcella.java
@@ -62,7 +62,7 @@ public class ResidenceOfKingProcella extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfQueenNebula.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfQueenNebula.java
index 9c3c7ea37b..c897a5d1b1 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfQueenNebula.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfQueenNebula.java
@@ -53,7 +53,7 @@ public class ResidenceOfQueenNebula extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
index 6f8858a2a4..dd735beeaa 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
@@ -41,7 +41,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -54,7 +54,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 				npc.deleteMe();
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_DAY_NIGHT_CHANGE)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/FrostCastleZone/FrostLordCastleZone.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/FrostCastleZone/FrostLordCastleZone.java
index b025542e79..ec658a5509 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/FrostCastleZone/FrostLordCastleZone.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/FrostCastleZone/FrostLordCastleZone.java
@@ -130,7 +130,7 @@ public class FrostLordCastleZone extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -181,7 +181,7 @@ public class FrostLordCastleZone extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/Hellbound/CitadelTeleport/CitadelTeleport.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/Hellbound/CitadelTeleport/CitadelTeleport.java
index c26d094b0c..3b816cde80 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/Hellbound/CitadelTeleport/CitadelTeleport.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/Hellbound/CitadelTeleport/CitadelTeleport.java
@@ -54,7 +54,7 @@ public class CitadelTeleport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
@@ -62,7 +62,7 @@ public class CitadelTeleport extends AbstractNpcAI
 			return null;
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/Hellbound/HellboundMessenger/HellboundMessenger.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/Hellbound/HellboundMessenger/HellboundMessenger.java
index 084363c2a7..90e5d48753 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/Hellbound/HellboundMessenger/HellboundMessenger.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/Hellbound/HellboundMessenger/HellboundMessenger.java
@@ -42,7 +42,7 @@ public class HellboundMessenger extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == MESSENGER) && event.equals("teleport"))
 		{
@@ -55,7 +55,7 @@ public class HellboundMessenger extends AbstractNpcAI
 			return null;
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java
index 86b549221f..f74231d188 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java
@@ -42,7 +42,7 @@ public class Tarba extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
@@ -55,7 +55,7 @@ public class Tarba extends AbstractNpcAI
 			}
 			return "34134-02.htm";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
index 76379f11ef..9e3b09ef23 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
@@ -38,14 +38,14 @@ public class Roxxy extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TEXT_SPAM") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SPEAK_WITH_ME_ABOUT_TRAVELING_AROUND_ADEN, 1000);
 			startQuestTimer("TEXT_SPAM", getRandom(10000, 30000), npc, null, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
index 2e66b29f26..78530f693a 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
@@ -49,7 +49,7 @@ public class Arushinai extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("30401-1.htm") || event.equals("30401-2.htm"))
 		{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java
index d918a2bfc3..801a77996a 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java
@@ -49,7 +49,7 @@ public class Ateld extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
index d834a00b2a..f7397e754c 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
@@ -47,7 +47,7 @@ public class DimensionalVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("30952-1.htm") || event.equals("30952-2.htm") || event.equals("30952-3.htm"))
 		{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index d236e19d43..a5157acfc7 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -193,7 +193,7 @@ public class Antharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -605,7 +605,7 @@ public class Antharas extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 4a01a9e786..b5610ec889 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -164,7 +164,7 @@ public class Baium extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -478,7 +478,7 @@ public class Baium extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/bosses/Core/Core.java
index 71150c1323..b9dcb38092 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -142,7 +142,7 @@ public class Core extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
@@ -161,7 +161,7 @@ public class Core extends AbstractNpcAI
 			_minions.forEach(Attackable::decayMe);
 			_minions.clear();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/bosses/LimitBarrier.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/bosses/LimitBarrier.java
index 40d2ec488d..cf744ddd22 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/bosses/LimitBarrier.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/bosses/LimitBarrier.java
@@ -150,7 +150,7 @@ public class LimitBarrier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -179,7 +179,7 @@ public class LimitBarrier extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index c25f9bbfcc..91357cdeb4 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -106,7 +106,7 @@ public class Orfen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -133,7 +133,7 @@ public class Orfen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 4a0cda8c27..01aaaf2461 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -155,7 +155,7 @@ public class QueenAnt extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -239,7 +239,7 @@ public class QueenAnt extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java
index 51bd8a03e0..daa7e95811 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java
@@ -76,7 +76,7 @@ public class SevenSignsRBs extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
index 539094a886..f0c5d33ed2 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
@@ -71,13 +71,13 @@ public class Zaken extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("zaken_unlock"))
 		{
 			spawnBoss();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private void spawnBoss()
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/AdditionalServicesAdvisor/AdditionalServicesAdvisor.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/AdditionalServicesAdvisor/AdditionalServicesAdvisor.java
index 026324a5c9..5fb2670856 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/AdditionalServicesAdvisor/AdditionalServicesAdvisor.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/AdditionalServicesAdvisor/AdditionalServicesAdvisor.java
@@ -64,7 +64,7 @@ public class AdditionalServicesAdvisor extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String html = null;
 		switch (npc.getId())
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index d6698a4a31..6847dad588 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -59,7 +59,7 @@ public class ArenaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -124,7 +124,7 @@ public class ArenaManager extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java
index c65d275482..7a1750b82f 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java
@@ -44,7 +44,7 @@ public class AttributeMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("learn".equalsIgnoreCase(event))
 		{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
index b07792cd2d..11b8786523 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
@@ -57,7 +57,7 @@ public class CastleBlacksmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return (event.equalsIgnoreCase(npc.getId() + "-02.html") && hasRights(player, npc)) ? event : null;
 	}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
index 30be3d286a..d14969e3ab 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
@@ -393,7 +393,7 @@ public class CastleChamberlain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Castle castle = npc.getCastle();
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
index b9c1f3faf5..70bae86615 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
@@ -72,7 +72,7 @@ public class CastleDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
index bb32dde319..a319e3977f 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
@@ -56,7 +56,7 @@ public class CastleMercenaryManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index ce2529e6e1..d97263a476 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -78,7 +78,7 @@ public class CastleTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
@@ -168,7 +168,7 @@ public class CastleTeleporter extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
index bffed40bcc..ea1b40c41c 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
@@ -52,7 +52,7 @@ public class CastleWarehouse extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final boolean isMyLord = player.isClanLeader() && (player.getClan().getCastleId() == (npc.getCastle() != null ? npc.getCastle().getResidenceId() : -1));
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index 05751de2da..be64661acc 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -64,7 +64,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
index a86581206e..afd7250ca4 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
@@ -57,7 +57,7 @@ public class ClanHallDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 8e1205812c..348e92cfc1 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -98,7 +98,7 @@ public class ClanHallManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/ClanStrongholdDevice/ClanStrongholdDevice.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/ClanStrongholdDevice/ClanStrongholdDevice.java
index ffa8811a99..a5a10d01bb 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/ClanStrongholdDevice/ClanStrongholdDevice.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/ClanStrongholdDevice/ClanStrongholdDevice.java
@@ -75,18 +75,18 @@ public class ClanStrongholdDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getTemplate().getId() != CLAN_STRONGHOLD_DEVICE) || (player == null) || (event == null))
 		{
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		if (event.equals("capture"))
 		{
 			if (npc.isAlikeDead())
 			{
-				return super.onAdvEvent(event, npc, player);
+				return super.onEvent(event, npc, player);
 			}
 			
 			if (CURRENT_CLAN_ID.containsKey(npc.getScriptValue()))
@@ -112,13 +112,13 @@ public class ClanStrongholdDevice extends AbstractNpcAI
 		{
 			if (npc.isAlikeDead())
 			{
-				return super.onAdvEvent(event, npc, player);
+				return super.onEvent(event, npc, player);
 			}
 			
 			return npc.getId() + (CURRENT_CLAN_ID.containsKey(npc.getScriptValue()) ? "-02" : "") + ".htm";
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 8227f0e60c..deae4fc081 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -232,7 +232,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		if (!_isEnabled)
 		{
@@ -873,7 +873,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	{
 		if (event.getCommand().startsWith("Quest ClassMaster "))
 		{
-			final String html = onAdvEvent(event.getCommand().substring(18), null, event.getPlayer());
+			final String html = onEvent(event.getCommand().substring(18), null, event.getPlayer());
 			event.getPlayer().sendPacket(TutorialCloseHtml.STATIC_PACKET);
 			showResult(event.getPlayer(), html);
 		}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/DivineBeast.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/DivineBeast.java
index 1f247a7b35..3f3a076992 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/DivineBeast.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/DivineBeast.java
@@ -44,7 +44,7 @@ public class DivineBeast extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player == null) || !player.hasServitors())
 		{
@@ -55,7 +55,7 @@ public class DivineBeast extends AbstractNpcAI
 			cancelQuestTimer(event, npc, player);
 			player.getServitors().values().forEach(summon -> summon.unSummon(player));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
index f16575b21c..6f4457051f 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
@@ -94,7 +94,7 @@ public class GameAssistant extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/MagicLampGenieLetter/MagicLampGenieLetter.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/MagicLampGenieLetter/MagicLampGenieLetter.java
index c2117136f2..4f5afa9dab 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/MagicLampGenieLetter/MagicLampGenieLetter.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/MagicLampGenieLetter/MagicLampGenieLetter.java
@@ -53,7 +53,7 @@ public class MagicLampGenieLetter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
index bebd43fe6c..241ad279cd 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
@@ -68,7 +68,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
index 8124bbbfcc..40455ac26a 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
@@ -57,7 +57,7 @@ public class NewbieGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("0"))
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
index acc83d72d8..27ab7e4f74 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
@@ -69,7 +69,7 @@ public class OlyBuffer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.startsWith("giveBuff;") && (npc.getScriptValue() < 5))
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index f09174eb23..5fed0b483c 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -70,7 +70,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
index 21d281c6c9..435f293345 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
@@ -84,7 +84,7 @@ public class Proclaimer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("giveBuff"))
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
index ea0a8a16da..1fc1737173 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
@@ -79,7 +79,7 @@ public class ProvisionalHalls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/RandomWalkingGuards.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
index 8138dee3ee..ffe4fd87f1 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
@@ -48,7 +48,7 @@ public class RandomWalkingGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("RANDOM_WALK") && (npc != null))
 		{
@@ -59,7 +59,7 @@ public class RandomWalkingGuards extends AbstractNpcAI
 			}
 			startQuestTimer("RANDOM_WALK", getRandom(MIN_WALK_DELAY, MAX_WALK_DELAY), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/Servitors/SinEater.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/Servitors/SinEater.java
index 1425dfc6d0..6b9ae5aa23 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/Servitors/SinEater.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/Servitors/SinEater.java
@@ -48,7 +48,7 @@ public class SinEater extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TALK") && (player != null) && (player.getPet() != null))
 		{
@@ -79,7 +79,7 @@ public class SinEater extends AbstractNpcAI
 			}
 			startQuestTimer("TALK", 60000, null, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_CREATURE_DEATH)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/Subjugation/Yand/Yand.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/Subjugation/Yand/Yand.java
index ccd264c215..d56a11a706 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/Subjugation/Yand/Yand.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/Subjugation/Yand/Yand.java
@@ -43,7 +43,7 @@ public class Yand extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
index 59d7caa30e..30731ac83e 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
@@ -51,7 +51,7 @@ public class SymbolMaker extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
index 04d4672c76..b595c4d6d4 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
@@ -86,7 +86,7 @@ public class ToIVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int npcId = npc.getId();
 		
@@ -132,7 +132,7 @@ public class ToIVortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index 2dedad14e3..68545dd1b6 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -188,7 +188,7 @@ public class WyvernManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
index 0c2e7586c9..c49be5297b 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
@@ -36,7 +36,7 @@ public class DelevelManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.DELEVEL_MANAGER_ENABLED)
 		{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
index ff6d40ec0e..4713803f1d 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
@@ -54,7 +54,7 @@ public class FactionSystem extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class FactionSystem extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
index 8b9c676ad5..771c8a9058 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
@@ -34,7 +34,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -77,7 +77,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 				npc.broadcastInfo(); // update flag status
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
index 669fcfc85c..ddf7e923eb 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
@@ -39,7 +39,7 @@ public class NoblessMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.NOBLESS_MASTER_ENABLED)
 		{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
index 4f0f0c988a..5ba22124c1 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
@@ -215,7 +215,7 @@ public class NpcLocationInfo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (Util.isDigit(event))
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
index 8e1f84c102..3a9b5b4bdc 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
@@ -169,7 +169,7 @@ public class Deathmatch extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
index 1eb84eca93..b92bbe7f77 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
@@ -213,7 +213,7 @@ public class Rabbits extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/events/Race/Race.java
index ff9fc462f6..6ac325ca6f 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/events/Race/Race.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/events/Race/Race.java
@@ -320,7 +320,7 @@ public class Race extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index e827184ae4..60da9f13d3 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -186,7 +186,7 @@ public class TvT extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/BattleWithKeber/BattleWithKeber.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/BattleWithKeber/BattleWithKeber.java
index 3da53815ff..f7ba92bc99 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/BattleWithKeber/BattleWithKeber.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/BattleWithKeber/BattleWithKeber.java
@@ -205,7 +205,7 @@ public class BattleWithKeber extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java
index 0e8a9686d7..53603f1d34 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java
@@ -41,7 +41,7 @@ public class BlossomFestival extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/DefeatTheQueen/DefeatTheQueen.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/DefeatTheQueen/DefeatTheQueen.java
index dcb563e0ab..7f22cd0327 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/DefeatTheQueen/DefeatTheQueen.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/DefeatTheQueen/DefeatTheQueen.java
@@ -46,7 +46,7 @@ public class DefeatTheQueen extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!isEventPeriod())
 		{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index 53d917a5c7..a00de57ae5 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -44,7 +44,7 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/HappyHours/HappyHours.java
index e76af2108a..eb247dbbb3 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/HappyHours/HappyHours.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/HappyHours/HappyHours.java
@@ -49,7 +49,7 @@ public class HappyHours extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/HolidayOutOfSchedule/HolidayOutOfSchedule.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/HolidayOutOfSchedule/HolidayOutOfSchedule.java
index c61dc92599..6a294e04b7 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/HolidayOutOfSchedule/HolidayOutOfSchedule.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/HolidayOutOfSchedule/HolidayOutOfSchedule.java
@@ -167,7 +167,7 @@ public class HolidayOutOfSchedule extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -242,7 +242,7 @@ public class HolidayOutOfSchedule extends LongTimeEvent
 				despawnSanta();
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
index 762cde5596..245342a91e 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
@@ -45,7 +45,7 @@ public class ThePowerOfLove extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/TotalRecall/TotalRecall.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
index 4486ac5f36..a5448d4db5 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
@@ -42,7 +42,7 @@ public class TotalRecall extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
index ab13115459..6a7beda1f4 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
@@ -321,7 +321,7 @@ public class WatermelonNinja extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/DreamDungeon/CatGuildsLair/CatGuildsLair.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/DreamDungeon/CatGuildsLair/CatGuildsLair.java
index fb3d7bbd9c..92bc0b814d 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/DreamDungeon/CatGuildsLair/CatGuildsLair.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/DreamDungeon/CatGuildsLair/CatGuildsLair.java
@@ -155,7 +155,7 @@ public class CatGuildsLair extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance instance = npc.getInstanceWorld();
 		if ((instance == null) || (instance.getStatus() < CREATED))
@@ -169,7 +169,7 @@ public class CatGuildsLair extends AbstractInstance
 			setRandomTitles(instance, true);
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private void spawnBoss(Instance instance)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/DreamDungeon/DreamPriestess/DreamPriestess.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/DreamDungeon/DreamPriestess/DreamPriestess.java
index 8720a58029..03a43ac469 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/DreamDungeon/DreamPriestess/DreamPriestess.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/DreamDungeon/DreamPriestess/DreamPriestess.java
@@ -63,11 +63,11 @@ public class DreamPriestess extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player == null)
 		{
-			return super.onAdvEvent(event, npc, null);
+			return super.onEvent(event, npc, null);
 		}
 		
 		if (event.startsWith("enter_dream_dungeon"))
@@ -98,7 +98,7 @@ public class DreamPriestess extends AbstractInstance
 				{
 					enterInstance(player, npc, DraconidFortress.INSTANCE_ID);
 					ThreadPool.schedule(() -> CatGuildsLair.startCatLairInstance(player), 5000);
-					return super.onAdvEvent(event, npc, player);
+					return super.onEvent(event, npc, player);
 				}
 				
 				if (!INSTANCE_IDS.contains(dungeonId))
@@ -155,7 +155,7 @@ public class DreamPriestess extends AbstractInstance
 			}
 			return DREAM_PRIESTESS + "-gm.htm";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private static boolean checkRequirementsForEnter(Player requestor)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java
index bf71fda5e1..36f6a71c4d 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java
@@ -153,7 +153,7 @@ public class DwellingOfSpirits extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -199,7 +199,7 @@ public class DwellingOfSpirits extends AbstractInstance
 			}
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/GolbergRoom/GolbergRoom.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/GolbergRoom/GolbergRoom.java
index b1a8dcb0a7..4ebb2515e5 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/GolbergRoom/GolbergRoom.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/GolbergRoom/GolbergRoom.java
@@ -50,7 +50,7 @@ public class GolbergRoom extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java
index d23d73f924..35f1fa1f25 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java
@@ -165,7 +165,7 @@ public class LastImperialTomb extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java
index c1334f906a..96dcb6d101 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java
@@ -62,7 +62,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java
index 2a549faa80..abdf8e901b 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java
@@ -103,7 +103,7 @@ public class MonsterArena extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/QueenAntLair/QueenAntLair.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/QueenAntLair/QueenAntLair.java
index 2c491fe938..6a58ce7f6e 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/QueenAntLair/QueenAntLair.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/QueenAntLair/QueenAntLair.java
@@ -56,7 +56,7 @@ public class QueenAntLair extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
index 9d62f7945d..a3d22266f6 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
@@ -141,7 +141,7 @@ public class TimedHunting extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("ENTER"))
 		{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/TrainingZone/TrainingZone.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/TrainingZone/TrainingZone.java
index e35fced42b..5f4d2152a8 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/TrainingZone/TrainingZone.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/TrainingZone/TrainingZone.java
@@ -165,7 +165,7 @@ public class TrainingZone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("ENTER"))
 		{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/ValakasTemple/DummyIfrit.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/ValakasTemple/DummyIfrit.java
index 1e39098a39..8055d93d2b 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/ValakasTemple/DummyIfrit.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/ValakasTemple/DummyIfrit.java
@@ -38,7 +38,7 @@ public class DummyIfrit extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if ((world == null) || (world.getTemplateId() != ValakasTemple.VALAKAS_TEMPLE_INSTANCE_ID))
@@ -58,7 +58,7 @@ public class DummyIfrit extends AbstractNpcAI
 			}
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/ValakasTemple/Teleporter/ValakasTempleTeleport.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/ValakasTemple/Teleporter/ValakasTempleTeleport.java
index 6f84f87e69..43fbe83287 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/ValakasTemple/Teleporter/ValakasTempleTeleport.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/ValakasTemple/Teleporter/ValakasTempleTeleport.java
@@ -46,7 +46,7 @@ public class ValakasTempleTeleport extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -73,7 +73,7 @@ public class ValakasTempleTeleport extends AbstractInstance
 				PLAYER_TO_LOGIN.remove(player.getObjectId());
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private static boolean checkRequirementsForEnter(Player requestor)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
index 24aa967f60..f348ed1ada 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java
@@ -52,7 +52,7 @@ public class Q00127_FishingSpecialistsRequest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
index e63c3b2a84..24030547b1 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
@@ -142,7 +142,7 @@ public class Q00255_Tutorial extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		// Null check.
 		if (player == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00401_BuryInOblivion/Q00401_BuryInOblivion.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00401_BuryInOblivion/Q00401_BuryInOblivion.java
index 640f723065..3bf39a46b1 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00401_BuryInOblivion/Q00401_BuryInOblivion.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00401_BuryInOblivion/Q00401_BuryInOblivion.java
@@ -62,7 +62,7 @@ public class Q00401_BuryInOblivion extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00402_ArmedWithBows/Q00402_ArmedWithBows.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00402_ArmedWithBows/Q00402_ArmedWithBows.java
index 1076bac3e8..28c625ec2a 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00402_ArmedWithBows/Q00402_ArmedWithBows.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00402_ArmedWithBows/Q00402_ArmedWithBows.java
@@ -58,7 +58,7 @@ public class Q00402_ArmedWithBows extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00403_TraceOfDeath/Q00403_TraceOfDeath.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00403_TraceOfDeath/Q00403_TraceOfDeath.java
index 140f89d272..a5d1e6a343 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00403_TraceOfDeath/Q00403_TraceOfDeath.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00403_TraceOfDeath/Q00403_TraceOfDeath.java
@@ -58,7 +58,7 @@ public class Q00403_TraceOfDeath extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00404_AnythingButSkeletons/Q00404_AnythingButSkeletons.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00404_AnythingButSkeletons/Q00404_AnythingButSkeletons.java
index 11948ca1f5..5d924fcac8 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00404_AnythingButSkeletons/Q00404_AnythingButSkeletons.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00404_AnythingButSkeletons/Q00404_AnythingButSkeletons.java
@@ -61,7 +61,7 @@ public class Q00404_AnythingButSkeletons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00405_GuardingTheFieldsOfMassacre/Q00405_GuardingTheFieldsOfMassacre.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00405_GuardingTheFieldsOfMassacre/Q00405_GuardingTheFieldsOfMassacre.java
index 9d1caf72d4..8b7ea7ed78 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00405_GuardingTheFieldsOfMassacre/Q00405_GuardingTheFieldsOfMassacre.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00405_GuardingTheFieldsOfMassacre/Q00405_GuardingTheFieldsOfMassacre.java
@@ -64,7 +64,7 @@ public class Q00405_GuardingTheFieldsOfMassacre extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00406_ExploringTheFieldsOfMassacre/Q00406_ExploringTheFieldsOfMassacre.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00406_ExploringTheFieldsOfMassacre/Q00406_ExploringTheFieldsOfMassacre.java
index b96fea77fd..431ca5d145 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00406_ExploringTheFieldsOfMassacre/Q00406_ExploringTheFieldsOfMassacre.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00406_ExploringTheFieldsOfMassacre/Q00406_ExploringTheFieldsOfMassacre.java
@@ -70,7 +70,7 @@ public class Q00406_ExploringTheFieldsOfMassacre extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00408_ScoutStrike/Q00408_ScoutStrike.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00408_ScoutStrike/Q00408_ScoutStrike.java
index d214eebe1e..0b982bed2b 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00408_ScoutStrike/Q00408_ScoutStrike.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00408_ScoutStrike/Q00408_ScoutStrike.java
@@ -58,7 +58,7 @@ public class Q00408_ScoutStrike extends Quest
 	
 
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00409_PunishVanorSilenos/Q00409_PunishVanorSilenos.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00409_PunishVanorSilenos/Q00409_PunishVanorSilenos.java
index 4f61ade39c..c64ad42844 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00409_PunishVanorSilenos/Q00409_PunishVanorSilenos.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00409_PunishVanorSilenos/Q00409_PunishVanorSilenos.java
@@ -58,7 +58,7 @@ public class Q00409_PunishVanorSilenos extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00410_MainStrike/Q00410_MainStrike.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00410_MainStrike/Q00410_MainStrike.java
index a67498e4cd..623b8d7a48 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00410_MainStrike/Q00410_MainStrike.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00410_MainStrike/Q00410_MainStrike.java
@@ -59,7 +59,7 @@ public class Q00410_MainStrike extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00411_LeadersAndTheirMinions/Q00411_LeadersAndTheirMinions.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00411_LeadersAndTheirMinions/Q00411_LeadersAndTheirMinions.java
index fb0d09ef7b..5419f405db 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00411_LeadersAndTheirMinions/Q00411_LeadersAndTheirMinions.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00411_LeadersAndTheirMinions/Q00411_LeadersAndTheirMinions.java
@@ -60,7 +60,7 @@ public class Q00411_LeadersAndTheirMinions extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00412_VanorSilenosGuards/Q00412_VanorSilenosGuards.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00412_VanorSilenosGuards/Q00412_VanorSilenosGuards.java
index 1d3ec4d814..71b4cf4262 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00412_VanorSilenosGuards/Q00412_VanorSilenosGuards.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00412_VanorSilenosGuards/Q00412_VanorSilenosGuards.java
@@ -57,7 +57,7 @@ public class Q00412_VanorSilenosGuards extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00413_ExploringThePlainsOfGlory/Q00413_ExploringThePlainsOfGlory.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00413_ExploringThePlainsOfGlory/Q00413_ExploringThePlainsOfGlory.java
index b8bf21153d..b1a6c09e27 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00413_ExploringThePlainsOfGlory/Q00413_ExploringThePlainsOfGlory.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00413_ExploringThePlainsOfGlory/Q00413_ExploringThePlainsOfGlory.java
@@ -66,7 +66,7 @@ public class Q00413_ExploringThePlainsOfGlory extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00415_ThoseCalledHatar/Q00415_ThoseCalledHatar.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00415_ThoseCalledHatar/Q00415_ThoseCalledHatar.java
index c75912cddd..935ebfd559 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00415_ThoseCalledHatar/Q00415_ThoseCalledHatar.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00415_ThoseCalledHatar/Q00415_ThoseCalledHatar.java
@@ -59,7 +59,7 @@ public class Q00415_ThoseCalledHatar extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00416_DeathBringers/Q00416_DeathBringers.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00416_DeathBringers/Q00416_DeathBringers.java
index d57887c645..099888e92f 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00416_DeathBringers/Q00416_DeathBringers.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00416_DeathBringers/Q00416_DeathBringers.java
@@ -60,7 +60,7 @@ public class Q00416_DeathBringers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00417_WeirdCreatures/Q00417_WeirdCreatures.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00417_WeirdCreatures/Q00417_WeirdCreatures.java
index 2bf13e6f70..b98165ea94 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00417_WeirdCreatures/Q00417_WeirdCreatures.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00417_WeirdCreatures/Q00417_WeirdCreatures.java
@@ -58,7 +58,7 @@ public class Q00417_WeirdCreatures extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00418_OrcsAllAround/Q00418_OrcsAllAround.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00418_OrcsAllAround/Q00418_OrcsAllAround.java
index 23393e2081..bf8a78a8c1 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00418_OrcsAllAround/Q00418_OrcsAllAround.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00418_OrcsAllAround/Q00418_OrcsAllAround.java
@@ -57,7 +57,7 @@ public class Q00418_OrcsAllAround extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00419_ThoseLookingForBattle/Q00419_ThoseLookingForBattle.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00419_ThoseLookingForBattle/Q00419_ThoseLookingForBattle.java
index 7e8d75b747..87829e1745 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00419_ThoseLookingForBattle/Q00419_ThoseLookingForBattle.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00419_ThoseLookingForBattle/Q00419_ThoseLookingForBattle.java
@@ -57,7 +57,7 @@ public class Q00419_ThoseLookingForBattle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00420_ExploringTheWarTornPlains/Q00420_ExploringTheWarTornPlains.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00420_ExploringTheWarTornPlains/Q00420_ExploringTheWarTornPlains.java
index 8e4fc9ff7e..21243bb885 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00420_ExploringTheWarTornPlains/Q00420_ExploringTheWarTornPlains.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00420_ExploringTheWarTornPlains/Q00420_ExploringTheWarTornPlains.java
@@ -67,7 +67,7 @@ public class Q00420_ExploringTheWarTornPlains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00422_CrumaTowers3rdFloor/Q00422_CrumaTowers3rdFloor.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00422_CrumaTowers3rdFloor/Q00422_CrumaTowers3rdFloor.java
index 66e13dd79e..aca906b671 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00422_CrumaTowers3rdFloor/Q00422_CrumaTowers3rdFloor.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00422_CrumaTowers3rdFloor/Q00422_CrumaTowers3rdFloor.java
@@ -63,7 +63,7 @@ public class Q00422_CrumaTowers3rdFloor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00423_CrumaTower2ndFloor/Q00423_CrumaTower2ndFloor.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00423_CrumaTower2ndFloor/Q00423_CrumaTower2ndFloor.java
index 80f2fd008d..b26281a1e5 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00423_CrumaTower2ndFloor/Q00423_CrumaTower2ndFloor.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00423_CrumaTower2ndFloor/Q00423_CrumaTower2ndFloor.java
@@ -62,7 +62,7 @@ public class Q00423_CrumaTower2ndFloor extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00424_CrumaTowersMagicalCreatures/Q00424_CrumaTowersMagicalCreatures.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00424_CrumaTowersMagicalCreatures/Q00424_CrumaTowersMagicalCreatures.java
index 33ca5be680..8902c6200e 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00424_CrumaTowersMagicalCreatures/Q00424_CrumaTowersMagicalCreatures.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00424_CrumaTowersMagicalCreatures/Q00424_CrumaTowersMagicalCreatures.java
@@ -60,7 +60,7 @@ public class Q00424_CrumaTowersMagicalCreatures extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00425_GiantsGolems/Q00425_GiantsGolems.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00425_GiantsGolems/Q00425_GiantsGolems.java
index 179f802caa..fe872ca177 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00425_GiantsGolems/Q00425_GiantsGolems.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00425_GiantsGolems/Q00425_GiantsGolems.java
@@ -59,7 +59,7 @@ public class Q00425_GiantsGolems extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00426_SimilarYetDifferent/Q00426_SimilarYetDifferent.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00426_SimilarYetDifferent/Q00426_SimilarYetDifferent.java
index 1dc87b63a5..87d31a40ee 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00426_SimilarYetDifferent/Q00426_SimilarYetDifferent.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00426_SimilarYetDifferent/Q00426_SimilarYetDifferent.java
@@ -59,7 +59,7 @@ public class Q00426_SimilarYetDifferent extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00427_CrumaTowersExploration/Q00427_CrumaTowersExploration.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00427_CrumaTowersExploration/Q00427_CrumaTowersExploration.java
index 9b852c8913..bafcd71510 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00427_CrumaTowersExploration/Q00427_CrumaTowersExploration.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00427_CrumaTowersExploration/Q00427_CrumaTowersExploration.java
@@ -69,7 +69,7 @@ public class Q00427_CrumaTowersExploration extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00429_PoorExcuseForGiants/Q00429_PoorExcuseForGiants.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00429_PoorExcuseForGiants/Q00429_PoorExcuseForGiants.java
index ada398fc94..f6ca70292e 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00429_PoorExcuseForGiants/Q00429_PoorExcuseForGiants.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00429_PoorExcuseForGiants/Q00429_PoorExcuseForGiants.java
@@ -60,7 +60,7 @@ public class Q00429_PoorExcuseForGiants extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00430_GiantsCreations/Q00430_GiantsCreations.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00430_GiantsCreations/Q00430_GiantsCreations.java
index c55726ece4..df62bf38d5 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00430_GiantsCreations/Q00430_GiantsCreations.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00430_GiantsCreations/Q00430_GiantsCreations.java
@@ -58,7 +58,7 @@ public class Q00430_GiantsCreations extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00431_TracesOfAncientCreatures/Q00431_TracesOfAncientCreatures.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00431_TracesOfAncientCreatures/Q00431_TracesOfAncientCreatures.java
index f853a0e3c6..903e9eead7 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00431_TracesOfAncientCreatures/Q00431_TracesOfAncientCreatures.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00431_TracesOfAncientCreatures/Q00431_TracesOfAncientCreatures.java
@@ -58,7 +58,7 @@ public class Q00431_TracesOfAncientCreatures extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00432_TracesOfExperiments/Q00432_TracesOfExperiments.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00432_TracesOfExperiments/Q00432_TracesOfExperiments.java
index a2513f8d2a..36fd4416b3 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00432_TracesOfExperiments/Q00432_TracesOfExperiments.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00432_TracesOfExperiments/Q00432_TracesOfExperiments.java
@@ -57,7 +57,7 @@ public class Q00432_TracesOfExperiments extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00433_NeverForgotten/Q00433_NeverForgotten.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00433_NeverForgotten/Q00433_NeverForgotten.java
index c2f97f138d..52ae0c69e6 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00433_NeverForgotten/Q00433_NeverForgotten.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00433_NeverForgotten/Q00433_NeverForgotten.java
@@ -57,7 +57,7 @@ public class Q00433_NeverForgotten extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00434_ExploringTheSilentValley/Q00434_ExploringTheSilentValley.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00434_ExploringTheSilentValley/Q00434_ExploringTheSilentValley.java
index 63ad340bd7..69c0391ae0 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00434_ExploringTheSilentValley/Q00434_ExploringTheSilentValley.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00434_ExploringTheSilentValley/Q00434_ExploringTheSilentValley.java
@@ -63,7 +63,7 @@ public class Q00434_ExploringTheSilentValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00436_BewareOfTantaLizardmen/Q00436_BewareOfTantaLizardmen.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00436_BewareOfTantaLizardmen/Q00436_BewareOfTantaLizardmen.java
index aa61f27b47..444fd8a437 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00436_BewareOfTantaLizardmen/Q00436_BewareOfTantaLizardmen.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00436_BewareOfTantaLizardmen/Q00436_BewareOfTantaLizardmen.java
@@ -56,7 +56,7 @@ public class Q00436_BewareOfTantaLizardmen extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00437_DangerousLizardmen/Q00437_DangerousLizardmen.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00437_DangerousLizardmen/Q00437_DangerousLizardmen.java
index af2a01d41e..d1ec199380 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00437_DangerousLizardmen/Q00437_DangerousLizardmen.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00437_DangerousLizardmen/Q00437_DangerousLizardmen.java
@@ -57,7 +57,7 @@ public class Q00437_DangerousLizardmen extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00438_AttacksFromAllSides/Q00438_AttacksFromAllSides.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00438_AttacksFromAllSides/Q00438_AttacksFromAllSides.java
index 4d0c83cf9e..80722b0636 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00438_AttacksFromAllSides/Q00438_AttacksFromAllSides.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00438_AttacksFromAllSides/Q00438_AttacksFromAllSides.java
@@ -57,7 +57,7 @@ public class Q00438_AttacksFromAllSides extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00439_GettingRidOfSummoners/Q00439_GettingRidOfSummoners.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00439_GettingRidOfSummoners/Q00439_GettingRidOfSummoners.java
index 50fa89f8aa..a17a81b5bb 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00439_GettingRidOfSummoners/Q00439_GettingRidOfSummoners.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00439_GettingRidOfSummoners/Q00439_GettingRidOfSummoners.java
@@ -57,7 +57,7 @@ public class Q00439_GettingRidOfSummoners extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00440_GuardsInDisguise/Q00440_GuardsInDisguise.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00440_GuardsInDisguise/Q00440_GuardsInDisguise.java
index 57e80e2805..b7a30bb252 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00440_GuardsInDisguise/Q00440_GuardsInDisguise.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00440_GuardsInDisguise/Q00440_GuardsInDisguise.java
@@ -57,7 +57,7 @@ public class Q00440_GuardsInDisguise extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00441_ExploringThePlainsOfTheLizardmen/Q00441_ExploringThePlainsOfTheLizardmen.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00441_ExploringThePlainsOfTheLizardmen/Q00441_ExploringThePlainsOfTheLizardmen.java
index 8d58905bc1..54cf63304e 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00441_ExploringThePlainsOfTheLizardmen/Q00441_ExploringThePlainsOfTheLizardmen.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00441_ExploringThePlainsOfTheLizardmen/Q00441_ExploringThePlainsOfTheLizardmen.java
@@ -63,7 +63,7 @@ public class Q00441_ExploringThePlainsOfTheLizardmen extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00443_BornFromDragonBlood/Q00443_BornFromDragonBlood.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00443_BornFromDragonBlood/Q00443_BornFromDragonBlood.java
index 7a8348e957..a82d25b5d8 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00443_BornFromDragonBlood/Q00443_BornFromDragonBlood.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00443_BornFromDragonBlood/Q00443_BornFromDragonBlood.java
@@ -62,7 +62,7 @@ public class Q00443_BornFromDragonBlood extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00444_CurseOfTheDragonValley/Q00444_CurseOfTheDragonValley.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00444_CurseOfTheDragonValley/Q00444_CurseOfTheDragonValley.java
index 2427d57cef..33cf3d6947 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00444_CurseOfTheDragonValley/Q00444_CurseOfTheDragonValley.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00444_CurseOfTheDragonValley/Q00444_CurseOfTheDragonValley.java
@@ -69,7 +69,7 @@ public class Q00444_CurseOfTheDragonValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00445_WhereDemonsWhisper/Q00445_WhereDemonsWhisper.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00445_WhereDemonsWhisper/Q00445_WhereDemonsWhisper.java
index c23f5c4b64..4cf3a8662f 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00445_WhereDemonsWhisper/Q00445_WhereDemonsWhisper.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00445_WhereDemonsWhisper/Q00445_WhereDemonsWhisper.java
@@ -64,7 +64,7 @@ public class Q00445_WhereDemonsWhisper extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00446_NoRightToDie/Q00446_NoRightToDie.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00446_NoRightToDie/Q00446_NoRightToDie.java
index 2f5a6e0418..1508e98e5f 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00446_NoRightToDie/Q00446_NoRightToDie.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00446_NoRightToDie/Q00446_NoRightToDie.java
@@ -71,7 +71,7 @@ public class Q00446_NoRightToDie extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00447_DragonsTraces/Q00447_DragonsTraces.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00447_DragonsTraces/Q00447_DragonsTraces.java
index f8df34b1c3..9de230109d 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00447_DragonsTraces/Q00447_DragonsTraces.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00447_DragonsTraces/Q00447_DragonsTraces.java
@@ -64,7 +64,7 @@ public class Q00447_DragonsTraces extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00448_ExploringTheDragonValleyWest/Q00448_ExploringTheDragonValleyWest.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00448_ExploringTheDragonValleyWest/Q00448_ExploringTheDragonValleyWest.java
index 850ae2244a..79d5d51f52 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00448_ExploringTheDragonValleyWest/Q00448_ExploringTheDragonValleyWest.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00448_ExploringTheDragonValleyWest/Q00448_ExploringTheDragonValleyWest.java
@@ -96,7 +96,7 @@ public class Q00448_ExploringTheDragonValleyWest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00450_MastersOfTheDragonValley/Q00450_MastersOfTheDragonValley.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00450_MastersOfTheDragonValley/Q00450_MastersOfTheDragonValley.java
index 31fe368f4d..6ea9468ff9 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00450_MastersOfTheDragonValley/Q00450_MastersOfTheDragonValley.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00450_MastersOfTheDragonValley/Q00450_MastersOfTheDragonValley.java
@@ -62,7 +62,7 @@ public class Q00450_MastersOfTheDragonValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00451_RiseOfTheDragons/Q00451_RiseOfTheDragons.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00451_RiseOfTheDragons/Q00451_RiseOfTheDragons.java
index 0e6d24bb0e..c1f0e9df37 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00451_RiseOfTheDragons/Q00451_RiseOfTheDragons.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00451_RiseOfTheDragons/Q00451_RiseOfTheDragons.java
@@ -58,7 +58,7 @@ public class Q00451_RiseOfTheDragons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00452_MightyFighters/Q00452_MightyFighters.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00452_MightyFighters/Q00452_MightyFighters.java
index a5251188ae..7fb5635b48 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00452_MightyFighters/Q00452_MightyFighters.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00452_MightyFighters/Q00452_MightyFighters.java
@@ -58,7 +58,7 @@ public class Q00452_MightyFighters extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00453_DragonMages/Q00453_DragonMages.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00453_DragonMages/Q00453_DragonMages.java
index ceabaa6ce0..fd9821de86 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00453_DragonMages/Q00453_DragonMages.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00453_DragonMages/Q00453_DragonMages.java
@@ -58,7 +58,7 @@ public class Q00453_DragonMages extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00454_ValleyDrakes/Q00454_ValleyDrakes.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00454_ValleyDrakes/Q00454_ValleyDrakes.java
index db0dbc992c..35a9cb3b29 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00454_ValleyDrakes/Q00454_ValleyDrakes.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00454_ValleyDrakes/Q00454_ValleyDrakes.java
@@ -58,7 +58,7 @@ public class Q00454_ValleyDrakes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00455_ExploringTheDragonValleyEast/Q00455_ExploringTheDragonValleyEast.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00455_ExploringTheDragonValleyEast/Q00455_ExploringTheDragonValleyEast.java
index 6e6a8f2c80..bcc63cde72 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00455_ExploringTheDragonValleyEast/Q00455_ExploringTheDragonValleyEast.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00455_ExploringTheDragonValleyEast/Q00455_ExploringTheDragonValleyEast.java
@@ -65,7 +65,7 @@ public class Q00455_ExploringTheDragonValleyEast extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00457_NecessaryPrecautions/Q00457_NecessaryPrecautions.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00457_NecessaryPrecautions/Q00457_NecessaryPrecautions.java
index 47c6099b0a..131c1d410e 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00457_NecessaryPrecautions/Q00457_NecessaryPrecautions.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00457_NecessaryPrecautions/Q00457_NecessaryPrecautions.java
@@ -57,7 +57,7 @@ public class Q00457_NecessaryPrecautions extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00458_BornToFight/Q00458_BornToFight.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00458_BornToFight/Q00458_BornToFight.java
index b442633713..53f764c085 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00458_BornToFight/Q00458_BornToFight.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00458_BornToFight/Q00458_BornToFight.java
@@ -56,7 +56,7 @@ public class Q00458_BornToFight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00459_SelMahumHorde/Q00459_SelMahumHorde.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00459_SelMahumHorde/Q00459_SelMahumHorde.java
index 38f8d4d5c6..4e3de6da1c 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00459_SelMahumHorde/Q00459_SelMahumHorde.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00459_SelMahumHorde/Q00459_SelMahumHorde.java
@@ -58,7 +58,7 @@ public class Q00459_SelMahumHorde extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00460_MagicForSmartOnes/Q00460_MagicForSmartOnes.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00460_MagicForSmartOnes/Q00460_MagicForSmartOnes.java
index 57017849cd..21120e236e 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00460_MagicForSmartOnes/Q00460_MagicForSmartOnes.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00460_MagicForSmartOnes/Q00460_MagicForSmartOnes.java
@@ -56,7 +56,7 @@ public class Q00460_MagicForSmartOnes extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00461_InTheBasesBarracks/Q00461_InTheBasesBarracks.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00461_InTheBasesBarracks/Q00461_InTheBasesBarracks.java
index e4b0c7adc3..5ce2ea5746 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00461_InTheBasesBarracks/Q00461_InTheBasesBarracks.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00461_InTheBasesBarracks/Q00461_InTheBasesBarracks.java
@@ -58,7 +58,7 @@ public class Q00461_InTheBasesBarracks extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00462_ExploringTheSelMahumBase/Q00462_ExploringTheSelMahumBase.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00462_ExploringTheSelMahumBase/Q00462_ExploringTheSelMahumBase.java
index 9359dc8ce1..7e02f58e77 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00462_ExploringTheSelMahumBase/Q00462_ExploringTheSelMahumBase.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00462_ExploringTheSelMahumBase/Q00462_ExploringTheSelMahumBase.java
@@ -62,7 +62,7 @@ public class Q00462_ExploringTheSelMahumBase extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00464_BarracksMainForce/Q00464_BarracksMainForce.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00464_BarracksMainForce/Q00464_BarracksMainForce.java
index ad40e38aae..acb6bebabc 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00464_BarracksMainForce/Q00464_BarracksMainForce.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00464_BarracksMainForce/Q00464_BarracksMainForce.java
@@ -58,7 +58,7 @@ public class Q00464_BarracksMainForce extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00465_DontComeCloser/Q00465_DontComeCloser.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00465_DontComeCloser/Q00465_DontComeCloser.java
index 94070316f2..a0c18e1019 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00465_DontComeCloser/Q00465_DontComeCloser.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00465_DontComeCloser/Q00465_DontComeCloser.java
@@ -56,7 +56,7 @@ public class Q00465_DontComeCloser extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00466_TurekOrcsTenacity/Q00466_TurekOrcsTenacity.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00466_TurekOrcsTenacity/Q00466_TurekOrcsTenacity.java
index 4719e2dd38..02c8730c14 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00466_TurekOrcsTenacity/Q00466_TurekOrcsTenacity.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00466_TurekOrcsTenacity/Q00466_TurekOrcsTenacity.java
@@ -56,7 +56,7 @@ public class Q00466_TurekOrcsTenacity extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00467_ImposingOrcs/Q00467_ImposingOrcs.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00467_ImposingOrcs/Q00467_ImposingOrcs.java
index ff800c33dd..ed4e21ea88 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00467_ImposingOrcs/Q00467_ImposingOrcs.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00467_ImposingOrcs/Q00467_ImposingOrcs.java
@@ -56,7 +56,7 @@ public class Q00467_ImposingOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00468_TurekOrcLeaders/Q00468_TurekOrcLeaders.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00468_TurekOrcLeaders/Q00468_TurekOrcLeaders.java
index be9e08678d..aea8cf1c4e 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00468_TurekOrcLeaders/Q00468_TurekOrcLeaders.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00468_TurekOrcLeaders/Q00468_TurekOrcLeaders.java
@@ -56,7 +56,7 @@ public class Q00468_TurekOrcLeaders extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00469_ExploringTheTurekOrcBarracks/Q00469_ExploringTheTurekOrcBarracks.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00469_ExploringTheTurekOrcBarracks/Q00469_ExploringTheTurekOrcBarracks.java
index ca85e114da..21f245eaa5 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00469_ExploringTheTurekOrcBarracks/Q00469_ExploringTheTurekOrcBarracks.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00469_ExploringTheTurekOrcBarracks/Q00469_ExploringTheTurekOrcBarracks.java
@@ -69,7 +69,7 @@ public class Q00469_ExploringTheTurekOrcBarracks extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00502_BrothersBoundInChains/Q00502_BrothersBoundInChains.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00502_BrothersBoundInChains/Q00502_BrothersBoundInChains.java
index 5783cff4ad..0cf2729e63 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00502_BrothersBoundInChains/Q00502_BrothersBoundInChains.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00502_BrothersBoundInChains/Q00502_BrothersBoundInChains.java
@@ -68,7 +68,7 @@ public class Q00502_BrothersBoundInChains extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
index c6c6541b90..e40f43ea81 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
@@ -82,7 +82,7 @@ public class Q00662_AGameOfCards extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10290_ATripBegins/Q10290_ATripBegins.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10290_ATripBegins/Q10290_ATripBegins.java
index 8bbae5b4e1..59ea6574d1 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10290_ATripBegins/Q10290_ATripBegins.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10290_ATripBegins/Q10290_ATripBegins.java
@@ -79,7 +79,7 @@ public class Q10290_ATripBegins extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10291_MoreExperience/Q10291_MoreExperience.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10291_MoreExperience/Q10291_MoreExperience.java
index 7a3ccd8b6d..d7f6920f2b 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10291_MoreExperience/Q10291_MoreExperience.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10291_MoreExperience/Q10291_MoreExperience.java
@@ -69,7 +69,7 @@ public class Q10291_MoreExperience extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10292_SecretGarden/Q10292_SecretGarden.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10292_SecretGarden/Q10292_SecretGarden.java
index 9ae696907f..f9f9d419fa 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10292_SecretGarden/Q10292_SecretGarden.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10292_SecretGarden/Q10292_SecretGarden.java
@@ -77,7 +77,7 @@ public class Q10292_SecretGarden extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10293_DeathMysteries/Q10293_DeathMysteries.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10293_DeathMysteries/Q10293_DeathMysteries.java
index a426a4d86e..b08c0718a2 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10293_DeathMysteries/Q10293_DeathMysteries.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10293_DeathMysteries/Q10293_DeathMysteries.java
@@ -77,7 +77,7 @@ public class Q10293_DeathMysteries extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10294_SporeInfestedPlace/Q10294_SporeInfestedPlace.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10294_SporeInfestedPlace/Q10294_SporeInfestedPlace.java
index f2626ad8a5..72c4880b79 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10294_SporeInfestedPlace/Q10294_SporeInfestedPlace.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10294_SporeInfestedPlace/Q10294_SporeInfestedPlace.java
@@ -83,7 +83,7 @@ public class Q10294_SporeInfestedPlace extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10295_RespectForGraves/Q10295_RespectForGraves.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10295_RespectForGraves/Q10295_RespectForGraves.java
index b1724d32c3..16fe300de2 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10295_RespectForGraves/Q10295_RespectForGraves.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10295_RespectForGraves/Q10295_RespectForGraves.java
@@ -82,7 +82,7 @@ public class Q10295_RespectForGraves extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10296_LetsPayRespectsToOurFallenBrethren/Q10296_LetsPayRespectsToOurFallenBrethren.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10296_LetsPayRespectsToOurFallenBrethren/Q10296_LetsPayRespectsToOurFallenBrethren.java
index e9052017e2..5cee0d9afa 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10296_LetsPayRespectsToOurFallenBrethren/Q10296_LetsPayRespectsToOurFallenBrethren.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10296_LetsPayRespectsToOurFallenBrethren/Q10296_LetsPayRespectsToOurFallenBrethren.java
@@ -84,7 +84,7 @@ public class Q10296_LetsPayRespectsToOurFallenBrethren extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10297_MemoryOfTheGloriousPast/Q10297_MemoryOfTheGloriousPast.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10297_MemoryOfTheGloriousPast/Q10297_MemoryOfTheGloriousPast.java
index 8b91d1fded..70347d6581 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10297_MemoryOfTheGloriousPast/Q10297_MemoryOfTheGloriousPast.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10297_MemoryOfTheGloriousPast/Q10297_MemoryOfTheGloriousPast.java
@@ -79,7 +79,7 @@ public class Q10297_MemoryOfTheGloriousPast extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10298_TracesOfBattle/Q10298_TracesOfBattle.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10298_TracesOfBattle/Q10298_TracesOfBattle.java
index 525f9c62eb..1d1c59bdc5 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10298_TracesOfBattle/Q10298_TracesOfBattle.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10298_TracesOfBattle/Q10298_TracesOfBattle.java
@@ -80,7 +80,7 @@ public class Q10298_TracesOfBattle extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10299_GetIncrediblePower/Q10299_GetIncrediblePower.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10299_GetIncrediblePower/Q10299_GetIncrediblePower.java
index bda04e01a0..9377c1aa45 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10299_GetIncrediblePower/Q10299_GetIncrediblePower.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10299_GetIncrediblePower/Q10299_GetIncrediblePower.java
@@ -88,7 +88,7 @@ public class Q10299_GetIncrediblePower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10300_ExploringTheCrumaTower/Q10300_ExploringTheCrumaTower.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10300_ExploringTheCrumaTower/Q10300_ExploringTheCrumaTower.java
index 28802f84a0..f1d3177952 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10300_ExploringTheCrumaTower/Q10300_ExploringTheCrumaTower.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10300_ExploringTheCrumaTower/Q10300_ExploringTheCrumaTower.java
@@ -75,7 +75,7 @@ public class Q10300_ExploringTheCrumaTower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10301_NotSoSilentValley/Q10301_NotSoSilentValley.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10301_NotSoSilentValley/Q10301_NotSoSilentValley.java
index 6d6eb01b87..3984a8c64e 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10301_NotSoSilentValley/Q10301_NotSoSilentValley.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10301_NotSoSilentValley/Q10301_NotSoSilentValley.java
@@ -72,7 +72,7 @@ public class Q10301_NotSoSilentValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10302_FoilPlansOfTheLizardmen/Q10302_FoilPlansOfTheLizardmen.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10302_FoilPlansOfTheLizardmen/Q10302_FoilPlansOfTheLizardmen.java
index 1f64722169..f8db52a236 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10302_FoilPlansOfTheLizardmen/Q10302_FoilPlansOfTheLizardmen.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10302_FoilPlansOfTheLizardmen/Q10302_FoilPlansOfTheLizardmen.java
@@ -65,7 +65,7 @@ public class Q10302_FoilPlansOfTheLizardmen extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10304_ChangesintheDragonValley/Q10304_ChangesintheDragonValley.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10304_ChangesintheDragonValley/Q10304_ChangesintheDragonValley.java
index ae3ec5af48..572caf643d 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10304_ChangesintheDragonValley/Q10304_ChangesintheDragonValley.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10304_ChangesintheDragonValley/Q10304_ChangesintheDragonValley.java
@@ -79,7 +79,7 @@ public class Q10304_ChangesintheDragonValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10305_DragonsSuspiciousMovements/Q10305_DragonsSuspiciousMovements.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10305_DragonsSuspiciousMovements/Q10305_DragonsSuspiciousMovements.java
index 23d645a564..d143081de0 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10305_DragonsSuspiciousMovements/Q10305_DragonsSuspiciousMovements.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10305_DragonsSuspiciousMovements/Q10305_DragonsSuspiciousMovements.java
@@ -68,7 +68,7 @@ public class Q10305_DragonsSuspiciousMovements extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10306_StopSelMahumsTroops/Q10306_StopSelMahumsTroops.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10306_StopSelMahumsTroops/Q10306_StopSelMahumsTroops.java
index 129f8cd191..7a95d60fd0 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10306_StopSelMahumsTroops/Q10306_StopSelMahumsTroops.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10306_StopSelMahumsTroops/Q10306_StopSelMahumsTroops.java
@@ -79,7 +79,7 @@ public class Q10306_StopSelMahumsTroops extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10307_TurekOrcsSecret/Q10307_TurekOrcsSecret.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10307_TurekOrcsSecret/Q10307_TurekOrcsSecret.java
index a7d7df2750..a5e969d776 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10307_TurekOrcsSecret/Q10307_TurekOrcsSecret.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10307_TurekOrcsSecret/Q10307_TurekOrcsSecret.java
@@ -72,7 +72,7 @@ public class Q10307_TurekOrcsSecret extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10308_TrainingForTheFuture/Q10308_TrainingForTheFuture.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10308_TrainingForTheFuture/Q10308_TrainingForTheFuture.java
index 8cbc29c177..c9ce2a454b 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10308_TrainingForTheFuture/Q10308_TrainingForTheFuture.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10308_TrainingForTheFuture/Q10308_TrainingForTheFuture.java
@@ -72,7 +72,7 @@ public class Q10308_TrainingForTheFuture extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10309_DreamlandsMysteries/Q10309_DreamlandsMysteries.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10309_DreamlandsMysteries/Q10309_DreamlandsMysteries.java
index 457d73bc13..6f46f26e5d 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10309_DreamlandsMysteries/Q10309_DreamlandsMysteries.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10309_DreamlandsMysteries/Q10309_DreamlandsMysteries.java
@@ -60,7 +60,7 @@ public class Q10309_DreamlandsMysteries extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10310_VictoryInBalokBattleground/Q10310_VictoryInBalokBattleground.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10310_VictoryInBalokBattleground/Q10310_VictoryInBalokBattleground.java
index 29ae67cb2f..0f9ef9f9b0 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10310_VictoryInBalokBattleground/Q10310_VictoryInBalokBattleground.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10310_VictoryInBalokBattleground/Q10310_VictoryInBalokBattleground.java
@@ -76,7 +76,7 @@ public class Q10310_VictoryInBalokBattleground extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10311_BestMedicine/Q10311_BestMedicine.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10311_BestMedicine/Q10311_BestMedicine.java
index 4b2e3b95f2..de94c17a07 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10311_BestMedicine/Q10311_BestMedicine.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10311_BestMedicine/Q10311_BestMedicine.java
@@ -59,7 +59,7 @@ public class Q10311_BestMedicine extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10312_GordesLegend/Q10312_GordesLegend.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10312_GordesLegend/Q10312_GordesLegend.java
index 1fe43ff4eb..6bbf9711bd 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10312_GordesLegend/Q10312_GordesLegend.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10312_GordesLegend/Q10312_GordesLegend.java
@@ -64,7 +64,7 @@ public class Q10312_GordesLegend extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10313_CunningMorgos/Q10313_CunningMorgos.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10313_CunningMorgos/Q10313_CunningMorgos.java
index 390879e1aa..1bd39e3376 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10313_CunningMorgos/Q10313_CunningMorgos.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10313_CunningMorgos/Q10313_CunningMorgos.java
@@ -62,7 +62,7 @@ public class Q10313_CunningMorgos extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10314_MorgosRetributionXilenos/Q10314_MorgosRetributionXilenos.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10314_MorgosRetributionXilenos/Q10314_MorgosRetributionXilenos.java
index 75d0ec5510..dfd60656af 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10314_MorgosRetributionXilenos/Q10314_MorgosRetributionXilenos.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10314_MorgosRetributionXilenos/Q10314_MorgosRetributionXilenos.java
@@ -59,7 +59,7 @@ public class Q10314_MorgosRetributionXilenos extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java
index 241fed0075..01ed503a94 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java
@@ -101,7 +101,7 @@ public class Q10673_SagaOfLegend extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10949_PatternsAndHiddenPower/Q10949_PatternsAndHiddenPower.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10949_PatternsAndHiddenPower/Q10949_PatternsAndHiddenPower.java
index 968d4b9e07..bbdf7a48db 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10949_PatternsAndHiddenPower/Q10949_PatternsAndHiddenPower.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10949_PatternsAndHiddenPower/Q10949_PatternsAndHiddenPower.java
@@ -46,7 +46,7 @@ public class Q10949_PatternsAndHiddenPower extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10950_FiercestFlame/Q10950_FiercestFlame.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10950_FiercestFlame/Q10950_FiercestFlame.java
index b9f6a0d2bb..d5364a2abc 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10950_FiercestFlame/Q10950_FiercestFlame.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10950_FiercestFlame/Q10950_FiercestFlame.java
@@ -68,7 +68,7 @@ public class Q10950_FiercestFlame extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10951_NewFlameOfOrcs/Q10951_NewFlameOfOrcs.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10951_NewFlameOfOrcs/Q10951_NewFlameOfOrcs.java
index a271220af2..c8b09624d2 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10951_NewFlameOfOrcs/Q10951_NewFlameOfOrcs.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10951_NewFlameOfOrcs/Q10951_NewFlameOfOrcs.java
@@ -65,7 +65,7 @@ public class Q10951_NewFlameOfOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10952_ProtectAtAllCosts/Q10952_ProtectAtAllCosts.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10952_ProtectAtAllCosts/Q10952_ProtectAtAllCosts.java
index afd2ca7416..e2b084dd71 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10952_ProtectAtAllCosts/Q10952_ProtectAtAllCosts.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10952_ProtectAtAllCosts/Q10952_ProtectAtAllCosts.java
@@ -67,7 +67,7 @@ public class Q10952_ProtectAtAllCosts extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10953_ValiantOrcs/Q10953_ValiantOrcs.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10953_ValiantOrcs/Q10953_ValiantOrcs.java
index 049a9df050..b30a97b5ce 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10953_ValiantOrcs/Q10953_ValiantOrcs.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10953_ValiantOrcs/Q10953_ValiantOrcs.java
@@ -77,7 +77,7 @@ public class Q10953_ValiantOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10954_SayhaChildren/Q10954_SayhaChildren.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10954_SayhaChildren/Q10954_SayhaChildren.java
index d1141044c1..f1a8b7cbdd 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10954_SayhaChildren/Q10954_SayhaChildren.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10954_SayhaChildren/Q10954_SayhaChildren.java
@@ -63,7 +63,7 @@ public class Q10954_SayhaChildren extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10955_NewLifeLessons/Q10955_NewLifeLessons.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10955_NewLifeLessons/Q10955_NewLifeLessons.java
index 869e2e0d96..e1e64f7dce 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10955_NewLifeLessons/Q10955_NewLifeLessons.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10955_NewLifeLessons/Q10955_NewLifeLessons.java
@@ -70,7 +70,7 @@ public class Q10955_NewLifeLessons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10956_WeSylphs/Q10956_WeSylphs.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10956_WeSylphs/Q10956_WeSylphs.java
index 68a17e52ac..9f39ed33c7 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10956_WeSylphs/Q10956_WeSylphs.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10956_WeSylphs/Q10956_WeSylphs.java
@@ -81,7 +81,7 @@ public class Q10956_WeSylphs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10957_TheLifeOfADeathKnight/Q10957_TheLifeOfADeathKnight.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10957_TheLifeOfADeathKnight/Q10957_TheLifeOfADeathKnight.java
index 2fec573afe..df9b3d12bb 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10957_TheLifeOfADeathKnight/Q10957_TheLifeOfADeathKnight.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10957_TheLifeOfADeathKnight/Q10957_TheLifeOfADeathKnight.java
@@ -62,7 +62,7 @@ public class Q10957_TheLifeOfADeathKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10958_ExploringNewOpportunities/Q10958_ExploringNewOpportunities.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10958_ExploringNewOpportunities/Q10958_ExploringNewOpportunities.java
index 8a763525b1..33dd3ce9cb 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10958_ExploringNewOpportunities/Q10958_ExploringNewOpportunities.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10958_ExploringNewOpportunities/Q10958_ExploringNewOpportunities.java
@@ -66,7 +66,7 @@ public class Q10958_ExploringNewOpportunities extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10959_ChallengingYourDestiny/Q10959_ChallengingYourDestiny.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10959_ChallengingYourDestiny/Q10959_ChallengingYourDestiny.java
index ff24b1ac2f..acd44137a6 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10959_ChallengingYourDestiny/Q10959_ChallengingYourDestiny.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10959_ChallengingYourDestiny/Q10959_ChallengingYourDestiny.java
@@ -74,7 +74,7 @@ public class Q10959_ChallengingYourDestiny extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10961_EffectiveTraining/Q10961_EffectiveTraining.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10961_EffectiveTraining/Q10961_EffectiveTraining.java
index 4447799236..1f3686a141 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10961_EffectiveTraining/Q10961_EffectiveTraining.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10961_EffectiveTraining/Q10961_EffectiveTraining.java
@@ -73,7 +73,7 @@ public class Q10961_EffectiveTraining extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java
index c611a5fb3f..07675ec3b3 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java
@@ -81,7 +81,7 @@ public class Q10962_NewHorizons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10968_ThePowerOfTheMagicLamp/Q10968_ThePowerOfTheMagicLamp.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10968_ThePowerOfTheMagicLamp/Q10968_ThePowerOfTheMagicLamp.java
index 35abadf77f..97d601a8eb 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10968_ThePowerOfTheMagicLamp/Q10968_ThePowerOfTheMagicLamp.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10968_ThePowerOfTheMagicLamp/Q10968_ThePowerOfTheMagicLamp.java
@@ -52,7 +52,7 @@ public class Q10968_ThePowerOfTheMagicLamp extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10971_TalismanEnchant/Q10971_TalismanEnchant.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10971_TalismanEnchant/Q10971_TalismanEnchant.java
index 6c71da9c00..973395ef03 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10971_TalismanEnchant/Q10971_TalismanEnchant.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10971_TalismanEnchant/Q10971_TalismanEnchant.java
@@ -50,7 +50,7 @@ public class Q10971_TalismanEnchant extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10972_CombiningGems/Q10972_CombiningGems.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10972_CombiningGems/Q10972_CombiningGems.java
index 8c7d395d8f..123141850f 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10972_CombiningGems/Q10972_CombiningGems.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10972_CombiningGems/Q10972_CombiningGems.java
@@ -47,7 +47,7 @@ public class Q10972_CombiningGems extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10973_EnchantingAgathions/Q10973_EnchantingAgathions.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10973_EnchantingAgathions/Q10973_EnchantingAgathions.java
index aa684bfbb0..153e2338bb 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10973_EnchantingAgathions/Q10973_EnchantingAgathions.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10973_EnchantingAgathions/Q10973_EnchantingAgathions.java
@@ -51,7 +51,7 @@ public class Q10973_EnchantingAgathions extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10974_NewStylishEquipment/Q10974_NewStylishEquipment.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10974_NewStylishEquipment/Q10974_NewStylishEquipment.java
index 7ab80fefd9..a94d1678ae 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10974_NewStylishEquipment/Q10974_NewStylishEquipment.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10974_NewStylishEquipment/Q10974_NewStylishEquipment.java
@@ -57,7 +57,7 @@ public class Q10974_NewStylishEquipment extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10978_MissingPets/Q10978_MissingPets.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10978_MissingPets/Q10978_MissingPets.java
index 3ba4cc84c2..68154775aa 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10978_MissingPets/Q10978_MissingPets.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10978_MissingPets/Q10978_MissingPets.java
@@ -47,7 +47,7 @@ public class Q10978_MissingPets extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10981_UnbearableWolvesHowling/Q10981_UnbearableWolvesHowling.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10981_UnbearableWolvesHowling/Q10981_UnbearableWolvesHowling.java
index ef438358ec..e871d17bc3 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10981_UnbearableWolvesHowling/Q10981_UnbearableWolvesHowling.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10981_UnbearableWolvesHowling/Q10981_UnbearableWolvesHowling.java
@@ -71,7 +71,7 @@ public class Q10981_UnbearableWolvesHowling extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java
index 604875801b..c8be482f61 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java
@@ -80,7 +80,7 @@ public class Q10982_SpiderHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10983_TroubledForest/Q10983_TroubledForest.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10983_TroubledForest/Q10983_TroubledForest.java
index 5c88677a07..a1be71751e 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10983_TroubledForest/Q10983_TroubledForest.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10983_TroubledForest/Q10983_TroubledForest.java
@@ -71,7 +71,7 @@ public class Q10983_TroubledForest extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java
index 4d42cf3d5d..1d24db6fea 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java
@@ -76,7 +76,7 @@ public class Q10984_CollectSpiderweb extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10985_CleaningUpTheGround/Q10985_CleaningUpTheGround.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10985_CleaningUpTheGround/Q10985_CleaningUpTheGround.java
index cd8c187d12..4a49b76774 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10985_CleaningUpTheGround/Q10985_CleaningUpTheGround.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10985_CleaningUpTheGround/Q10985_CleaningUpTheGround.java
@@ -72,7 +72,7 @@ public class Q10985_CleaningUpTheGround extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java
index eb4f1be18f..a6fc315f6f 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java
@@ -81,7 +81,7 @@ public class Q10986_SwampMonster extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10989_DangerousPredators/Q10989_DangerousPredators.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10989_DangerousPredators/Q10989_DangerousPredators.java
index 3553e6b2d1..6ca3064532 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10989_DangerousPredators/Q10989_DangerousPredators.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10989_DangerousPredators/Q10989_DangerousPredators.java
@@ -72,7 +72,7 @@ public class Q10989_DangerousPredators extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java
index 55c8d180de..4e8e9ff6eb 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java
@@ -68,7 +68,7 @@ public class Q10990_PoisonExtraction extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, false);
 		if (qs == null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
index 06ea44ceb1..6698687a4e 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
@@ -45,7 +45,7 @@ public class AllianceMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!"9001-01.htm".equals(event) && (player.getClan() == null))
 		{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
index 8d544e2e34..978c0ec647 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
@@ -96,7 +96,7 @@ public class ClanMaster extends AbstractNpcAI
 	};
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LEADER_REQUIRED.containsKey(event) && !player.isClanLeader())
 		{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
index 472b265d19..7560171dd1 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
@@ -61,7 +61,7 @@ public class DarkElfChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
index 9bed690c7f..db6419750d 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
@@ -74,7 +74,7 @@ public class DarkElfChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
index b90395d96a..fe46f96453 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
@@ -50,7 +50,7 @@ public class DwarfBlacksmithChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
index b658cd201b..95f42d44e2 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
@@ -55,7 +55,7 @@ public class DwarfBlacksmithChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
index 187710070c..df7368de42 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
@@ -50,7 +50,7 @@ public class DwarfWarehouseChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
index bcd1325051..e18b5c69e4 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
@@ -54,7 +54,7 @@ public class DwarfWarehouseChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
index b093c78e1d..bb0473e235 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
@@ -58,7 +58,7 @@ public class ElfHumanClericChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
index c0cf3513d7..eff155a55f 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
@@ -59,7 +59,7 @@ public class ElfHumanFighterChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
index 2095c50482..d43d533d9a 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
@@ -73,7 +73,7 @@ public class ElfHumanFighterChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
index ed623b52b0..c5b843fdc1 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
@@ -57,7 +57,7 @@ public class ElfHumanWizardChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
index 78b198c5a5..6482a77a8e 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
@@ -62,7 +62,7 @@ public class ElfHumanWizardChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
index acf6f9bc2f..1a231cd5d9 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
@@ -53,7 +53,7 @@ public class FirstClassTransferTalk extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return event;
 	}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
index e3c48b1f33..324f48a504 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
@@ -51,7 +51,7 @@ public class OrcChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
index c78c927bae..221cff8bde 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
@@ -62,7 +62,7 @@ public class OrcChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/quest/Quest.java
index d396f1fed4..473b65fdc4 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/quest/Quest.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/quest/Quest.java
@@ -252,7 +252,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -274,7 +274,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -565,7 +565,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 			{
 				player.setSimulatedTalking(false);
 			}
-			res = onAdvEvent(event, npc, player);
+			res = onEvent(event, npc, player);
 		}
 		catch (Exception e)
 		{
@@ -1027,12 +1027,11 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 */
 	public String onDeath(Creature killer, Creature victim, QuestState qs)
 	{
-		return onAdvEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
+		return onEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
 	}
 	
 	/**
 	 * This function is called whenever a player clicks on a link in a quest dialog and whenever a timer fires.<br>
-	 * If is not overridden by a subclass, then default to the returned value of the simpler (and older) {@link #onEvent(String, QuestState)} override.<br>
 	 * If the player has a quest state, use it as parameter in the next call, otherwise return null.
 	 * @param event this parameter contains a string identifier for the event.<br>
 	 *            Generally, this string is passed directly via the link.<br>
@@ -1051,35 +1050,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 *            This parameter may be {@code null} in certain circumstances.
 	 * @return the text returned by the event (may be {@code null}, a filename or just text)
 	 */
-	public String onAdvEvent(String event, Npc npc, Player player)
-	{
-		if (player != null)
-		{
-			final QuestState qs = player.getQuestState(getName());
-			if (qs != null)
-			{
-				return onEvent(event, qs);
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * This function is called in place of {@link #onAdvEvent(String, Npc, Player)} if the former is not implemented.<br>
-	 * If a script contains both {@link #onAdvEvent(String, Npc, Player)} and this implementation, then this method will never be called unless the script's {@link #onAdvEvent(String, Npc, Player)} explicitly calls this method.
-	 * @param event this parameter contains a string identifier for the event.<br>
-	 *            Generally, this string is passed directly via the link.<br>
-	 *            For example:<br>
-	 *            <code>
-	 *            &lt;a action="bypass -h Quest 626_ADarkTwilight 31517-01.htm"&gt;hello&lt;/a&gt;
-	 *            </code><br>
-	 *            The above link sets the event variable to "31517-01.htm" for the quest 626_ADarkTwilight.<br>
-	 *            In the case of timers, this will be the name of the timer.<br>
-	 *            This parameter serves as a sort of identifier.
-	 * @param qs this parameter contains a reference to the quest state of the player who used the link or started the timer.
-	 * @return the text returned by the event (may be {@code null}, a filename or just text)
-	 */
-	public String onEvent(String event, QuestState qs)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return null;
 	}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java
index 74cc5d850c..63fe710e66 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java
@@ -49,7 +49,7 @@ public class Fellow extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
index 4eb2c2422a..e4d1769de9 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
@@ -43,12 +43,12 @@ public class Toma extends AbstractNpcAI
 	private Toma()
 	{
 		addFirstTalkId(TOMA);
-		onAdvEvent("RESPAWN_TOMA", null, null);
+		onEvent("RESPAWN_TOMA", null, null);
 		startQuestTimer("RESPAWN_TOMA", TELEPORT_DELAY, null, null, true);
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("RESPAWN_TOMA"))
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingIgnis.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingIgnis.java
index 6606e36f7e..a2ad870093 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingIgnis.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingIgnis.java
@@ -49,7 +49,7 @@ public class ResidenceOfKingIgnis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingPetram.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingPetram.java
index 0bb5893075..e041afe21d 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingPetram.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingPetram.java
@@ -48,7 +48,7 @@ public class ResidenceOfKingPetram extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingProcella.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingProcella.java
index 9837e1fed4..590574d2ae 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingProcella.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingProcella.java
@@ -62,7 +62,7 @@ public class ResidenceOfKingProcella extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfQueenNebula.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfQueenNebula.java
index 9c3c7ea37b..c897a5d1b1 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfQueenNebula.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfQueenNebula.java
@@ -53,7 +53,7 @@ public class ResidenceOfQueenNebula extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
index 6f8858a2a4..dd735beeaa 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
@@ -41,7 +41,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -54,7 +54,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 				npc.deleteMe();
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_DAY_NIGHT_CHANGE)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/FrostCastleZone/FrostLordCastleZone.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/FrostCastleZone/FrostLordCastleZone.java
index b025542e79..ec658a5509 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/FrostCastleZone/FrostLordCastleZone.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/FrostCastleZone/FrostLordCastleZone.java
@@ -130,7 +130,7 @@ public class FrostLordCastleZone extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -181,7 +181,7 @@ public class FrostLordCastleZone extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/Hellbound/CitadelTeleport/CitadelTeleport.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/Hellbound/CitadelTeleport/CitadelTeleport.java
index c375ec82df..14169d5119 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/Hellbound/CitadelTeleport/CitadelTeleport.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/Hellbound/CitadelTeleport/CitadelTeleport.java
@@ -54,7 +54,7 @@ public class CitadelTeleport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
@@ -62,7 +62,7 @@ public class CitadelTeleport extends AbstractNpcAI
 			return null;
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/Hellbound/HellboundMessenger/HellboundMessenger.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/Hellbound/HellboundMessenger/HellboundMessenger.java
index efe61be897..e419ffb16c 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/Hellbound/HellboundMessenger/HellboundMessenger.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/Hellbound/HellboundMessenger/HellboundMessenger.java
@@ -42,7 +42,7 @@ public class HellboundMessenger extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == MESSENGER) && event.equals("teleport"))
 		{
@@ -55,7 +55,7 @@ public class HellboundMessenger extends AbstractNpcAI
 			return null;
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/KelbimFortress/KelbimRaid.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/KelbimFortress/KelbimRaid.java
index b0e1803dae..6ae2361d97 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/KelbimFortress/KelbimRaid.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/KelbimFortress/KelbimRaid.java
@@ -84,7 +84,7 @@ public class KelbimRaid extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("start_stage_2"))
 		{
@@ -138,7 +138,7 @@ public class KelbimRaid extends Event
 				npc.doCast(skill);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java
index bbd8a3f9d6..645d9b3399 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java
@@ -42,7 +42,7 @@ public class Tarba extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
@@ -55,7 +55,7 @@ public class Tarba extends AbstractNpcAI
 			}
 			return "34134-02.htm";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/PaganTemple/PrimeTimePaganTemple.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/PaganTemple/PrimeTimePaganTemple.java
index 664dd7f853..ff2832a5a7 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/PaganTemple/PrimeTimePaganTemple.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/PaganTemple/PrimeTimePaganTemple.java
@@ -93,7 +93,7 @@ public class PrimeTimePaganTemple extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int id = Integer.parseInt(event);
 		switch (id)
@@ -119,7 +119,7 @@ public class PrimeTimePaganTemple extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private void spawnOrStartScheduler()
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
index 9a85a7827a..ed27623d4a 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
@@ -38,14 +38,14 @@ public class Roxxy extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TEXT_SPAM") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SPEAK_WITH_ME_ABOUT_TRAVELING_AROUND_ADEN, 1000);
 			startQuestTimer("TEXT_SPAM", getRandom(10000, 30000), npc, null, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
index 75764fe1d0..1d6dbebfbf 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
@@ -49,7 +49,7 @@ public class Arushinai extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("30401-1.htm") || event.equals("30401-2.htm"))
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java
index 572da5409a..6a609a6b22 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java
@@ -49,7 +49,7 @@ public class Ateld extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
index 4c2e841fdd..1ff1f1ea47 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
@@ -47,7 +47,7 @@ public class DimensionalVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("30952-1.htm") || event.equals("30952-2.htm") || event.equals("30952-3.htm"))
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index 847bef79c8..ce76adc2d7 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -193,7 +193,7 @@ public class Antharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -605,7 +605,7 @@ public class Antharas extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 039083799f..38d1157f3a 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -164,7 +164,7 @@ public class Baium extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -478,7 +478,7 @@ public class Baium extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/bosses/Core/Core.java
index eebed031de..52ed224e2d 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -142,7 +142,7 @@ public class Core extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
@@ -161,7 +161,7 @@ public class Core extends AbstractNpcAI
 			_minions.forEach(Attackable::decayMe);
 			_minions.clear();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/bosses/LimitBarrier.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/bosses/LimitBarrier.java
index ff80482dd3..14bbff3867 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/bosses/LimitBarrier.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/bosses/LimitBarrier.java
@@ -150,7 +150,7 @@ public class LimitBarrier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -179,7 +179,7 @@ public class LimitBarrier extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index a1c5930623..df3c3d3e66 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -106,7 +106,7 @@ public class Orfen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -133,7 +133,7 @@ public class Orfen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index cb28500275..a7aef4abca 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -155,7 +155,7 @@ public class QueenAnt extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -239,7 +239,7 @@ public class QueenAnt extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java
index 9f78ef7c7e..51a25b0325 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java
@@ -76,7 +76,7 @@ public class SevenSignsRBs extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
index ebe4f47e31..3adeca0bd9 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
@@ -71,13 +71,13 @@ public class Zaken extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("zaken_unlock"))
 		{
 			spawnBoss();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private void spawnBoss()
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/AdditionalServicesAdvisor/AdditionalServicesAdvisor.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/AdditionalServicesAdvisor/AdditionalServicesAdvisor.java
index 026324a5c9..5fb2670856 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/AdditionalServicesAdvisor/AdditionalServicesAdvisor.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/AdditionalServicesAdvisor/AdditionalServicesAdvisor.java
@@ -64,7 +64,7 @@ public class AdditionalServicesAdvisor extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String html = null;
 		switch (npc.getId())
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index 650556fbeb..36460411d1 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -59,7 +59,7 @@ public class ArenaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -124,7 +124,7 @@ public class ArenaManager extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java
index 9d242d40d3..73f2f322bd 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java
@@ -45,7 +45,7 @@ public class AttributeMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("learn".equalsIgnoreCase(event))
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
index 21fcb4813a..7bbc678cca 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
@@ -57,7 +57,7 @@ public class CastleBlacksmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return (event.equalsIgnoreCase(npc.getId() + "-02.html") && hasRights(player, npc)) ? event : null;
 	}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
index d3f1094ed9..860bd6ab7a 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
@@ -393,7 +393,7 @@ public class CastleChamberlain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Castle castle = npc.getCastle();
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
index 2c9a8fcf2c..ee1d670f29 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
@@ -72,7 +72,7 @@ public class CastleDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
index a1466e4501..7f24c7c794 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
@@ -56,7 +56,7 @@ public class CastleMercenaryManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index bf50eeff19..76a7b9ef5e 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -78,7 +78,7 @@ public class CastleTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
@@ -168,7 +168,7 @@ public class CastleTeleporter extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
index 2fd32d136c..d222e07095 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
@@ -52,7 +52,7 @@ public class CastleWarehouse extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final boolean isMyLord = player.isClanLeader() && (player.getClan().getCastleId() == (npc.getCastle() != null ? npc.getCastle().getResidenceId() : -1));
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index ee6afc0b08..c472475cd6 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -64,7 +64,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
index ca52883f2e..0a16c57b0f 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
@@ -57,7 +57,7 @@ public class ClanHallDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 2da92875fb..573959ae52 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -98,7 +98,7 @@ public class ClanHallManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/ClanStrongholdDevice/ClanStrongholdDevice.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/ClanStrongholdDevice/ClanStrongholdDevice.java
index 7bab63f06c..2f32bc9fac 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/ClanStrongholdDevice/ClanStrongholdDevice.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/ClanStrongholdDevice/ClanStrongholdDevice.java
@@ -75,18 +75,18 @@ public class ClanStrongholdDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getTemplate().getId() != CLAN_STRONGHOLD_DEVICE) || (player == null) || (event == null))
 		{
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		if (event.equals("capture"))
 		{
 			if (npc.isAlikeDead())
 			{
-				return super.onAdvEvent(event, npc, player);
+				return super.onEvent(event, npc, player);
 			}
 			
 			if (CURRENT_CLAN_ID.containsKey(npc.getScriptValue()))
@@ -112,13 +112,13 @@ public class ClanStrongholdDevice extends AbstractNpcAI
 		{
 			if (npc.isAlikeDead())
 			{
-				return super.onAdvEvent(event, npc, player);
+				return super.onEvent(event, npc, player);
 			}
 			
 			return npc.getId() + (CURRENT_CLAN_ID.containsKey(npc.getScriptValue()) ? "-02" : "") + ".htm";
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 47e78fa4e1..60e570354f 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -232,7 +232,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		if (!_isEnabled)
 		{
@@ -893,7 +893,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	{
 		if (event.getCommand().startsWith("Quest ClassMaster "))
 		{
-			final String html = onAdvEvent(event.getCommand().substring(18), null, event.getPlayer());
+			final String html = onEvent(event.getCommand().substring(18), null, event.getPlayer());
 			event.getPlayer().sendPacket(TutorialCloseHtml.STATIC_PACKET);
 			showResult(event.getPlayer(), html);
 		}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/DivineBeast.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/DivineBeast.java
index 7ba428a4ac..ace7bc05e4 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/DivineBeast.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/DivineBeast.java
@@ -44,7 +44,7 @@ public class DivineBeast extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player == null) || !player.hasServitors())
 		{
@@ -55,7 +55,7 @@ public class DivineBeast extends AbstractNpcAI
 			cancelQuestTimer(event, npc, player);
 			player.getServitors().values().forEach(summon -> summon.unSummon(player));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
index a976452a5b..0ba0ef619e 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
@@ -94,7 +94,7 @@ public class GameAssistant extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
index d132cf4f91..d3f710927f 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
@@ -68,7 +68,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
index 535b2c335a..08a3e2b614 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
@@ -57,7 +57,7 @@ public class NewbieGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("0"))
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
index 93667d6407..a43a29e243 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
@@ -69,7 +69,7 @@ public class OlyBuffer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.startsWith("giveBuff;") && (npc.getScriptValue() < 5))
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index 65022d59a0..a9697475f1 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -70,7 +70,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
index 2de491b72f..b69386a3bc 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
@@ -84,7 +84,7 @@ public class Proclaimer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("giveBuff"))
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
index 0fadf01daa..b7c2e6356c 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
@@ -79,7 +79,7 @@ public class ProvisionalHalls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/RandomWalkingGuards.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
index 7435d3c1c8..f6a48a136c 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
@@ -48,7 +48,7 @@ public class RandomWalkingGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("RANDOM_WALK") && (npc != null))
 		{
@@ -59,7 +59,7 @@ public class RandomWalkingGuards extends AbstractNpcAI
 			}
 			startQuestTimer("RANDOM_WALK", getRandom(MIN_WALK_DELAY, MAX_WALK_DELAY), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/Servitors/SinEater.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/Servitors/SinEater.java
index f3eef350a6..58c1e1b5fc 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/Servitors/SinEater.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/Servitors/SinEater.java
@@ -48,7 +48,7 @@ public class SinEater extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TALK") && (player != null) && (player.getPet() != null))
 		{
@@ -79,7 +79,7 @@ public class SinEater extends AbstractNpcAI
 			}
 			startQuestTimer("TALK", 60000, null, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_CREATURE_DEATH)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/Subjugation/Yand/Yand.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/Subjugation/Yand/Yand.java
index 97c38c56f0..73cb4fe936 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/Subjugation/Yand/Yand.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/Subjugation/Yand/Yand.java
@@ -43,7 +43,7 @@ public class Yand extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
index f9bc93295b..9288b09e5c 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
@@ -51,7 +51,7 @@ public class SymbolMaker extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
index 3336ce6241..0c4046b7c8 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
@@ -86,7 +86,7 @@ public class ToIVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int npcId = npc.getId();
 		
@@ -132,7 +132,7 @@ public class ToIVortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index b2ca852869..14652b53dc 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -188,7 +188,7 @@ public class WyvernManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
index b27ac2f278..fb877bb630 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
@@ -36,7 +36,7 @@ public class DelevelManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.DELEVEL_MANAGER_ENABLED)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
index d1007383de..5c0cf799dc 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
@@ -54,7 +54,7 @@ public class FactionSystem extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class FactionSystem extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
index 8a1940f5b4..32a1337dc4 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
@@ -34,7 +34,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -77,7 +77,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 				npc.broadcastInfo(); // update flag status
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
index 8a64487b10..7637738ff0 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
@@ -39,7 +39,7 @@ public class NoblessMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.NOBLESS_MASTER_ENABLED)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
index 46205143a3..4f04086e9c 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
@@ -215,7 +215,7 @@ public class NpcLocationInfo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (Util.isDigit(event))
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
index 8e1f84c102..3a9b5b4bdc 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
@@ -169,7 +169,7 @@ public class Deathmatch extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
index d65c2ef5a8..2541fd449f 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
@@ -213,7 +213,7 @@ public class Rabbits extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/events/Race/Race.java
index bbf9371324..5bd0aadf97 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/events/Race/Race.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/events/Race/Race.java
@@ -320,7 +320,7 @@ public class Race extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index bfd55c93b2..50feb8de89 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -186,7 +186,7 @@ public class TvT extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/BattleWithKeber/BattleWithKeber.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/BattleWithKeber/BattleWithKeber.java
index a75f8108c1..0e36233e22 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/BattleWithKeber/BattleWithKeber.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/BattleWithKeber/BattleWithKeber.java
@@ -205,7 +205,7 @@ public class BattleWithKeber extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java
index 682799797c..a8166ecc91 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java
@@ -41,7 +41,7 @@ public class BlossomFestival extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/DefeatTheQueen/DefeatTheQueen.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/DefeatTheQueen/DefeatTheQueen.java
index 050828b3e1..51313fa86e 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/DefeatTheQueen/DefeatTheQueen.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/DefeatTheQueen/DefeatTheQueen.java
@@ -46,7 +46,7 @@ public class DefeatTheQueen extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!isEventPeriod())
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index c6783d3622..4509e73cea 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -44,7 +44,7 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/HappyHours/HappyHours.java
index 02d7a768fe..91a356fa3e 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/HappyHours/HappyHours.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/HappyHours/HappyHours.java
@@ -49,7 +49,7 @@ public class HappyHours extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/HolidayOutOfSchedule/HolidayOutOfSchedule.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/HolidayOutOfSchedule/HolidayOutOfSchedule.java
index 261871eb03..a012e15347 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/HolidayOutOfSchedule/HolidayOutOfSchedule.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/HolidayOutOfSchedule/HolidayOutOfSchedule.java
@@ -167,7 +167,7 @@ public class HolidayOutOfSchedule extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -242,7 +242,7 @@ public class HolidayOutOfSchedule extends LongTimeEvent
 				despawnSanta();
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
index 1c7c983315..138d5e2559 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
@@ -45,7 +45,7 @@ public class ThePowerOfLove extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/TotalRecall/TotalRecall.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
index f3e3903722..d3deabee2e 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
@@ -42,7 +42,7 @@ public class TotalRecall extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
index d6b07b8219..dcfcde6436 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
@@ -321,7 +321,7 @@ public class WatermelonNinja extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/DreamDungeon/CatGuildsLair/CatGuildsLair.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/DreamDungeon/CatGuildsLair/CatGuildsLair.java
index 365c07387d..8172ebdb85 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/DreamDungeon/CatGuildsLair/CatGuildsLair.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/DreamDungeon/CatGuildsLair/CatGuildsLair.java
@@ -155,7 +155,7 @@ public class CatGuildsLair extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance instance = npc.getInstanceWorld();
 		if ((instance == null) || (instance.getStatus() < CREATED))
@@ -169,7 +169,7 @@ public class CatGuildsLair extends AbstractInstance
 			setRandomTitles(instance, true);
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private void spawnBoss(Instance instance)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/DreamDungeon/DreamPriestess/DreamPriestess.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/DreamDungeon/DreamPriestess/DreamPriestess.java
index fffd36eb25..8a8464f4f7 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/DreamDungeon/DreamPriestess/DreamPriestess.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/DreamDungeon/DreamPriestess/DreamPriestess.java
@@ -63,11 +63,11 @@ public class DreamPriestess extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player == null)
 		{
-			return super.onAdvEvent(event, npc, null);
+			return super.onEvent(event, npc, null);
 		}
 		
 		if (event.startsWith("enter_dream_dungeon"))
@@ -98,7 +98,7 @@ public class DreamPriestess extends AbstractInstance
 				{
 					enterInstance(player, npc, DraconidFortress.INSTANCE_ID);
 					ThreadPool.schedule(() -> CatGuildsLair.startCatLairInstance(player), 5000);
-					return super.onAdvEvent(event, npc, player);
+					return super.onEvent(event, npc, player);
 				}
 				
 				if (!INSTANCE_IDS.contains(dungeonId))
@@ -155,7 +155,7 @@ public class DreamPriestess extends AbstractInstance
 			}
 			return DREAM_PRIESTESS + "-gm.htm";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private static boolean checkRequirementsForEnter(Player requestor)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java
index 7c8d6bbb87..34bb1d6157 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java
@@ -153,7 +153,7 @@ public class DwellingOfSpirits extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -199,7 +199,7 @@ public class DwellingOfSpirits extends AbstractInstance
 			}
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/GolbergRoom/GolbergRoom.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/GolbergRoom/GolbergRoom.java
index a047b79a3e..0287f6b24b 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/GolbergRoom/GolbergRoom.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/GolbergRoom/GolbergRoom.java
@@ -50,7 +50,7 @@ public class GolbergRoom extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java
index 3b965a52a3..be0a6a9ffd 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java
@@ -165,7 +165,7 @@ public class LastImperialTomb extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java
index 37ef7ac1c4..0a200da084 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java
@@ -62,7 +62,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java
index e5966b763e..c4bee8fb7d 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java
@@ -103,7 +103,7 @@ public class MonsterArena extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/QueenAntLair/QueenAntLair.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/QueenAntLair/QueenAntLair.java
index c6d3172062..84a36d39dd 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/QueenAntLair/QueenAntLair.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/QueenAntLair/QueenAntLair.java
@@ -56,7 +56,7 @@ public class QueenAntLair extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
index 2414f8fcfe..3e92780a11 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
@@ -141,7 +141,7 @@ public class TimedHunting extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("ENTER"))
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/TrainingZone/TrainingZone.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/TrainingZone/TrainingZone.java
index 583df87c1d..fc9117026c 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/TrainingZone/TrainingZone.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/TrainingZone/TrainingZone.java
@@ -165,7 +165,7 @@ public class TrainingZone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("ENTER"))
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/ValakasTemple/DummyIfrit.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/ValakasTemple/DummyIfrit.java
index 1e39098a39..8055d93d2b 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/ValakasTemple/DummyIfrit.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/ValakasTemple/DummyIfrit.java
@@ -38,7 +38,7 @@ public class DummyIfrit extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if ((world == null) || (world.getTemplateId() != ValakasTemple.VALAKAS_TEMPLE_INSTANCE_ID))
@@ -58,7 +58,7 @@ public class DummyIfrit extends AbstractNpcAI
 			}
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/ValakasTemple/Teleporter/ValakasTempleTeleport.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/ValakasTemple/Teleporter/ValakasTempleTeleport.java
index 6f84f87e69..43fbe83287 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/ValakasTemple/Teleporter/ValakasTempleTeleport.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/ValakasTemple/Teleporter/ValakasTempleTeleport.java
@@ -46,7 +46,7 @@ public class ValakasTempleTeleport extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -73,7 +73,7 @@ public class ValakasTempleTeleport extends AbstractInstance
 				PLAYER_TO_LOGIN.remove(player.getObjectId());
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private static boolean checkRequirementsForEnter(Player requestor)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10001_SedricksBestPupil/Q10001_SedricksBestPupil.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10001_SedricksBestPupil/Q10001_SedricksBestPupil.java
index 1d7536d634..bc01ff8463 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10001_SedricksBestPupil/Q10001_SedricksBestPupil.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10001_SedricksBestPupil/Q10001_SedricksBestPupil.java
@@ -49,7 +49,7 @@ public class Q10001_SedricksBestPupil extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10002_FightingSkill/Q10002_FightingSkill.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10002_FightingSkill/Q10002_FightingSkill.java
index 3c1aa8027a..cd06b487bb 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10002_FightingSkill/Q10002_FightingSkill.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10002_FightingSkill/Q10002_FightingSkill.java
@@ -49,7 +49,7 @@ public class Q10002_FightingSkill extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10003_StrengthOfSpirit/Q10003_StrengthOfSpirit.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10003_StrengthOfSpirit/Q10003_StrengthOfSpirit.java
index dce70e5a3b..756dbe1c61 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10003_StrengthOfSpirit/Q10003_StrengthOfSpirit.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10003_StrengthOfSpirit/Q10003_StrengthOfSpirit.java
@@ -49,7 +49,7 @@ public class Q10003_StrengthOfSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10004_LearningAutoHunt/Q10004_LearningAutoHunt.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10004_LearningAutoHunt/Q10004_LearningAutoHunt.java
index 74abcc8100..fffb09256c 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10004_LearningAutoHunt/Q10004_LearningAutoHunt.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10004_LearningAutoHunt/Q10004_LearningAutoHunt.java
@@ -51,7 +51,7 @@ public class Q10004_LearningAutoHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -66,7 +66,7 @@ public class Q10004_LearningAutoHunt extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10005_BePrepared/Q10005_BePrepared.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10005_BePrepared/Q10005_BePrepared.java
index d241bef119..1a732ae75d 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10005_BePrepared/Q10005_BePrepared.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10005_BePrepared/Q10005_BePrepared.java
@@ -51,7 +51,7 @@ public class Q10005_BePrepared extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10006_UsefulPreparations/Q10006_UsefulPreparations.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10006_UsefulPreparations/Q10006_UsefulPreparations.java
index a7853637d2..92009a54ff 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10006_UsefulPreparations/Q10006_UsefulPreparations.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10006_UsefulPreparations/Q10006_UsefulPreparations.java
@@ -51,7 +51,7 @@ public class Q10006_UsefulPreparations extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10007_TimeToThinkAboutWeapons/Q10007_TimeToThinkAboutWeapons.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10007_TimeToThinkAboutWeapons/Q10007_TimeToThinkAboutWeapons.java
index 5952fef4c2..9744893ad8 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10007_TimeToThinkAboutWeapons/Q10007_TimeToThinkAboutWeapons.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10007_TimeToThinkAboutWeapons/Q10007_TimeToThinkAboutWeapons.java
@@ -51,7 +51,7 @@ public class Q10007_TimeToThinkAboutWeapons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -66,7 +66,7 @@ public class Q10007_TimeToThinkAboutWeapons extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10008_WatchOut/Q10008_WatchOut.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10008_WatchOut/Q10008_WatchOut.java
index 2be29190ba..c503264a08 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10008_WatchOut/Q10008_WatchOut.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10008_WatchOut/Q10008_WatchOut.java
@@ -51,7 +51,7 @@ public class Q10008_WatchOut extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10009_DevelopingYourAbilities/Q10009_DevelopingYourAbilities.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10009_DevelopingYourAbilities/Q10009_DevelopingYourAbilities.java
index eac93c3dbb..3312ea194a 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10009_DevelopingYourAbilities/Q10009_DevelopingYourAbilities.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10009_DevelopingYourAbilities/Q10009_DevelopingYourAbilities.java
@@ -54,7 +54,7 @@ public class Q10009_DevelopingYourAbilities extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10010_TimeToChangeClass/Q10010_TimeToChangeClass.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10010_TimeToChangeClass/Q10010_TimeToChangeClass.java
index 9a00471579..826fac58f9 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10010_TimeToChangeClass/Q10010_TimeToChangeClass.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10010_TimeToChangeClass/Q10010_TimeToChangeClass.java
@@ -60,7 +60,7 @@ public class Q10010_TimeToChangeClass extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10011_GoingOut/Q10011_GoingOut.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10011_GoingOut/Q10011_GoingOut.java
index 2d1e6d1d18..9b63eaa7d1 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10011_GoingOut/Q10011_GoingOut.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10011_GoingOut/Q10011_GoingOut.java
@@ -56,7 +56,7 @@ public class Q10011_GoingOut extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -71,7 +71,7 @@ public class Q10011_GoingOut extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10012_OutstandingMagesFirstSteps/Q10012_OutstandingMagesFirstSteps.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10012_OutstandingMagesFirstSteps/Q10012_OutstandingMagesFirstSteps.java
index d7c770570d..bbab841e9a 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10012_OutstandingMagesFirstSteps/Q10012_OutstandingMagesFirstSteps.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10012_OutstandingMagesFirstSteps/Q10012_OutstandingMagesFirstSteps.java
@@ -49,7 +49,7 @@ public class Q10012_OutstandingMagesFirstSteps extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10013_FightingSkill/Q10013_FightingSkill.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10013_FightingSkill/Q10013_FightingSkill.java
index be7e89e8bc..f61e7dc7f2 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10013_FightingSkill/Q10013_FightingSkill.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10013_FightingSkill/Q10013_FightingSkill.java
@@ -49,7 +49,7 @@ public class Q10013_FightingSkill extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10014_StrengthOfSpirit/Q10014_StrengthOfSpirit.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10014_StrengthOfSpirit/Q10014_StrengthOfSpirit.java
index 2abee34209..7b44feb1c7 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10014_StrengthOfSpirit/Q10014_StrengthOfSpirit.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10014_StrengthOfSpirit/Q10014_StrengthOfSpirit.java
@@ -49,7 +49,7 @@ public class Q10014_StrengthOfSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10015_LearningAutoHunt/Q10015_LearningAutoHunt.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10015_LearningAutoHunt/Q10015_LearningAutoHunt.java
index 6a88da38dc..d6a7527cec 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10015_LearningAutoHunt/Q10015_LearningAutoHunt.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10015_LearningAutoHunt/Q10015_LearningAutoHunt.java
@@ -51,7 +51,7 @@ public class Q10015_LearningAutoHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -66,7 +66,7 @@ public class Q10015_LearningAutoHunt extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10016_BePrepared/Q10016_BePrepared.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10016_BePrepared/Q10016_BePrepared.java
index 0b85a3a5b2..d76b069a10 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10016_BePrepared/Q10016_BePrepared.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10016_BePrepared/Q10016_BePrepared.java
@@ -51,7 +51,7 @@ public class Q10016_BePrepared extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10017_UsefulPreparations/Q10017_UsefulPreparations.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10017_UsefulPreparations/Q10017_UsefulPreparations.java
index 40b0621a7f..a66f1bad82 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10017_UsefulPreparations/Q10017_UsefulPreparations.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10017_UsefulPreparations/Q10017_UsefulPreparations.java
@@ -51,7 +51,7 @@ public class Q10017_UsefulPreparations extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10018_TimeToThinkAboutWeapons/Q10018_TimeToThinkAboutWeapons.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10018_TimeToThinkAboutWeapons/Q10018_TimeToThinkAboutWeapons.java
index 312ee2f0dc..d5c4190d4a 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10018_TimeToThinkAboutWeapons/Q10018_TimeToThinkAboutWeapons.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10018_TimeToThinkAboutWeapons/Q10018_TimeToThinkAboutWeapons.java
@@ -51,7 +51,7 @@ public class Q10018_TimeToThinkAboutWeapons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -66,7 +66,7 @@ public class Q10018_TimeToThinkAboutWeapons extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10019_WatchOut/Q10019_WatchOut.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10019_WatchOut/Q10019_WatchOut.java
index ca718edab1..f37794d439 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10019_WatchOut/Q10019_WatchOut.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10019_WatchOut/Q10019_WatchOut.java
@@ -51,7 +51,7 @@ public class Q10019_WatchOut extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10020_DevelopingYourAbilities/Q10020_DevelopingYourAbilities.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10020_DevelopingYourAbilities/Q10020_DevelopingYourAbilities.java
index a967d6bcf0..701cd0da87 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10020_DevelopingYourAbilities/Q10020_DevelopingYourAbilities.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10020_DevelopingYourAbilities/Q10020_DevelopingYourAbilities.java
@@ -54,7 +54,7 @@ public class Q10020_DevelopingYourAbilities extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10021_TimeToChangeClass/Q10021_TimeToChangeClass.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10021_TimeToChangeClass/Q10021_TimeToChangeClass.java
index e812aa3174..5179f19e7e 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10021_TimeToChangeClass/Q10021_TimeToChangeClass.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10021_TimeToChangeClass/Q10021_TimeToChangeClass.java
@@ -53,7 +53,7 @@ public class Q10021_TimeToChangeClass extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10022_GoingOut/Q10022_GoingOut.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10022_GoingOut/Q10022_GoingOut.java
index 7711ef09ac..57bcecbee4 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10022_GoingOut/Q10022_GoingOut.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10022_GoingOut/Q10022_GoingOut.java
@@ -56,7 +56,7 @@ public class Q10022_GoingOut extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -71,7 +71,7 @@ public class Q10022_GoingOut extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10023_UnderTheMotherTree/Q10023_UnderTheMotherTree.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10023_UnderTheMotherTree/Q10023_UnderTheMotherTree.java
index d9b3c037be..2f1e0a4b03 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10023_UnderTheMotherTree/Q10023_UnderTheMotherTree.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10023_UnderTheMotherTree/Q10023_UnderTheMotherTree.java
@@ -51,7 +51,7 @@ public class Q10023_UnderTheMotherTree extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10024_NewLifesLessons/Q10024_NewLifesLessons.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10024_NewLifesLessons/Q10024_NewLifesLessons.java
index 5d7b065679..1465ec0a35 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10024_NewLifesLessons/Q10024_NewLifesLessons.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10024_NewLifesLessons/Q10024_NewLifesLessons.java
@@ -49,7 +49,7 @@ public class Q10024_NewLifesLessons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10025_NewLifesLessons/Q10025_NewLifesLessons.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10025_NewLifesLessons/Q10025_NewLifesLessons.java
index 9b91046c39..a598d59b32 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10025_NewLifesLessons/Q10025_NewLifesLessons.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10025_NewLifesLessons/Q10025_NewLifesLessons.java
@@ -49,7 +49,7 @@ public class Q10025_NewLifesLessons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10026_StrengthOfSpirit/Q10026_StrengthOfSpirit.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10026_StrengthOfSpirit/Q10026_StrengthOfSpirit.java
index 6ee8e0fdfc..cdc562b960 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10026_StrengthOfSpirit/Q10026_StrengthOfSpirit.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10026_StrengthOfSpirit/Q10026_StrengthOfSpirit.java
@@ -49,7 +49,7 @@ public class Q10026_StrengthOfSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10027_StrengthOfSpirit/Q10027_StrengthOfSpirit.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10027_StrengthOfSpirit/Q10027_StrengthOfSpirit.java
index 2315ad13d4..d4f2e0c203 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10027_StrengthOfSpirit/Q10027_StrengthOfSpirit.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10027_StrengthOfSpirit/Q10027_StrengthOfSpirit.java
@@ -49,7 +49,7 @@ public class Q10027_StrengthOfSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10028_LearningAutoHunt/Q10028_LearningAutoHunt.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10028_LearningAutoHunt/Q10028_LearningAutoHunt.java
index 619dbf37d6..b5e4f66919 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10028_LearningAutoHunt/Q10028_LearningAutoHunt.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10028_LearningAutoHunt/Q10028_LearningAutoHunt.java
@@ -52,7 +52,7 @@ public class Q10028_LearningAutoHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -67,7 +67,7 @@ public class Q10028_LearningAutoHunt extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10029_BePrepared/Q10029_BePrepared.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10029_BePrepared/Q10029_BePrepared.java
index d3933cc653..31678cb03d 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10029_BePrepared/Q10029_BePrepared.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10029_BePrepared/Q10029_BePrepared.java
@@ -52,7 +52,7 @@ public class Q10029_BePrepared extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10030_UsefulPreparations/Q10030_UsefulPreparations.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10030_UsefulPreparations/Q10030_UsefulPreparations.java
index 9217dbdea7..6811b4dcd5 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10030_UsefulPreparations/Q10030_UsefulPreparations.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10030_UsefulPreparations/Q10030_UsefulPreparations.java
@@ -52,7 +52,7 @@ public class Q10030_UsefulPreparations extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10031_TimeToThinkAboutWeapons/Q10031_TimeToThinkAboutWeapons.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10031_TimeToThinkAboutWeapons/Q10031_TimeToThinkAboutWeapons.java
index b526423321..11bfdde24e 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10031_TimeToThinkAboutWeapons/Q10031_TimeToThinkAboutWeapons.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10031_TimeToThinkAboutWeapons/Q10031_TimeToThinkAboutWeapons.java
@@ -51,7 +51,7 @@ public class Q10031_TimeToThinkAboutWeapons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -66,7 +66,7 @@ public class Q10031_TimeToThinkAboutWeapons extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10032_WatchOut/Q10032_WatchOut.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10032_WatchOut/Q10032_WatchOut.java
index 179a19ccd2..aaff9acb7d 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10032_WatchOut/Q10032_WatchOut.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10032_WatchOut/Q10032_WatchOut.java
@@ -51,7 +51,7 @@ public class Q10032_WatchOut extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10033_DevelopingYourAbilities/Q10033_DevelopingYourAbilities.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10033_DevelopingYourAbilities/Q10033_DevelopingYourAbilities.java
index 893ff95220..5d7f8b7698 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10033_DevelopingYourAbilities/Q10033_DevelopingYourAbilities.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10033_DevelopingYourAbilities/Q10033_DevelopingYourAbilities.java
@@ -54,7 +54,7 @@ public class Q10033_DevelopingYourAbilities extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10034_TimeToChangeClass/Q10034_TimeToChangeClass.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10034_TimeToChangeClass/Q10034_TimeToChangeClass.java
index 6187c4da05..6eceff7db3 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10034_TimeToChangeClass/Q10034_TimeToChangeClass.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10034_TimeToChangeClass/Q10034_TimeToChangeClass.java
@@ -53,7 +53,7 @@ public class Q10034_TimeToChangeClass extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10035_WanderersPath/Q10035_WanderersPath.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10035_WanderersPath/Q10035_WanderersPath.java
index ab3abfda19..4442e39482 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10035_WanderersPath/Q10035_WanderersPath.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10035_WanderersPath/Q10035_WanderersPath.java
@@ -56,7 +56,7 @@ public class Q10035_WanderersPath extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -71,7 +71,7 @@ public class Q10035_WanderersPath extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10036_FromTheDepthOfAbyss/Q10036_FromTheDepthOfAbyss.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10036_FromTheDepthOfAbyss/Q10036_FromTheDepthOfAbyss.java
index 62f80616be..b82f1e5c95 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10036_FromTheDepthOfAbyss/Q10036_FromTheDepthOfAbyss.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10036_FromTheDepthOfAbyss/Q10036_FromTheDepthOfAbyss.java
@@ -51,7 +51,7 @@ public class Q10036_FromTheDepthOfAbyss extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10037_NewLifesLessons/Q10037_NewLifesLessons.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10037_NewLifesLessons/Q10037_NewLifesLessons.java
index f5d4d1d876..feb95ab645 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10037_NewLifesLessons/Q10037_NewLifesLessons.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10037_NewLifesLessons/Q10037_NewLifesLessons.java
@@ -51,7 +51,7 @@ public class Q10037_NewLifesLessons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10038_NewLifesLessons/Q10038_NewLifesLessons.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10038_NewLifesLessons/Q10038_NewLifesLessons.java
index 30d0730b98..63194937a3 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10038_NewLifesLessons/Q10038_NewLifesLessons.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10038_NewLifesLessons/Q10038_NewLifesLessons.java
@@ -51,7 +51,7 @@ public class Q10038_NewLifesLessons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10039_StrengthOfSpirit/Q10039_StrengthOfSpirit.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10039_StrengthOfSpirit/Q10039_StrengthOfSpirit.java
index 528850e800..abda67c35c 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10039_StrengthOfSpirit/Q10039_StrengthOfSpirit.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10039_StrengthOfSpirit/Q10039_StrengthOfSpirit.java
@@ -49,7 +49,7 @@ public class Q10039_StrengthOfSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10040_StrengthOfSpirit/Q10040_StrengthOfSpirit.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10040_StrengthOfSpirit/Q10040_StrengthOfSpirit.java
index 946041097f..fc7464aa3f 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10040_StrengthOfSpirit/Q10040_StrengthOfSpirit.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10040_StrengthOfSpirit/Q10040_StrengthOfSpirit.java
@@ -49,7 +49,7 @@ public class Q10040_StrengthOfSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10041_LearningAutoHunt/Q10041_LearningAutoHunt.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10041_LearningAutoHunt/Q10041_LearningAutoHunt.java
index f1f08ff4e6..c0518f32bb 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10041_LearningAutoHunt/Q10041_LearningAutoHunt.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10041_LearningAutoHunt/Q10041_LearningAutoHunt.java
@@ -52,7 +52,7 @@ public class Q10041_LearningAutoHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -67,7 +67,7 @@ public class Q10041_LearningAutoHunt extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10042_BePrepared/Q10042_BePrepared.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10042_BePrepared/Q10042_BePrepared.java
index 963016020f..390af02272 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10042_BePrepared/Q10042_BePrepared.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10042_BePrepared/Q10042_BePrepared.java
@@ -52,7 +52,7 @@ public class Q10042_BePrepared extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10043_UsefulPreparations/Q10043_UsefulPreparations.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10043_UsefulPreparations/Q10043_UsefulPreparations.java
index 65ded04733..35e7a1ec5b 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10043_UsefulPreparations/Q10043_UsefulPreparations.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10043_UsefulPreparations/Q10043_UsefulPreparations.java
@@ -52,7 +52,7 @@ public class Q10043_UsefulPreparations extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10044_TimeToThinkAboutWeapons/Q10044_TimeToThinkAboutWeapons.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10044_TimeToThinkAboutWeapons/Q10044_TimeToThinkAboutWeapons.java
index a010fb8680..4efc1f8d94 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10044_TimeToThinkAboutWeapons/Q10044_TimeToThinkAboutWeapons.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10044_TimeToThinkAboutWeapons/Q10044_TimeToThinkAboutWeapons.java
@@ -53,7 +53,7 @@ public class Q10044_TimeToThinkAboutWeapons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -68,7 +68,7 @@ public class Q10044_TimeToThinkAboutWeapons extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10045_WatchOut/Q10045_WatchOut.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10045_WatchOut/Q10045_WatchOut.java
index f6a61f95d5..406bec55b2 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10045_WatchOut/Q10045_WatchOut.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10045_WatchOut/Q10045_WatchOut.java
@@ -53,7 +53,7 @@ public class Q10045_WatchOut extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10046_DevelopingYourAbilities/Q10046_DevelopingYourAbilities.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10046_DevelopingYourAbilities/Q10046_DevelopingYourAbilities.java
index 7cfb19eb6d..720d02955a 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10046_DevelopingYourAbilities/Q10046_DevelopingYourAbilities.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10046_DevelopingYourAbilities/Q10046_DevelopingYourAbilities.java
@@ -56,7 +56,7 @@ public class Q10046_DevelopingYourAbilities extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10047_TimeToChangeClass/Q10047_TimeToChangeClass.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10047_TimeToChangeClass/Q10047_TimeToChangeClass.java
index 30ce8dddac..bc97670e4c 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10047_TimeToChangeClass/Q10047_TimeToChangeClass.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10047_TimeToChangeClass/Q10047_TimeToChangeClass.java
@@ -53,7 +53,7 @@ public class Q10047_TimeToChangeClass extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10048_BlessingOfAbyss/Q10048_BlessingOfAbyss.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10048_BlessingOfAbyss/Q10048_BlessingOfAbyss.java
index 31acdc92d4..4a873d5679 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10048_BlessingOfAbyss/Q10048_BlessingOfAbyss.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10048_BlessingOfAbyss/Q10048_BlessingOfAbyss.java
@@ -56,7 +56,7 @@ public class Q10048_BlessingOfAbyss extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -71,7 +71,7 @@ public class Q10048_BlessingOfAbyss extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10049_FiercestFlame/Q10049_FiercestFlame.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10049_FiercestFlame/Q10049_FiercestFlame.java
index 0f55a3378b..4282e91c13 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10049_FiercestFlame/Q10049_FiercestFlame.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10049_FiercestFlame/Q10049_FiercestFlame.java
@@ -49,7 +49,7 @@ public class Q10049_FiercestFlame extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10050_NewLifesLessons/Q10050_NewLifesLessons.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10050_NewLifesLessons/Q10050_NewLifesLessons.java
index bb7a23ce19..39ca3471cb 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10050_NewLifesLessons/Q10050_NewLifesLessons.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10050_NewLifesLessons/Q10050_NewLifesLessons.java
@@ -48,7 +48,7 @@ public class Q10050_NewLifesLessons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10051_StrengthOfSpirit/Q10051_StrengthOfSpirit.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10051_StrengthOfSpirit/Q10051_StrengthOfSpirit.java
index 768a647292..8aa5851e8d 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10051_StrengthOfSpirit/Q10051_StrengthOfSpirit.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10051_StrengthOfSpirit/Q10051_StrengthOfSpirit.java
@@ -48,7 +48,7 @@ public class Q10051_StrengthOfSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10052_LearningAutoHunt/Q10052_LearningAutoHunt.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10052_LearningAutoHunt/Q10052_LearningAutoHunt.java
index 9b187d076d..91f3e2fd3e 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10052_LearningAutoHunt/Q10052_LearningAutoHunt.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10052_LearningAutoHunt/Q10052_LearningAutoHunt.java
@@ -52,7 +52,7 @@ public class Q10052_LearningAutoHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -67,7 +67,7 @@ public class Q10052_LearningAutoHunt extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10053_BePrepared/Q10053_BePrepared.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10053_BePrepared/Q10053_BePrepared.java
index f2e7968d19..35f2b33a91 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10053_BePrepared/Q10053_BePrepared.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10053_BePrepared/Q10053_BePrepared.java
@@ -52,7 +52,7 @@ public class Q10053_BePrepared extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10054_UsefulPreparations/Q10054_UsefulPreparations.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10054_UsefulPreparations/Q10054_UsefulPreparations.java
index 1de487b06a..cf0c478599 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10054_UsefulPreparations/Q10054_UsefulPreparations.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10054_UsefulPreparations/Q10054_UsefulPreparations.java
@@ -52,7 +52,7 @@ public class Q10054_UsefulPreparations extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10055_TimeToThinkAboutWeapons/Q10055_TimeToThinkAboutWeapons.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10055_TimeToThinkAboutWeapons/Q10055_TimeToThinkAboutWeapons.java
index a3277aba3c..711ee00544 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10055_TimeToThinkAboutWeapons/Q10055_TimeToThinkAboutWeapons.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10055_TimeToThinkAboutWeapons/Q10055_TimeToThinkAboutWeapons.java
@@ -52,7 +52,7 @@ public class Q10055_TimeToThinkAboutWeapons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -67,7 +67,7 @@ public class Q10055_TimeToThinkAboutWeapons extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10056_WatchOut/Q10056_WatchOut.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10056_WatchOut/Q10056_WatchOut.java
index 63e1d23c4e..3fa4a20aa2 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10056_WatchOut/Q10056_WatchOut.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10056_WatchOut/Q10056_WatchOut.java
@@ -52,7 +52,7 @@ public class Q10056_WatchOut extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10057_DevelopingYourAbilities/Q10057_DevelopingYourAbilities.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10057_DevelopingYourAbilities/Q10057_DevelopingYourAbilities.java
index c464e016f3..9a0fb05d45 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10057_DevelopingYourAbilities/Q10057_DevelopingYourAbilities.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10057_DevelopingYourAbilities/Q10057_DevelopingYourAbilities.java
@@ -55,7 +55,7 @@ public class Q10057_DevelopingYourAbilities extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10058_TimeToChangeClass/Q10058_TimeToChangeClass.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10058_TimeToChangeClass/Q10058_TimeToChangeClass.java
index f724979428..ac5316fa24 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10058_TimeToChangeClass/Q10058_TimeToChangeClass.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10058_TimeToChangeClass/Q10058_TimeToChangeClass.java
@@ -53,7 +53,7 @@ public class Q10058_TimeToChangeClass extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10059_AmongTheBravestOfOrcs/Q10059_AmongTheBravestOfOrcs.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10059_AmongTheBravestOfOrcs/Q10059_AmongTheBravestOfOrcs.java
index bd0e2b761b..cda9441296 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10059_AmongTheBravestOfOrcs/Q10059_AmongTheBravestOfOrcs.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10059_AmongTheBravestOfOrcs/Q10059_AmongTheBravestOfOrcs.java
@@ -56,7 +56,7 @@ public class Q10059_AmongTheBravestOfOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -71,7 +71,7 @@ public class Q10059_AmongTheBravestOfOrcs extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10060_NewFlameOfOrcs/Q10060_NewFlameOfOrcs.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10060_NewFlameOfOrcs/Q10060_NewFlameOfOrcs.java
index e1dcfa91d9..674b922968 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10060_NewFlameOfOrcs/Q10060_NewFlameOfOrcs.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10060_NewFlameOfOrcs/Q10060_NewFlameOfOrcs.java
@@ -49,7 +49,7 @@ public class Q10060_NewFlameOfOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10061_NewLifesLessons/Q10061_NewLifesLessons.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10061_NewLifesLessons/Q10061_NewLifesLessons.java
index 7154e23308..97d0fa5daf 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10061_NewLifesLessons/Q10061_NewLifesLessons.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10061_NewLifesLessons/Q10061_NewLifesLessons.java
@@ -48,7 +48,7 @@ public class Q10061_NewLifesLessons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10062_StrengthOfSpirit/Q10062_StrengthOfSpirit.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10062_StrengthOfSpirit/Q10062_StrengthOfSpirit.java
index 2bb813dfb4..ab974e0c5d 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10062_StrengthOfSpirit/Q10062_StrengthOfSpirit.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10062_StrengthOfSpirit/Q10062_StrengthOfSpirit.java
@@ -48,7 +48,7 @@ public class Q10062_StrengthOfSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10063_LearningAutoHunt/Q10063_LearningAutoHunt.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10063_LearningAutoHunt/Q10063_LearningAutoHunt.java
index d6be31773f..e97133a00f 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10063_LearningAutoHunt/Q10063_LearningAutoHunt.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10063_LearningAutoHunt/Q10063_LearningAutoHunt.java
@@ -52,7 +52,7 @@ public class Q10063_LearningAutoHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -67,7 +67,7 @@ public class Q10063_LearningAutoHunt extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10064_BePrepared/Q10064_BePrepared.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10064_BePrepared/Q10064_BePrepared.java
index cf9f64ff9d..76d4e36b35 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10064_BePrepared/Q10064_BePrepared.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10064_BePrepared/Q10064_BePrepared.java
@@ -52,7 +52,7 @@ public class Q10064_BePrepared extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10065_UsefulPreparations/Q10065_UsefulPreparations.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10065_UsefulPreparations/Q10065_UsefulPreparations.java
index 2d31172fbb..a35bacf365 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10065_UsefulPreparations/Q10065_UsefulPreparations.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10065_UsefulPreparations/Q10065_UsefulPreparations.java
@@ -52,7 +52,7 @@ public class Q10065_UsefulPreparations extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10066_TimeToThinkAboutWeapons/Q10066_TimeToThinkAboutWeapons.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10066_TimeToThinkAboutWeapons/Q10066_TimeToThinkAboutWeapons.java
index b3a5580410..11c2b26b2a 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10066_TimeToThinkAboutWeapons/Q10066_TimeToThinkAboutWeapons.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10066_TimeToThinkAboutWeapons/Q10066_TimeToThinkAboutWeapons.java
@@ -52,7 +52,7 @@ public class Q10066_TimeToThinkAboutWeapons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -67,7 +67,7 @@ public class Q10066_TimeToThinkAboutWeapons extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10067_WatchOut/Q10067_WatchOut.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10067_WatchOut/Q10067_WatchOut.java
index e2e558f4da..1053b4fcd1 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10067_WatchOut/Q10067_WatchOut.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10067_WatchOut/Q10067_WatchOut.java
@@ -52,7 +52,7 @@ public class Q10067_WatchOut extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10068_DevelopingYourAbilities/Q10068_DevelopingYourAbilities.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10068_DevelopingYourAbilities/Q10068_DevelopingYourAbilities.java
index 0cb718d724..fe689f7c79 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10068_DevelopingYourAbilities/Q10068_DevelopingYourAbilities.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10068_DevelopingYourAbilities/Q10068_DevelopingYourAbilities.java
@@ -55,7 +55,7 @@ public class Q10068_DevelopingYourAbilities extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10069_TimeToChangeClass/Q10069_TimeToChangeClass.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10069_TimeToChangeClass/Q10069_TimeToChangeClass.java
index fef01d41b9..36f42fdb86 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10069_TimeToChangeClass/Q10069_TimeToChangeClass.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10069_TimeToChangeClass/Q10069_TimeToChangeClass.java
@@ -53,7 +53,7 @@ public class Q10069_TimeToChangeClass extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10070_AmongTheBravestOfOrcs/Q10070_AmongTheBravestOfOrcs.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10070_AmongTheBravestOfOrcs/Q10070_AmongTheBravestOfOrcs.java
index 024db64cad..b2b5ea26c2 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10070_AmongTheBravestOfOrcs/Q10070_AmongTheBravestOfOrcs.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10070_AmongTheBravestOfOrcs/Q10070_AmongTheBravestOfOrcs.java
@@ -56,7 +56,7 @@ public class Q10070_AmongTheBravestOfOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -71,7 +71,7 @@ public class Q10070_AmongTheBravestOfOrcs extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10071_OreFromTheStripMine/Q10071_OreFromTheStripMine.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10071_OreFromTheStripMine/Q10071_OreFromTheStripMine.java
index 95fc94f167..ab27cd01a4 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10071_OreFromTheStripMine/Q10071_OreFromTheStripMine.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10071_OreFromTheStripMine/Q10071_OreFromTheStripMine.java
@@ -49,7 +49,7 @@ public class Q10071_OreFromTheStripMine extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10072_NewLifesLessons/Q10072_NewLifesLessons.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10072_NewLifesLessons/Q10072_NewLifesLessons.java
index 2d07b9baf8..1c9994777e 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10072_NewLifesLessons/Q10072_NewLifesLessons.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10072_NewLifesLessons/Q10072_NewLifesLessons.java
@@ -49,7 +49,7 @@ public class Q10072_NewLifesLessons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10073_StrengthOfSpirit/Q10073_StrengthOfSpirit.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10073_StrengthOfSpirit/Q10073_StrengthOfSpirit.java
index 3cc7951c75..4a64692c46 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10073_StrengthOfSpirit/Q10073_StrengthOfSpirit.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10073_StrengthOfSpirit/Q10073_StrengthOfSpirit.java
@@ -49,7 +49,7 @@ public class Q10073_StrengthOfSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10074_LearningAutoHunt/Q10074_LearningAutoHunt.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10074_LearningAutoHunt/Q10074_LearningAutoHunt.java
index 2ca3c8c397..89a1873a20 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10074_LearningAutoHunt/Q10074_LearningAutoHunt.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10074_LearningAutoHunt/Q10074_LearningAutoHunt.java
@@ -52,7 +52,7 @@ public class Q10074_LearningAutoHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -67,7 +67,7 @@ public class Q10074_LearningAutoHunt extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10075_BePrepared/Q10075_BePrepared.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10075_BePrepared/Q10075_BePrepared.java
index 17201c5467..30bb5b197a 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10075_BePrepared/Q10075_BePrepared.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10075_BePrepared/Q10075_BePrepared.java
@@ -52,7 +52,7 @@ public class Q10075_BePrepared extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10076_UsefulPreparations/Q10076_UsefulPreparations.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10076_UsefulPreparations/Q10076_UsefulPreparations.java
index 2a564ae30d..321ec1281b 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10076_UsefulPreparations/Q10076_UsefulPreparations.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10076_UsefulPreparations/Q10076_UsefulPreparations.java
@@ -52,7 +52,7 @@ public class Q10076_UsefulPreparations extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10077_TimeToThinkAboutWeapons/Q10077_TimeToThinkAboutWeapons.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10077_TimeToThinkAboutWeapons/Q10077_TimeToThinkAboutWeapons.java
index 7a3a29142a..290dd292c8 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10077_TimeToThinkAboutWeapons/Q10077_TimeToThinkAboutWeapons.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10077_TimeToThinkAboutWeapons/Q10077_TimeToThinkAboutWeapons.java
@@ -50,7 +50,7 @@ public class Q10077_TimeToThinkAboutWeapons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -65,7 +65,7 @@ public class Q10077_TimeToThinkAboutWeapons extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10078_WatchOut/Q10078_WatchOut.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10078_WatchOut/Q10078_WatchOut.java
index d435aa01ee..19d86f238e 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10078_WatchOut/Q10078_WatchOut.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10078_WatchOut/Q10078_WatchOut.java
@@ -50,7 +50,7 @@ public class Q10078_WatchOut extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10079_DevelopingYourAbilities/Q10079_DevelopingYourAbilities.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10079_DevelopingYourAbilities/Q10079_DevelopingYourAbilities.java
index 5b123e3b84..ae41d3d76d 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10079_DevelopingYourAbilities/Q10079_DevelopingYourAbilities.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10079_DevelopingYourAbilities/Q10079_DevelopingYourAbilities.java
@@ -53,7 +53,7 @@ public class Q10079_DevelopingYourAbilities extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10080_TimeToChangeClass/Q10080_TimeToChangeClass.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10080_TimeToChangeClass/Q10080_TimeToChangeClass.java
index b62295e3f8..cc535742f6 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10080_TimeToChangeClass/Q10080_TimeToChangeClass.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10080_TimeToChangeClass/Q10080_TimeToChangeClass.java
@@ -53,7 +53,7 @@ public class Q10080_TimeToChangeClass extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10081_BestMiner/Q10081_BestMiner.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10081_BestMiner/Q10081_BestMiner.java
index ca03b0ce28..800db4c499 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10081_BestMiner/Q10081_BestMiner.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10081_BestMiner/Q10081_BestMiner.java
@@ -56,7 +56,7 @@ public class Q10081_BestMiner extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -71,7 +71,7 @@ public class Q10081_BestMiner extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10082_EfficientTraining/Q10082_EfficientTraining.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10082_EfficientTraining/Q10082_EfficientTraining.java
index 0f828b92f8..57eeb6812d 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10082_EfficientTraining/Q10082_EfficientTraining.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10082_EfficientTraining/Q10082_EfficientTraining.java
@@ -49,7 +49,7 @@ public class Q10082_EfficientTraining extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10083_NewLifesLessons/Q10083_NewLifesLessons.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10083_NewLifesLessons/Q10083_NewLifesLessons.java
index ffb5edb2cd..3e8b54a114 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10083_NewLifesLessons/Q10083_NewLifesLessons.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10083_NewLifesLessons/Q10083_NewLifesLessons.java
@@ -49,7 +49,7 @@ public class Q10083_NewLifesLessons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10084_StrengthOfSpirit/Q10084_StrengthOfSpirit.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10084_StrengthOfSpirit/Q10084_StrengthOfSpirit.java
index 24d52ef854..2178a5c6c2 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10084_StrengthOfSpirit/Q10084_StrengthOfSpirit.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10084_StrengthOfSpirit/Q10084_StrengthOfSpirit.java
@@ -49,7 +49,7 @@ public class Q10084_StrengthOfSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10085_LearningAutoHunt/Q10085_LearningAutoHunt.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10085_LearningAutoHunt/Q10085_LearningAutoHunt.java
index 27fc08953a..300d0db3e6 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10085_LearningAutoHunt/Q10085_LearningAutoHunt.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10085_LearningAutoHunt/Q10085_LearningAutoHunt.java
@@ -52,7 +52,7 @@ public class Q10085_LearningAutoHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -67,7 +67,7 @@ public class Q10085_LearningAutoHunt extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10086_BePrepared/Q10086_BePrepared.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10086_BePrepared/Q10086_BePrepared.java
index 0b50a3aadf..2908f22791 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10086_BePrepared/Q10086_BePrepared.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10086_BePrepared/Q10086_BePrepared.java
@@ -52,7 +52,7 @@ public class Q10086_BePrepared extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10087_UsefulPreparations/Q10087_UsefulPreparations.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10087_UsefulPreparations/Q10087_UsefulPreparations.java
index 0f7cc0725e..16647b130b 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10087_UsefulPreparations/Q10087_UsefulPreparations.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10087_UsefulPreparations/Q10087_UsefulPreparations.java
@@ -52,7 +52,7 @@ public class Q10087_UsefulPreparations extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10088_TimeToThinkAboutWeapons/Q10088_TimeToThinkAboutWeapons.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10088_TimeToThinkAboutWeapons/Q10088_TimeToThinkAboutWeapons.java
index e0bf887968..6ccd000ef0 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10088_TimeToThinkAboutWeapons/Q10088_TimeToThinkAboutWeapons.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10088_TimeToThinkAboutWeapons/Q10088_TimeToThinkAboutWeapons.java
@@ -52,7 +52,7 @@ public class Q10088_TimeToThinkAboutWeapons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -67,7 +67,7 @@ public class Q10088_TimeToThinkAboutWeapons extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10089_WatchOut/Q10089_WatchOut.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10089_WatchOut/Q10089_WatchOut.java
index 695202bb40..9b4e2f7331 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10089_WatchOut/Q10089_WatchOut.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10089_WatchOut/Q10089_WatchOut.java
@@ -52,7 +52,7 @@ public class Q10089_WatchOut extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10090_DevelopingYourAbilities/Q10090_DevelopingYourAbilities.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10090_DevelopingYourAbilities/Q10090_DevelopingYourAbilities.java
index c1500df7cc..76e2219eaf 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10090_DevelopingYourAbilities/Q10090_DevelopingYourAbilities.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10090_DevelopingYourAbilities/Q10090_DevelopingYourAbilities.java
@@ -55,7 +55,7 @@ public class Q10090_DevelopingYourAbilities extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10091_TimeToChangeClass/Q10091_TimeToChangeClass.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10091_TimeToChangeClass/Q10091_TimeToChangeClass.java
index b0e19edf49..aa2d04d0cf 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10091_TimeToChangeClass/Q10091_TimeToChangeClass.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10091_TimeToChangeClass/Q10091_TimeToChangeClass.java
@@ -53,7 +53,7 @@ public class Q10091_TimeToChangeClass extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10092_NewHorizons/Q10092_NewHorizons.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10092_NewHorizons/Q10092_NewHorizons.java
index 16a052f10d..a6364ec73d 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10092_NewHorizons/Q10092_NewHorizons.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10092_NewHorizons/Q10092_NewHorizons.java
@@ -56,7 +56,7 @@ public class Q10092_NewHorizons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -71,7 +71,7 @@ public class Q10092_NewHorizons extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10093_TheLifeOfADeathKnight/Q10093_TheLifeOfADeathKnight.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10093_TheLifeOfADeathKnight/Q10093_TheLifeOfADeathKnight.java
index 06534a9eb9..992e56f0cf 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10093_TheLifeOfADeathKnight/Q10093_TheLifeOfADeathKnight.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10093_TheLifeOfADeathKnight/Q10093_TheLifeOfADeathKnight.java
@@ -49,7 +49,7 @@ public class Q10093_TheLifeOfADeathKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10094_NewLifesLessons/Q10094_NewLifesLessons.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10094_NewLifesLessons/Q10094_NewLifesLessons.java
index 052e35f50b..8b3f6119c5 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10094_NewLifesLessons/Q10094_NewLifesLessons.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10094_NewLifesLessons/Q10094_NewLifesLessons.java
@@ -48,7 +48,7 @@ public class Q10094_NewLifesLessons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10095_StrengthOfSpirit/Q10095_StrengthOfSpirit.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10095_StrengthOfSpirit/Q10095_StrengthOfSpirit.java
index 442f7c8990..dfacec01ec 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10095_StrengthOfSpirit/Q10095_StrengthOfSpirit.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10095_StrengthOfSpirit/Q10095_StrengthOfSpirit.java
@@ -48,7 +48,7 @@ public class Q10095_StrengthOfSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10096_LearningAutoHunt/Q10096_LearningAutoHunt.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10096_LearningAutoHunt/Q10096_LearningAutoHunt.java
index 65909d5589..abae0491d0 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10096_LearningAutoHunt/Q10096_LearningAutoHunt.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10096_LearningAutoHunt/Q10096_LearningAutoHunt.java
@@ -50,7 +50,7 @@ public class Q10096_LearningAutoHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -65,7 +65,7 @@ public class Q10096_LearningAutoHunt extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10097_BePrepared/Q10097_BePrepared.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10097_BePrepared/Q10097_BePrepared.java
index ad2cfb3f29..56bcf75521 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10097_BePrepared/Q10097_BePrepared.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10097_BePrepared/Q10097_BePrepared.java
@@ -50,7 +50,7 @@ public class Q10097_BePrepared extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10098_UsefulPreparations/Q10098_UsefulPreparations.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10098_UsefulPreparations/Q10098_UsefulPreparations.java
index 826d84bbe5..07307b4983 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10098_UsefulPreparations/Q10098_UsefulPreparations.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10098_UsefulPreparations/Q10098_UsefulPreparations.java
@@ -50,7 +50,7 @@ public class Q10098_UsefulPreparations extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10099_TimeToThinkAboutWeapons/Q10099_TimeToThinkAboutWeapons.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10099_TimeToThinkAboutWeapons/Q10099_TimeToThinkAboutWeapons.java
index 6274e76d4e..ceff5eae8c 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10099_TimeToThinkAboutWeapons/Q10099_TimeToThinkAboutWeapons.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10099_TimeToThinkAboutWeapons/Q10099_TimeToThinkAboutWeapons.java
@@ -50,7 +50,7 @@ public class Q10099_TimeToThinkAboutWeapons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -65,7 +65,7 @@ public class Q10099_TimeToThinkAboutWeapons extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10100_WatchOut/Q10100_WatchOut.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10100_WatchOut/Q10100_WatchOut.java
index f4d1b47dcb..fbad4c1fd4 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10100_WatchOut/Q10100_WatchOut.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10100_WatchOut/Q10100_WatchOut.java
@@ -50,7 +50,7 @@ public class Q10100_WatchOut extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10101_DevelopingYourAbilities/Q10101_DevelopingYourAbilities.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10101_DevelopingYourAbilities/Q10101_DevelopingYourAbilities.java
index 1227752c70..d82c0d3901 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10101_DevelopingYourAbilities/Q10101_DevelopingYourAbilities.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10101_DevelopingYourAbilities/Q10101_DevelopingYourAbilities.java
@@ -53,7 +53,7 @@ public class Q10101_DevelopingYourAbilities extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10102_TimeToChangeClass/Q10102_TimeToChangeClass.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10102_TimeToChangeClass/Q10102_TimeToChangeClass.java
index fb74bda590..1393fe56b3 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10102_TimeToChangeClass/Q10102_TimeToChangeClass.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10102_TimeToChangeClass/Q10102_TimeToChangeClass.java
@@ -53,7 +53,7 @@ public class Q10102_TimeToChangeClass extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10103_ChallengingYourDestiny/Q10103_ChallengingYourDestiny.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10103_ChallengingYourDestiny/Q10103_ChallengingYourDestiny.java
index 3e56b74592..d6da250343 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10103_ChallengingYourDestiny/Q10103_ChallengingYourDestiny.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10103_ChallengingYourDestiny/Q10103_ChallengingYourDestiny.java
@@ -56,7 +56,7 @@ public class Q10103_ChallengingYourDestiny extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -71,7 +71,7 @@ public class Q10103_ChallengingYourDestiny extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10104_SayhasChildren/Q10104_SayhasChildren.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10104_SayhasChildren/Q10104_SayhasChildren.java
index 2092639aef..6518079238 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10104_SayhasChildren/Q10104_SayhasChildren.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10104_SayhasChildren/Q10104_SayhasChildren.java
@@ -49,7 +49,7 @@ public class Q10104_SayhasChildren extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10105_NewLifesLessons/Q10105_NewLifesLessons.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10105_NewLifesLessons/Q10105_NewLifesLessons.java
index 383e4ef607..63c9131a34 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10105_NewLifesLessons/Q10105_NewLifesLessons.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10105_NewLifesLessons/Q10105_NewLifesLessons.java
@@ -48,7 +48,7 @@ public class Q10105_NewLifesLessons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10106_StrengthOfSpirit/Q10106_StrengthOfSpirit.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10106_StrengthOfSpirit/Q10106_StrengthOfSpirit.java
index af82ab2169..b6907ba901 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10106_StrengthOfSpirit/Q10106_StrengthOfSpirit.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10106_StrengthOfSpirit/Q10106_StrengthOfSpirit.java
@@ -48,7 +48,7 @@ public class Q10106_StrengthOfSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10107_LearningAutoHunt/Q10107_LearningAutoHunt.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10107_LearningAutoHunt/Q10107_LearningAutoHunt.java
index 6e3275d6a7..96239b20a6 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10107_LearningAutoHunt/Q10107_LearningAutoHunt.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10107_LearningAutoHunt/Q10107_LearningAutoHunt.java
@@ -51,7 +51,7 @@ public class Q10107_LearningAutoHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -66,7 +66,7 @@ public class Q10107_LearningAutoHunt extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10108_BePrepared/Q10108_BePrepared.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10108_BePrepared/Q10108_BePrepared.java
index 6936e8fad0..18ccde0a62 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10108_BePrepared/Q10108_BePrepared.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10108_BePrepared/Q10108_BePrepared.java
@@ -51,7 +51,7 @@ public class Q10108_BePrepared extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10109_UsefulPreparations/Q10109_UsefulPreparations.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10109_UsefulPreparations/Q10109_UsefulPreparations.java
index 4878d6cecd..fe443662b5 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10109_UsefulPreparations/Q10109_UsefulPreparations.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10109_UsefulPreparations/Q10109_UsefulPreparations.java
@@ -51,7 +51,7 @@ public class Q10109_UsefulPreparations extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10110_TimeToThinkAboutWeapons/Q10110_TimeToThinkAboutWeapons.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10110_TimeToThinkAboutWeapons/Q10110_TimeToThinkAboutWeapons.java
index 0dd2233495..cbf1ab9b2c 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10110_TimeToThinkAboutWeapons/Q10110_TimeToThinkAboutWeapons.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10110_TimeToThinkAboutWeapons/Q10110_TimeToThinkAboutWeapons.java
@@ -51,7 +51,7 @@ public class Q10110_TimeToThinkAboutWeapons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -66,7 +66,7 @@ public class Q10110_TimeToThinkAboutWeapons extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10111_WatchOut/Q10111_WatchOut.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10111_WatchOut/Q10111_WatchOut.java
index ffd066ba1d..dac0225247 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10111_WatchOut/Q10111_WatchOut.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10111_WatchOut/Q10111_WatchOut.java
@@ -51,7 +51,7 @@ public class Q10111_WatchOut extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10112_DevelopingYourAbilities/Q10112_DevelopingYourAbilities.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10112_DevelopingYourAbilities/Q10112_DevelopingYourAbilities.java
index b2a854e51f..aec57155d2 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10112_DevelopingYourAbilities/Q10112_DevelopingYourAbilities.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10112_DevelopingYourAbilities/Q10112_DevelopingYourAbilities.java
@@ -54,7 +54,7 @@ public class Q10112_DevelopingYourAbilities extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10113_TimeToChangeClass/Q10113_TimeToChangeClass.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10113_TimeToChangeClass/Q10113_TimeToChangeClass.java
index 2ffefae1c4..94e98cb2fa 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10113_TimeToChangeClass/Q10113_TimeToChangeClass.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10113_TimeToChangeClass/Q10113_TimeToChangeClass.java
@@ -53,7 +53,7 @@ public class Q10113_TimeToChangeClass extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10114_WeSylphs/Q10114_WeSylphs.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10114_WeSylphs/Q10114_WeSylphs.java
index 2de499942b..29e8d66257 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10114_WeSylphs/Q10114_WeSylphs.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10114_WeSylphs/Q10114_WeSylphs.java
@@ -56,7 +56,7 @@ public class Q10114_WeSylphs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -71,7 +71,7 @@ public class Q10114_WeSylphs extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10115_OnlyForNodaMembers/Q10115_OnlyForNodaMembers.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10115_OnlyForNodaMembers/Q10115_OnlyForNodaMembers.java
index f302a6e299..95938a528d 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10115_OnlyForNodaMembers/Q10115_OnlyForNodaMembers.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10115_OnlyForNodaMembers/Q10115_OnlyForNodaMembers.java
@@ -48,7 +48,7 @@ public class Q10115_OnlyForNodaMembers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10116_NewLifesLessons/Q10116_NewLifesLessons.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10116_NewLifesLessons/Q10116_NewLifesLessons.java
index 4104de4db2..69fdd43c4e 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10116_NewLifesLessons/Q10116_NewLifesLessons.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10116_NewLifesLessons/Q10116_NewLifesLessons.java
@@ -48,7 +48,7 @@ public class Q10116_NewLifesLessons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10117_StrengthOfSpirit/Q10117_StrengthOfSpirit.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10117_StrengthOfSpirit/Q10117_StrengthOfSpirit.java
index caa706c635..32c773a129 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10117_StrengthOfSpirit/Q10117_StrengthOfSpirit.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10117_StrengthOfSpirit/Q10117_StrengthOfSpirit.java
@@ -48,7 +48,7 @@ public class Q10117_StrengthOfSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10118_LearningAutoHunt/Q10118_LearningAutoHunt.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10118_LearningAutoHunt/Q10118_LearningAutoHunt.java
index 2163314ad7..7a393c2d66 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10118_LearningAutoHunt/Q10118_LearningAutoHunt.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10118_LearningAutoHunt/Q10118_LearningAutoHunt.java
@@ -50,7 +50,7 @@ public class Q10118_LearningAutoHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -65,7 +65,7 @@ public class Q10118_LearningAutoHunt extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10119_BePrepared/Q10119_BePrepared.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10119_BePrepared/Q10119_BePrepared.java
index b971d5897a..3a1dd7401d 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10119_BePrepared/Q10119_BePrepared.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10119_BePrepared/Q10119_BePrepared.java
@@ -50,7 +50,7 @@ public class Q10119_BePrepared extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10120_UsefulPreparations/Q10120_UsefulPreparations.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10120_UsefulPreparations/Q10120_UsefulPreparations.java
index 74371915f3..88ac7013ad 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10120_UsefulPreparations/Q10120_UsefulPreparations.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10120_UsefulPreparations/Q10120_UsefulPreparations.java
@@ -50,7 +50,7 @@ public class Q10120_UsefulPreparations extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10121_TimeToThinkAboutWeapons/Q10121_TimeToThinkAboutWeapons.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10121_TimeToThinkAboutWeapons/Q10121_TimeToThinkAboutWeapons.java
index c4f4adc77e..51bc9e8b2e 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10121_TimeToThinkAboutWeapons/Q10121_TimeToThinkAboutWeapons.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10121_TimeToThinkAboutWeapons/Q10121_TimeToThinkAboutWeapons.java
@@ -50,7 +50,7 @@ public class Q10121_TimeToThinkAboutWeapons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -65,7 +65,7 @@ public class Q10121_TimeToThinkAboutWeapons extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10122_WatchOut/Q10122_WatchOut.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10122_WatchOut/Q10122_WatchOut.java
index 486f6b752e..befdbdee80 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10122_WatchOut/Q10122_WatchOut.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10122_WatchOut/Q10122_WatchOut.java
@@ -50,7 +50,7 @@ public class Q10122_WatchOut extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10123_DevelopingYourAbilities/Q10123_DevelopingYourAbilities.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10123_DevelopingYourAbilities/Q10123_DevelopingYourAbilities.java
index 6bdd610794..b0e494d2b2 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10123_DevelopingYourAbilities/Q10123_DevelopingYourAbilities.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10123_DevelopingYourAbilities/Q10123_DevelopingYourAbilities.java
@@ -53,7 +53,7 @@ public class Q10123_DevelopingYourAbilities extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10124_TimeToChangeClass/Q10124_TimeToChangeClass.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10124_TimeToChangeClass/Q10124_TimeToChangeClass.java
index 334b4fb180..88962472ac 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10124_TimeToChangeClass/Q10124_TimeToChangeClass.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10124_TimeToChangeClass/Q10124_TimeToChangeClass.java
@@ -53,7 +53,7 @@ public class Q10124_TimeToChangeClass extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10125_AssassinsFirstJob/Q10125_AssassinsFirstJob.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10125_AssassinsFirstJob/Q10125_AssassinsFirstJob.java
index a5cb8a4679..e541ead19a 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10125_AssassinsFirstJob/Q10125_AssassinsFirstJob.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10125_AssassinsFirstJob/Q10125_AssassinsFirstJob.java
@@ -56,7 +56,7 @@ public class Q10125_AssassinsFirstJob extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -71,7 +71,7 @@ public class Q10125_AssassinsFirstJob extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10301_MoreExperience/Q10301_MoreExperience.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10301_MoreExperience/Q10301_MoreExperience.java
index 1d5fde6d38..10a5b07b5c 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10301_MoreExperience/Q10301_MoreExperience.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10301_MoreExperience/Q10301_MoreExperience.java
@@ -53,7 +53,7 @@ public class Q10301_MoreExperience extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -68,7 +68,7 @@ public class Q10301_MoreExperience extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10302_SecretGarden/Q10302_SecretGarden.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10302_SecretGarden/Q10302_SecretGarden.java
index 248f7d1e18..91479a98b0 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10302_SecretGarden/Q10302_SecretGarden.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10302_SecretGarden/Q10302_SecretGarden.java
@@ -53,7 +53,7 @@ public class Q10302_SecretGarden extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -68,7 +68,7 @@ public class Q10302_SecretGarden extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10303_DeathMysteries/Q10303_DeathMysteries.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10303_DeathMysteries/Q10303_DeathMysteries.java
index 76ff3d68a7..e91fc4e8f9 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10303_DeathMysteries/Q10303_DeathMysteries.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10303_DeathMysteries/Q10303_DeathMysteries.java
@@ -54,7 +54,7 @@ public class Q10303_DeathMysteries extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -69,7 +69,7 @@ public class Q10303_DeathMysteries extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10304_ANewLook/Q10304_ANewLook.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10304_ANewLook/Q10304_ANewLook.java
index 16d0781736..90060f2780 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10304_ANewLook/Q10304_ANewLook.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10304_ANewLook/Q10304_ANewLook.java
@@ -52,7 +52,7 @@ public class Q10304_ANewLook extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10305_SporeInfestedPlace/Q10305_SporeInfestedPlace.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10305_SporeInfestedPlace/Q10305_SporeInfestedPlace.java
index d1ba8d42a9..cff726baf9 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10305_SporeInfestedPlace/Q10305_SporeInfestedPlace.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10305_SporeInfestedPlace/Q10305_SporeInfestedPlace.java
@@ -57,7 +57,7 @@ public class Q10305_SporeInfestedPlace extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10306_PeaceInTheCemetery1/Q10306_PeaceInTheCemetery1.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10306_PeaceInTheCemetery1/Q10306_PeaceInTheCemetery1.java
index 9a76ddc261..68124e88dd 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10306_PeaceInTheCemetery1/Q10306_PeaceInTheCemetery1.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10306_PeaceInTheCemetery1/Q10306_PeaceInTheCemetery1.java
@@ -60,7 +60,7 @@ public class Q10306_PeaceInTheCemetery1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10307_PeaceInTheCemetery2/Q10307_PeaceInTheCemetery2.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10307_PeaceInTheCemetery2/Q10307_PeaceInTheCemetery2.java
index 71fe8db0ca..519c2853e4 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10307_PeaceInTheCemetery2/Q10307_PeaceInTheCemetery2.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10307_PeaceInTheCemetery2/Q10307_PeaceInTheCemetery2.java
@@ -57,7 +57,7 @@ public class Q10307_PeaceInTheCemetery2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10308_PeaceInTheCemetery3/Q10308_PeaceInTheCemetery3.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10308_PeaceInTheCemetery3/Q10308_PeaceInTheCemetery3.java
index c8cee83e81..926ddfcca6 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10308_PeaceInTheCemetery3/Q10308_PeaceInTheCemetery3.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10308_PeaceInTheCemetery3/Q10308_PeaceInTheCemetery3.java
@@ -64,7 +64,7 @@ public class Q10308_PeaceInTheCemetery3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10309_PeaceInTheCemetery3/Q10309_PeaceInTheCemetery3.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10309_PeaceInTheCemetery3/Q10309_PeaceInTheCemetery3.java
index ac46d5621a..42e289611e 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10309_PeaceInTheCemetery3/Q10309_PeaceInTheCemetery3.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10309_PeaceInTheCemetery3/Q10309_PeaceInTheCemetery3.java
@@ -64,7 +64,7 @@ public class Q10309_PeaceInTheCemetery3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10310_PeaceInTheCemetery3/Q10310_PeaceInTheCemetery3.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10310_PeaceInTheCemetery3/Q10310_PeaceInTheCemetery3.java
index bc4da0893d..c8a8d982ba 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10310_PeaceInTheCemetery3/Q10310_PeaceInTheCemetery3.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10310_PeaceInTheCemetery3/Q10310_PeaceInTheCemetery3.java
@@ -64,7 +64,7 @@ public class Q10310_PeaceInTheCemetery3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10311_PeaceInTheCemetery3/Q10311_PeaceInTheCemetery3.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10311_PeaceInTheCemetery3/Q10311_PeaceInTheCemetery3.java
index 96efd42c30..a527e43e2c 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10311_PeaceInTheCemetery3/Q10311_PeaceInTheCemetery3.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10311_PeaceInTheCemetery3/Q10311_PeaceInTheCemetery3.java
@@ -64,7 +64,7 @@ public class Q10311_PeaceInTheCemetery3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10312_PeaceInTheCemetery3/Q10312_PeaceInTheCemetery3.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10312_PeaceInTheCemetery3/Q10312_PeaceInTheCemetery3.java
index b1e6037abc..147dbe61bf 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10312_PeaceInTheCemetery3/Q10312_PeaceInTheCemetery3.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10312_PeaceInTheCemetery3/Q10312_PeaceInTheCemetery3.java
@@ -64,7 +64,7 @@ public class Q10312_PeaceInTheCemetery3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10313_PeaceInTheCemetery3/Q10313_PeaceInTheCemetery3.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10313_PeaceInTheCemetery3/Q10313_PeaceInTheCemetery3.java
index 5d2bce48b0..68d19c33a6 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10313_PeaceInTheCemetery3/Q10313_PeaceInTheCemetery3.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10313_PeaceInTheCemetery3/Q10313_PeaceInTheCemetery3.java
@@ -64,7 +64,7 @@ public class Q10313_PeaceInTheCemetery3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10314_PeaceInTheCemetery3/Q10314_PeaceInTheCemetery3.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10314_PeaceInTheCemetery3/Q10314_PeaceInTheCemetery3.java
index 03812c174e..72bb0ae474 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10314_PeaceInTheCemetery3/Q10314_PeaceInTheCemetery3.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10314_PeaceInTheCemetery3/Q10314_PeaceInTheCemetery3.java
@@ -64,7 +64,7 @@ public class Q10314_PeaceInTheCemetery3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10315_PeaceInTheCemetery3/Q10315_PeaceInTheCemetery3.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10315_PeaceInTheCemetery3/Q10315_PeaceInTheCemetery3.java
index b39bfcb9b5..67c3928cb9 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10315_PeaceInTheCemetery3/Q10315_PeaceInTheCemetery3.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10315_PeaceInTheCemetery3/Q10315_PeaceInTheCemetery3.java
@@ -64,7 +64,7 @@ public class Q10315_PeaceInTheCemetery3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10316_PeaceInTheCemetery3/Q10316_PeaceInTheCemetery3.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10316_PeaceInTheCemetery3/Q10316_PeaceInTheCemetery3.java
index 1aae3fde0d..64b929b058 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10316_PeaceInTheCemetery3/Q10316_PeaceInTheCemetery3.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10316_PeaceInTheCemetery3/Q10316_PeaceInTheCemetery3.java
@@ -64,7 +64,7 @@ public class Q10316_PeaceInTheCemetery3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10317_PeaceInTheCemetery3/Q10317_PeaceInTheCemetery3.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10317_PeaceInTheCemetery3/Q10317_PeaceInTheCemetery3.java
index b970e65444..e1f00228bb 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10317_PeaceInTheCemetery3/Q10317_PeaceInTheCemetery3.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10317_PeaceInTheCemetery3/Q10317_PeaceInTheCemetery3.java
@@ -64,7 +64,7 @@ public class Q10317_PeaceInTheCemetery3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10318_PeaceInTheCemetery3/Q10318_PeaceInTheCemetery3.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10318_PeaceInTheCemetery3/Q10318_PeaceInTheCemetery3.java
index d1d8449599..6f31316e04 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10318_PeaceInTheCemetery3/Q10318_PeaceInTheCemetery3.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10318_PeaceInTheCemetery3/Q10318_PeaceInTheCemetery3.java
@@ -64,7 +64,7 @@ public class Q10318_PeaceInTheCemetery3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10319_PeaceInTheCemetery3/Q10319_PeaceInTheCemetery3.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10319_PeaceInTheCemetery3/Q10319_PeaceInTheCemetery3.java
index 46451bf52c..c3e66811e9 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10319_PeaceInTheCemetery3/Q10319_PeaceInTheCemetery3.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10319_PeaceInTheCemetery3/Q10319_PeaceInTheCemetery3.java
@@ -64,7 +64,7 @@ public class Q10319_PeaceInTheCemetery3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10320_PeaceInTheCemetery3/Q10320_PeaceInTheCemetery3.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10320_PeaceInTheCemetery3/Q10320_PeaceInTheCemetery3.java
index 16a3e185f3..3e1fd2ae6e 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10320_PeaceInTheCemetery3/Q10320_PeaceInTheCemetery3.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10320_PeaceInTheCemetery3/Q10320_PeaceInTheCemetery3.java
@@ -64,7 +64,7 @@ public class Q10320_PeaceInTheCemetery3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10321_PeaceInTheCemetery4/Q10321_PeaceInTheCemetery4.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10321_PeaceInTheCemetery4/Q10321_PeaceInTheCemetery4.java
index 135ed69483..101a507e49 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10321_PeaceInTheCemetery4/Q10321_PeaceInTheCemetery4.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10321_PeaceInTheCemetery4/Q10321_PeaceInTheCemetery4.java
@@ -64,7 +64,7 @@ public class Q10321_PeaceInTheCemetery4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10322_PayRespectToFallenBrethren1/Q10322_PayRespectToFallenBrethren1.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10322_PayRespectToFallenBrethren1/Q10322_PayRespectToFallenBrethren1.java
index f5ec7cd1dd..b86aa06577 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10322_PayRespectToFallenBrethren1/Q10322_PayRespectToFallenBrethren1.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10322_PayRespectToFallenBrethren1/Q10322_PayRespectToFallenBrethren1.java
@@ -61,7 +61,7 @@ public class Q10322_PayRespectToFallenBrethren1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10323_PayRespectToFallenBrethren2/Q10323_PayRespectToFallenBrethren2.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10323_PayRespectToFallenBrethren2/Q10323_PayRespectToFallenBrethren2.java
index 78bad85381..32b0b7332c 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10323_PayRespectToFallenBrethren2/Q10323_PayRespectToFallenBrethren2.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10323_PayRespectToFallenBrethren2/Q10323_PayRespectToFallenBrethren2.java
@@ -60,7 +60,7 @@ public class Q10323_PayRespectToFallenBrethren2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10324_PayRespectToFallenBrethren3/Q10324_PayRespectToFallenBrethren3.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10324_PayRespectToFallenBrethren3/Q10324_PayRespectToFallenBrethren3.java
index 978e0a844d..e89ae98420 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10324_PayRespectToFallenBrethren3/Q10324_PayRespectToFallenBrethren3.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10324_PayRespectToFallenBrethren3/Q10324_PayRespectToFallenBrethren3.java
@@ -60,7 +60,7 @@ public class Q10324_PayRespectToFallenBrethren3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10325_PayRespectToFallenBrethren4/Q10325_PayRespectToFallenBrethren4.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10325_PayRespectToFallenBrethren4/Q10325_PayRespectToFallenBrethren4.java
index 5ba6a8cf9f..2c94e9505a 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10325_PayRespectToFallenBrethren4/Q10325_PayRespectToFallenBrethren4.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10325_PayRespectToFallenBrethren4/Q10325_PayRespectToFallenBrethren4.java
@@ -60,7 +60,7 @@ public class Q10325_PayRespectToFallenBrethren4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10326_MemoryOfTheGloriousPast1/Q10326_MemoryOfTheGloriousPast1.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10326_MemoryOfTheGloriousPast1/Q10326_MemoryOfTheGloriousPast1.java
index 07498ec16c..08a827f7ae 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10326_MemoryOfTheGloriousPast1/Q10326_MemoryOfTheGloriousPast1.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10326_MemoryOfTheGloriousPast1/Q10326_MemoryOfTheGloriousPast1.java
@@ -54,7 +54,7 @@ public class Q10326_MemoryOfTheGloriousPast1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10327_MemoryOfTheGloriousPast2/Q10327_MemoryOfTheGloriousPast2.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10327_MemoryOfTheGloriousPast2/Q10327_MemoryOfTheGloriousPast2.java
index 1829b1c609..6339da8dbf 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10327_MemoryOfTheGloriousPast2/Q10327_MemoryOfTheGloriousPast2.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10327_MemoryOfTheGloriousPast2/Q10327_MemoryOfTheGloriousPast2.java
@@ -61,7 +61,7 @@ public class Q10327_MemoryOfTheGloriousPast2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10328_MemoryOfTheGloriousPast2/Q10328_MemoryOfTheGloriousPast2.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10328_MemoryOfTheGloriousPast2/Q10328_MemoryOfTheGloriousPast2.java
index a947485729..adae2cfa63 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10328_MemoryOfTheGloriousPast2/Q10328_MemoryOfTheGloriousPast2.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10328_MemoryOfTheGloriousPast2/Q10328_MemoryOfTheGloriousPast2.java
@@ -61,7 +61,7 @@ public class Q10328_MemoryOfTheGloriousPast2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10329_MemoryOfTheGloriousPast2/Q10329_MemoryOfTheGloriousPast2.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10329_MemoryOfTheGloriousPast2/Q10329_MemoryOfTheGloriousPast2.java
index 5979271469..ba32f7375e 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10329_MemoryOfTheGloriousPast2/Q10329_MemoryOfTheGloriousPast2.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10329_MemoryOfTheGloriousPast2/Q10329_MemoryOfTheGloriousPast2.java
@@ -61,7 +61,7 @@ public class Q10329_MemoryOfTheGloriousPast2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10330_MemoryOfTheGloriousPast2/Q10330_MemoryOfTheGloriousPast2.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10330_MemoryOfTheGloriousPast2/Q10330_MemoryOfTheGloriousPast2.java
index 32f2451b65..faaef11e61 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10330_MemoryOfTheGloriousPast2/Q10330_MemoryOfTheGloriousPast2.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10330_MemoryOfTheGloriousPast2/Q10330_MemoryOfTheGloriousPast2.java
@@ -61,7 +61,7 @@ public class Q10330_MemoryOfTheGloriousPast2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10331_MemoryOfTheGloriousPast2/Q10331_MemoryOfTheGloriousPast2.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10331_MemoryOfTheGloriousPast2/Q10331_MemoryOfTheGloriousPast2.java
index b954e64f8e..07222de460 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10331_MemoryOfTheGloriousPast2/Q10331_MemoryOfTheGloriousPast2.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10331_MemoryOfTheGloriousPast2/Q10331_MemoryOfTheGloriousPast2.java
@@ -61,7 +61,7 @@ public class Q10331_MemoryOfTheGloriousPast2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10332_MemoryOfTheGloriousPast2/Q10332_MemoryOfTheGloriousPast2.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10332_MemoryOfTheGloriousPast2/Q10332_MemoryOfTheGloriousPast2.java
index 1ca18a6e66..813a0cfc5d 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10332_MemoryOfTheGloriousPast2/Q10332_MemoryOfTheGloriousPast2.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10332_MemoryOfTheGloriousPast2/Q10332_MemoryOfTheGloriousPast2.java
@@ -61,7 +61,7 @@ public class Q10332_MemoryOfTheGloriousPast2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10333_MemoryOfTheGloriousPast2/Q10333_MemoryOfTheGloriousPast2.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10333_MemoryOfTheGloriousPast2/Q10333_MemoryOfTheGloriousPast2.java
index 8b32ba0eca..903f5131ef 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10333_MemoryOfTheGloriousPast2/Q10333_MemoryOfTheGloriousPast2.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10333_MemoryOfTheGloriousPast2/Q10333_MemoryOfTheGloriousPast2.java
@@ -61,7 +61,7 @@ public class Q10333_MemoryOfTheGloriousPast2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10334_MemoryOfTheGloriousPast2/Q10334_MemoryOfTheGloriousPast2.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10334_MemoryOfTheGloriousPast2/Q10334_MemoryOfTheGloriousPast2.java
index f4e668c185..b1c0cd890f 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10334_MemoryOfTheGloriousPast2/Q10334_MemoryOfTheGloriousPast2.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10334_MemoryOfTheGloriousPast2/Q10334_MemoryOfTheGloriousPast2.java
@@ -61,7 +61,7 @@ public class Q10334_MemoryOfTheGloriousPast2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10335_MemoryOfTheGloriousPast2/Q10335_MemoryOfTheGloriousPast2.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10335_MemoryOfTheGloriousPast2/Q10335_MemoryOfTheGloriousPast2.java
index 6e1b9931de..b7212b3359 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10335_MemoryOfTheGloriousPast2/Q10335_MemoryOfTheGloriousPast2.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10335_MemoryOfTheGloriousPast2/Q10335_MemoryOfTheGloriousPast2.java
@@ -61,7 +61,7 @@ public class Q10335_MemoryOfTheGloriousPast2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10336_MemoryOfTheGloriousPast2/Q10336_MemoryOfTheGloriousPast2.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10336_MemoryOfTheGloriousPast2/Q10336_MemoryOfTheGloriousPast2.java
index 99730cefac..0232ffea19 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10336_MemoryOfTheGloriousPast2/Q10336_MemoryOfTheGloriousPast2.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10336_MemoryOfTheGloriousPast2/Q10336_MemoryOfTheGloriousPast2.java
@@ -61,7 +61,7 @@ public class Q10336_MemoryOfTheGloriousPast2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10337_MemoryOfTheGloriousPast2/Q10337_MemoryOfTheGloriousPast2.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10337_MemoryOfTheGloriousPast2/Q10337_MemoryOfTheGloriousPast2.java
index b599ab6607..7dd0bafce7 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10337_MemoryOfTheGloriousPast2/Q10337_MemoryOfTheGloriousPast2.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10337_MemoryOfTheGloriousPast2/Q10337_MemoryOfTheGloriousPast2.java
@@ -61,7 +61,7 @@ public class Q10337_MemoryOfTheGloriousPast2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10338_MemoryOfTheGloriousPast2/Q10338_MemoryOfTheGloriousPast2.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10338_MemoryOfTheGloriousPast2/Q10338_MemoryOfTheGloriousPast2.java
index 02955f8617..487575363b 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10338_MemoryOfTheGloriousPast2/Q10338_MemoryOfTheGloriousPast2.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10338_MemoryOfTheGloriousPast2/Q10338_MemoryOfTheGloriousPast2.java
@@ -61,7 +61,7 @@ public class Q10338_MemoryOfTheGloriousPast2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10339_MemoryOfTheGloriousPast2/Q10339_MemoryOfTheGloriousPast2.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10339_MemoryOfTheGloriousPast2/Q10339_MemoryOfTheGloriousPast2.java
index aa28d9b257..8bca98eeac 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10339_MemoryOfTheGloriousPast2/Q10339_MemoryOfTheGloriousPast2.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10339_MemoryOfTheGloriousPast2/Q10339_MemoryOfTheGloriousPast2.java
@@ -61,7 +61,7 @@ public class Q10339_MemoryOfTheGloriousPast2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10340_MemoryOfTheGloriousPast3/Q10340_MemoryOfTheGloriousPast3.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10340_MemoryOfTheGloriousPast3/Q10340_MemoryOfTheGloriousPast3.java
index 4bb58b495a..8b2cd6c07f 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10340_MemoryOfTheGloriousPast3/Q10340_MemoryOfTheGloriousPast3.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10340_MemoryOfTheGloriousPast3/Q10340_MemoryOfTheGloriousPast3.java
@@ -61,7 +61,7 @@ public class Q10340_MemoryOfTheGloriousPast3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10341_MemoryOfTheGloriousPast4/Q10341_MemoryOfTheGloriousPast4.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10341_MemoryOfTheGloriousPast4/Q10341_MemoryOfTheGloriousPast4.java
index c6bda4b550..6c4503695b 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10341_MemoryOfTheGloriousPast4/Q10341_MemoryOfTheGloriousPast4.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10341_MemoryOfTheGloriousPast4/Q10341_MemoryOfTheGloriousPast4.java
@@ -61,7 +61,7 @@ public class Q10341_MemoryOfTheGloriousPast4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10342_TracesOfBattle1/Q10342_TracesOfBattle1.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10342_TracesOfBattle1/Q10342_TracesOfBattle1.java
index 032711d570..cfa2f78fb6 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10342_TracesOfBattle1/Q10342_TracesOfBattle1.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10342_TracesOfBattle1/Q10342_TracesOfBattle1.java
@@ -57,7 +57,7 @@ public class Q10342_TracesOfBattle1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10343_TracesOfBattle2/Q10343_TracesOfBattle2.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10343_TracesOfBattle2/Q10343_TracesOfBattle2.java
index 01e092f2ac..f47f4f89e5 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10343_TracesOfBattle2/Q10343_TracesOfBattle2.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10343_TracesOfBattle2/Q10343_TracesOfBattle2.java
@@ -57,7 +57,7 @@ public class Q10343_TracesOfBattle2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10344_TracesOfBattle3/Q10344_TracesOfBattle3.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10344_TracesOfBattle3/Q10344_TracesOfBattle3.java
index 6a75945317..afe88ab8e1 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10344_TracesOfBattle3/Q10344_TracesOfBattle3.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10344_TracesOfBattle3/Q10344_TracesOfBattle3.java
@@ -57,7 +57,7 @@ public class Q10344_TracesOfBattle3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10345_TracesOfBattle4/Q10345_TracesOfBattle4.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10345_TracesOfBattle4/Q10345_TracesOfBattle4.java
index 607fe7dfca..d0c2ffcdee 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10345_TracesOfBattle4/Q10345_TracesOfBattle4.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10345_TracesOfBattle4/Q10345_TracesOfBattle4.java
@@ -57,7 +57,7 @@ public class Q10345_TracesOfBattle4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10346_TracesOfBattle5/Q10346_TracesOfBattle5.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10346_TracesOfBattle5/Q10346_TracesOfBattle5.java
index fad7d5fff9..31cfc2aa51 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10346_TracesOfBattle5/Q10346_TracesOfBattle5.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10346_TracesOfBattle5/Q10346_TracesOfBattle5.java
@@ -57,7 +57,7 @@ public class Q10346_TracesOfBattle5 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10347_NotSoSilentValley1/Q10347_NotSoSilentValley1.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10347_NotSoSilentValley1/Q10347_NotSoSilentValley1.java
index 7b0bd5b82d..53259effe9 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10347_NotSoSilentValley1/Q10347_NotSoSilentValley1.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10347_NotSoSilentValley1/Q10347_NotSoSilentValley1.java
@@ -58,7 +58,7 @@ public class Q10347_NotSoSilentValley1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10348_NotSoSilentValley2/Q10348_NotSoSilentValley2.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10348_NotSoSilentValley2/Q10348_NotSoSilentValley2.java
index ad42624ac9..61d761fd6a 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10348_NotSoSilentValley2/Q10348_NotSoSilentValley2.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10348_NotSoSilentValley2/Q10348_NotSoSilentValley2.java
@@ -58,7 +58,7 @@ public class Q10348_NotSoSilentValley2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10349_NotSoSilentValley3/Q10349_NotSoSilentValley3.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10349_NotSoSilentValley3/Q10349_NotSoSilentValley3.java
index 5e7a06db04..6e762d9b6c 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10349_NotSoSilentValley3/Q10349_NotSoSilentValley3.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10349_NotSoSilentValley3/Q10349_NotSoSilentValley3.java
@@ -58,7 +58,7 @@ public class Q10349_NotSoSilentValley3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10350_NotSoSilentValley4/Q10350_NotSoSilentValley4.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10350_NotSoSilentValley4/Q10350_NotSoSilentValley4.java
index 0cbb412e31..7a168bee4a 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10350_NotSoSilentValley4/Q10350_NotSoSilentValley4.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10350_NotSoSilentValley4/Q10350_NotSoSilentValley4.java
@@ -58,7 +58,7 @@ public class Q10350_NotSoSilentValley4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10351_NotSoSilentValley5/Q10351_NotSoSilentValley5.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10351_NotSoSilentValley5/Q10351_NotSoSilentValley5.java
index 389799725b..9a7fd77dd8 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10351_NotSoSilentValley5/Q10351_NotSoSilentValley5.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10351_NotSoSilentValley5/Q10351_NotSoSilentValley5.java
@@ -58,7 +58,7 @@ public class Q10351_NotSoSilentValley5 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10352_StopTheLizardmen1/Q10352_StopTheLizardmen1.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10352_StopTheLizardmen1/Q10352_StopTheLizardmen1.java
index d591bead9d..2804acba8a 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10352_StopTheLizardmen1/Q10352_StopTheLizardmen1.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10352_StopTheLizardmen1/Q10352_StopTheLizardmen1.java
@@ -53,7 +53,7 @@ public class Q10352_StopTheLizardmen1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10353_StopTheLizardmen2/Q10353_StopTheLizardmen2.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10353_StopTheLizardmen2/Q10353_StopTheLizardmen2.java
index 0faf8bdf15..aaf365bfa8 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10353_StopTheLizardmen2/Q10353_StopTheLizardmen2.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10353_StopTheLizardmen2/Q10353_StopTheLizardmen2.java
@@ -53,7 +53,7 @@ public class Q10353_StopTheLizardmen2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10354_StopTheLizardmen3/Q10354_StopTheLizardmen3.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10354_StopTheLizardmen3/Q10354_StopTheLizardmen3.java
index 96eb45115d..abc7c1056c 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10354_StopTheLizardmen3/Q10354_StopTheLizardmen3.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10354_StopTheLizardmen3/Q10354_StopTheLizardmen3.java
@@ -53,7 +53,7 @@ public class Q10354_StopTheLizardmen3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10355_StopTheLizardmen4/Q10355_StopTheLizardmen4.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10355_StopTheLizardmen4/Q10355_StopTheLizardmen4.java
index c267a0ada1..55558583dc 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10355_StopTheLizardmen4/Q10355_StopTheLizardmen4.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10355_StopTheLizardmen4/Q10355_StopTheLizardmen4.java
@@ -53,7 +53,7 @@ public class Q10355_StopTheLizardmen4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10356_StopTheLizardmen5/Q10356_StopTheLizardmen5.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10356_StopTheLizardmen5/Q10356_StopTheLizardmen5.java
index 699f714a3e..93e2f05fd3 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10356_StopTheLizardmen5/Q10356_StopTheLizardmen5.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10356_StopTheLizardmen5/Q10356_StopTheLizardmen5.java
@@ -53,7 +53,7 @@ public class Q10356_StopTheLizardmen5 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10357_ReconnaissanceInTheWesternDragonValley1/Q10357_ReconnaissanceInTheWesternDragonValley1.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10357_ReconnaissanceInTheWesternDragonValley1/Q10357_ReconnaissanceInTheWesternDragonValley1.java
index beb3e81521..5acdc35cbd 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10357_ReconnaissanceInTheWesternDragonValley1/Q10357_ReconnaissanceInTheWesternDragonValley1.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10357_ReconnaissanceInTheWesternDragonValley1/Q10357_ReconnaissanceInTheWesternDragonValley1.java
@@ -67,7 +67,7 @@ public class Q10357_ReconnaissanceInTheWesternDragonValley1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10358_ReconnaissanceInTheWesternDragonValley2/Q10358_ReconnaissanceInTheWesternDragonValley2.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10358_ReconnaissanceInTheWesternDragonValley2/Q10358_ReconnaissanceInTheWesternDragonValley2.java
index a843f30d67..afdfe58453 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10358_ReconnaissanceInTheWesternDragonValley2/Q10358_ReconnaissanceInTheWesternDragonValley2.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10358_ReconnaissanceInTheWesternDragonValley2/Q10358_ReconnaissanceInTheWesternDragonValley2.java
@@ -67,7 +67,7 @@ public class Q10358_ReconnaissanceInTheWesternDragonValley2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10359_ReconnaissanceInTheWesternDragonValley3/Q10359_ReconnaissanceInTheWesternDragonValley3.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10359_ReconnaissanceInTheWesternDragonValley3/Q10359_ReconnaissanceInTheWesternDragonValley3.java
index 71dd15a33f..2e842576dd 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10359_ReconnaissanceInTheWesternDragonValley3/Q10359_ReconnaissanceInTheWesternDragonValley3.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10359_ReconnaissanceInTheWesternDragonValley3/Q10359_ReconnaissanceInTheWesternDragonValley3.java
@@ -67,7 +67,7 @@ public class Q10359_ReconnaissanceInTheWesternDragonValley3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10360_ReconnaissanceInTheWesternDragonValley4/Q10360_ReconnaissanceInTheWesternDragonValley4.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10360_ReconnaissanceInTheWesternDragonValley4/Q10360_ReconnaissanceInTheWesternDragonValley4.java
index d6e847a184..23d446636f 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10360_ReconnaissanceInTheWesternDragonValley4/Q10360_ReconnaissanceInTheWesternDragonValley4.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10360_ReconnaissanceInTheWesternDragonValley4/Q10360_ReconnaissanceInTheWesternDragonValley4.java
@@ -67,7 +67,7 @@ public class Q10360_ReconnaissanceInTheWesternDragonValley4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10361_ReconnaissanceInTheWesternDragonValley5/Q10361_ReconnaissanceInTheWesternDragonValley5.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10361_ReconnaissanceInTheWesternDragonValley5/Q10361_ReconnaissanceInTheWesternDragonValley5.java
index f69305ef47..3dadd56607 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10361_ReconnaissanceInTheWesternDragonValley5/Q10361_ReconnaissanceInTheWesternDragonValley5.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10361_ReconnaissanceInTheWesternDragonValley5/Q10361_ReconnaissanceInTheWesternDragonValley5.java
@@ -67,7 +67,7 @@ public class Q10361_ReconnaissanceInTheWesternDragonValley5 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10362_ExploringTheCrumaTowers3rdFloor1/Q10362_ExploringTheCrumaTowers3rdFloor1.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10362_ExploringTheCrumaTowers3rdFloor1/Q10362_ExploringTheCrumaTowers3rdFloor1.java
index 2add171ed5..b7acbd399c 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10362_ExploringTheCrumaTowers3rdFloor1/Q10362_ExploringTheCrumaTowers3rdFloor1.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10362_ExploringTheCrumaTowers3rdFloor1/Q10362_ExploringTheCrumaTowers3rdFloor1.java
@@ -53,7 +53,7 @@ public class Q10362_ExploringTheCrumaTowers3rdFloor1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10363_ExploringTheCrumaTowers3rdFloor2/Q10363_ExploringTheCrumaTowers3rdFloor2.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10363_ExploringTheCrumaTowers3rdFloor2/Q10363_ExploringTheCrumaTowers3rdFloor2.java
index 5447a145b8..57a1836081 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10363_ExploringTheCrumaTowers3rdFloor2/Q10363_ExploringTheCrumaTowers3rdFloor2.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10363_ExploringTheCrumaTowers3rdFloor2/Q10363_ExploringTheCrumaTowers3rdFloor2.java
@@ -53,7 +53,7 @@ public class Q10363_ExploringTheCrumaTowers3rdFloor2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10364_ExploringTheCrumaTowers3rdFloor3/Q10364_ExploringTheCrumaTowers3rdFloor3.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10364_ExploringTheCrumaTowers3rdFloor3/Q10364_ExploringTheCrumaTowers3rdFloor3.java
index 706aa09a7c..cba5e6ae43 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10364_ExploringTheCrumaTowers3rdFloor3/Q10364_ExploringTheCrumaTowers3rdFloor3.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10364_ExploringTheCrumaTowers3rdFloor3/Q10364_ExploringTheCrumaTowers3rdFloor3.java
@@ -53,7 +53,7 @@ public class Q10364_ExploringTheCrumaTowers3rdFloor3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10365_ExploringTheCrumaTowers3rdFloor4/Q10365_ExploringTheCrumaTowers3rdFloor4.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10365_ExploringTheCrumaTowers3rdFloor4/Q10365_ExploringTheCrumaTowers3rdFloor4.java
index 28191abca8..7981fec32f 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10365_ExploringTheCrumaTowers3rdFloor4/Q10365_ExploringTheCrumaTowers3rdFloor4.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10365_ExploringTheCrumaTowers3rdFloor4/Q10365_ExploringTheCrumaTowers3rdFloor4.java
@@ -53,7 +53,7 @@ public class Q10365_ExploringTheCrumaTowers3rdFloor4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10366_ExploringTheCrumaTowers3rdFloor5/Q10366_ExploringTheCrumaTowers3rdFloor5.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10366_ExploringTheCrumaTowers3rdFloor5/Q10366_ExploringTheCrumaTowers3rdFloor5.java
index 3c1f1e86e0..f8747102ad 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10366_ExploringTheCrumaTowers3rdFloor5/Q10366_ExploringTheCrumaTowers3rdFloor5.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10366_ExploringTheCrumaTowers3rdFloor5/Q10366_ExploringTheCrumaTowers3rdFloor5.java
@@ -53,7 +53,7 @@ public class Q10366_ExploringTheCrumaTowers3rdFloor5 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10367_ThwartingDragonsPlans1/Q10367_ThwartingDragonsPlans1.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10367_ThwartingDragonsPlans1/Q10367_ThwartingDragonsPlans1.java
index 92be16e98a..e6db5f2cdc 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10367_ThwartingDragonsPlans1/Q10367_ThwartingDragonsPlans1.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10367_ThwartingDragonsPlans1/Q10367_ThwartingDragonsPlans1.java
@@ -50,7 +50,7 @@ public class Q10367_ThwartingDragonsPlans1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10368_ThwartingDragonsPlans2/Q10368_ThwartingDragonsPlans2.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10368_ThwartingDragonsPlans2/Q10368_ThwartingDragonsPlans2.java
index 9a52f5318f..3411ee46c7 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10368_ThwartingDragonsPlans2/Q10368_ThwartingDragonsPlans2.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10368_ThwartingDragonsPlans2/Q10368_ThwartingDragonsPlans2.java
@@ -50,7 +50,7 @@ public class Q10368_ThwartingDragonsPlans2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10369_ThwartingDragonsPlans3/Q10369_ThwartingDragonsPlans3.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10369_ThwartingDragonsPlans3/Q10369_ThwartingDragonsPlans3.java
index 0801713186..76f76fcc36 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10369_ThwartingDragonsPlans3/Q10369_ThwartingDragonsPlans3.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10369_ThwartingDragonsPlans3/Q10369_ThwartingDragonsPlans3.java
@@ -50,7 +50,7 @@ public class Q10369_ThwartingDragonsPlans3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10370_ThwartingDragonsPlans4/Q10370_ThwartingDragonsPlans4.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10370_ThwartingDragonsPlans4/Q10370_ThwartingDragonsPlans4.java
index 9571b62b48..ee8cec62c2 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10370_ThwartingDragonsPlans4/Q10370_ThwartingDragonsPlans4.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10370_ThwartingDragonsPlans4/Q10370_ThwartingDragonsPlans4.java
@@ -50,7 +50,7 @@ public class Q10370_ThwartingDragonsPlans4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10371_ThwartingDragonsPlans5/Q10371_ThwartingDragonsPlans5.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10371_ThwartingDragonsPlans5/Q10371_ThwartingDragonsPlans5.java
index 184cad5daa..84ff438aaa 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10371_ThwartingDragonsPlans5/Q10371_ThwartingDragonsPlans5.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10371_ThwartingDragonsPlans5/Q10371_ThwartingDragonsPlans5.java
@@ -56,7 +56,7 @@ public class Q10371_ThwartingDragonsPlans5 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10372_ExploringTheCrumaTowers2ndFloor1/Q10372_ExploringTheCrumaTowers2ndFloor1.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10372_ExploringTheCrumaTowers2ndFloor1/Q10372_ExploringTheCrumaTowers2ndFloor1.java
index b594b17563..470289c127 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10372_ExploringTheCrumaTowers2ndFloor1/Q10372_ExploringTheCrumaTowers2ndFloor1.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10372_ExploringTheCrumaTowers2ndFloor1/Q10372_ExploringTheCrumaTowers2ndFloor1.java
@@ -54,7 +54,7 @@ public class Q10372_ExploringTheCrumaTowers2ndFloor1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10373_ExploringTheCrumaTowers2ndFloor2/Q10373_ExploringTheCrumaTowers2ndFloor2.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10373_ExploringTheCrumaTowers2ndFloor2/Q10373_ExploringTheCrumaTowers2ndFloor2.java
index f5deb5022a..33c361532d 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10373_ExploringTheCrumaTowers2ndFloor2/Q10373_ExploringTheCrumaTowers2ndFloor2.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10373_ExploringTheCrumaTowers2ndFloor2/Q10373_ExploringTheCrumaTowers2ndFloor2.java
@@ -54,7 +54,7 @@ public class Q10373_ExploringTheCrumaTowers2ndFloor2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10374_ExploringTheCrumaTowers2ndFloor3/Q10374_ExploringTheCrumaTowers2ndFloor3.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10374_ExploringTheCrumaTowers2ndFloor3/Q10374_ExploringTheCrumaTowers2ndFloor3.java
index 27954770fb..c33a56cb22 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10374_ExploringTheCrumaTowers2ndFloor3/Q10374_ExploringTheCrumaTowers2ndFloor3.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10374_ExploringTheCrumaTowers2ndFloor3/Q10374_ExploringTheCrumaTowers2ndFloor3.java
@@ -54,7 +54,7 @@ public class Q10374_ExploringTheCrumaTowers2ndFloor3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10375_ExploringTheCrumaTowers2ndFloor4/Q10375_ExploringTheCrumaTowers2ndFloor4.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10375_ExploringTheCrumaTowers2ndFloor4/Q10375_ExploringTheCrumaTowers2ndFloor4.java
index e41fb05787..914623b209 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10375_ExploringTheCrumaTowers2ndFloor4/Q10375_ExploringTheCrumaTowers2ndFloor4.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10375_ExploringTheCrumaTowers2ndFloor4/Q10375_ExploringTheCrumaTowers2ndFloor4.java
@@ -54,7 +54,7 @@ public class Q10375_ExploringTheCrumaTowers2ndFloor4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10376_ExploringTheCrumaTowers2ndFloor5/Q10376_ExploringTheCrumaTowers2ndFloor5.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10376_ExploringTheCrumaTowers2ndFloor5/Q10376_ExploringTheCrumaTowers2ndFloor5.java
index 8339aa0606..adc215db27 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10376_ExploringTheCrumaTowers2ndFloor5/Q10376_ExploringTheCrumaTowers2ndFloor5.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10376_ExploringTheCrumaTowers2ndFloor5/Q10376_ExploringTheCrumaTowers2ndFloor5.java
@@ -54,7 +54,7 @@ public class Q10376_ExploringTheCrumaTowers2ndFloor5 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10377_StopSelMahumTroops1/Q10377_StopSelMahumTroops1.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10377_StopSelMahumTroops1/Q10377_StopSelMahumTroops1.java
index fb207b4604..1aa1893f2d 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10377_StopSelMahumTroops1/Q10377_StopSelMahumTroops1.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10377_StopSelMahumTroops1/Q10377_StopSelMahumTroops1.java
@@ -49,7 +49,7 @@ public class Q10377_StopSelMahumTroops1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10378_StopSelMahumTroops2/Q10378_StopSelMahumTroops2.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10378_StopSelMahumTroops2/Q10378_StopSelMahumTroops2.java
index 3bd20ac5fb..452fbbbb91 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10378_StopSelMahumTroops2/Q10378_StopSelMahumTroops2.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10378_StopSelMahumTroops2/Q10378_StopSelMahumTroops2.java
@@ -49,7 +49,7 @@ public class Q10378_StopSelMahumTroops2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10379_StopSelMahumTroops3/Q10379_StopSelMahumTroops3.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10379_StopSelMahumTroops3/Q10379_StopSelMahumTroops3.java
index bd27d52336..131277a236 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10379_StopSelMahumTroops3/Q10379_StopSelMahumTroops3.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10379_StopSelMahumTroops3/Q10379_StopSelMahumTroops3.java
@@ -49,7 +49,7 @@ public class Q10379_StopSelMahumTroops3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10380_StopSelMahumTroops4/Q10380_StopSelMahumTroops4.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10380_StopSelMahumTroops4/Q10380_StopSelMahumTroops4.java
index e0f8699c24..81583d7945 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10380_StopSelMahumTroops4/Q10380_StopSelMahumTroops4.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10380_StopSelMahumTroops4/Q10380_StopSelMahumTroops4.java
@@ -49,7 +49,7 @@ public class Q10380_StopSelMahumTroops4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10381_StopSelMahumTroops5/Q10381_StopSelMahumTroops5.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10381_StopSelMahumTroops5/Q10381_StopSelMahumTroops5.java
index 4867ba6084..e8096888af 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10381_StopSelMahumTroops5/Q10381_StopSelMahumTroops5.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10381_StopSelMahumTroops5/Q10381_StopSelMahumTroops5.java
@@ -47,7 +47,7 @@ public class Q10381_StopSelMahumTroops5 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q19900_SagaOfLegend/Q19900_SagaOfLegend.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q19900_SagaOfLegend/Q19900_SagaOfLegend.java
index 7a2eecf7f1..d0142e3f89 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q19900_SagaOfLegend/Q19900_SagaOfLegend.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q19900_SagaOfLegend/Q19900_SagaOfLegend.java
@@ -61,7 +61,7 @@ public class Q19900_SagaOfLegend extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q19901_AlmostALegend/Q19901_AlmostALegend.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q19901_AlmostALegend/Q19901_AlmostALegend.java
index a3d2f9acb5..5df8b85b18 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q19901_AlmostALegend/Q19901_AlmostALegend.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q19901_AlmostALegend/Q19901_AlmostALegend.java
@@ -52,7 +52,7 @@ public class Q19901_AlmostALegend extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q19902_LevelUpTo64/Q19902_LevelUpTo64.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q19902_LevelUpTo64/Q19902_LevelUpTo64.java
index 7889b3bbfe..875496da2e 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q19902_LevelUpTo64/Q19902_LevelUpTo64.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q19902_LevelUpTo64/Q19902_LevelUpTo64.java
@@ -48,7 +48,7 @@ public class Q19902_LevelUpTo64 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q19903_LevelUpTo70/Q19903_LevelUpTo70.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q19903_LevelUpTo70/Q19903_LevelUpTo70.java
index 3d5f73d717..74b3721759 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q19903_LevelUpTo70/Q19903_LevelUpTo70.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q19903_LevelUpTo70/Q19903_LevelUpTo70.java
@@ -48,7 +48,7 @@ public class Q19903_LevelUpTo70 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q19904_LevelUpTo76/Q19904_LevelUpTo76.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q19904_LevelUpTo76/Q19904_LevelUpTo76.java
index f35da3567d..80807c0748 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q19904_LevelUpTo76/Q19904_LevelUpTo76.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q19904_LevelUpTo76/Q19904_LevelUpTo76.java
@@ -48,7 +48,7 @@ public class Q19904_LevelUpTo76 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q19905_LevelUpTo78/Q19905_LevelUpTo78.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q19905_LevelUpTo78/Q19905_LevelUpTo78.java
index 63ba2eeb66..6d401ea3f0 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q19905_LevelUpTo78/Q19905_LevelUpTo78.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q19905_LevelUpTo78/Q19905_LevelUpTo78.java
@@ -48,7 +48,7 @@ public class Q19905_LevelUpTo78 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q19906_LevelUpTo81/Q19906_LevelUpTo81.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q19906_LevelUpTo81/Q19906_LevelUpTo81.java
index 7364af2578..6758380368 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q19906_LevelUpTo81/Q19906_LevelUpTo81.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q19906_LevelUpTo81/Q19906_LevelUpTo81.java
@@ -48,7 +48,7 @@ public class Q19906_LevelUpTo81 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q19907_LevelUpTo84/Q19907_LevelUpTo84.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q19907_LevelUpTo84/Q19907_LevelUpTo84.java
index 59361a0e16..1b7f33413f 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q19907_LevelUpTo84/Q19907_LevelUpTo84.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q19907_LevelUpTo84/Q19907_LevelUpTo84.java
@@ -48,7 +48,7 @@ public class Q19907_LevelUpTo84 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
index 38c49ddf8b..607ce477ef 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
@@ -45,7 +45,7 @@ public class AllianceMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!"9001-01.htm".equals(event) && (player.getClan() == null))
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
index a89a33d4e4..d98ef461b3 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
@@ -96,7 +96,7 @@ public class ClanMaster extends AbstractNpcAI
 	};
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LEADER_REQUIRED.containsKey(event) && !player.isClanLeader())
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
index 4c12269fb4..78f4e3e4b7 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
@@ -61,7 +61,7 @@ public class DarkElfChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
index 4fb6a99ede..ab400dcd92 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
@@ -74,7 +74,7 @@ public class DarkElfChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
index 14c50c18e9..5a82d9e105 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
@@ -50,7 +50,7 @@ public class DwarfBlacksmithChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
index 40856fea77..ba870a2724 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
@@ -55,7 +55,7 @@ public class DwarfBlacksmithChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
index 01a090d00b..1ee99c0e75 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
@@ -50,7 +50,7 @@ public class DwarfWarehouseChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
index 8bb5735cf5..e3516c35cc 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
@@ -54,7 +54,7 @@ public class DwarfWarehouseChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
index d712c98ecf..434816b9dc 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
@@ -58,7 +58,7 @@ public class ElfHumanClericChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
index 6e5d027657..9967866771 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
@@ -59,7 +59,7 @@ public class ElfHumanFighterChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
index 03ced52e5c..64af4a73e9 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
@@ -73,7 +73,7 @@ public class ElfHumanFighterChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
index e23072fa06..986d21a052 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
@@ -57,7 +57,7 @@ public class ElfHumanWizardChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
index 8bad66889a..6cd5c267ae 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
@@ -62,7 +62,7 @@ public class ElfHumanWizardChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
index 5e6d07e351..a3611b757a 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
@@ -53,7 +53,7 @@ public class FirstClassTransferTalk extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return event;
 	}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
index 70aa35acda..6dcc56a210 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
@@ -51,7 +51,7 @@ public class OrcChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
index ad5186bd01..639201b9dd 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
@@ -62,7 +62,7 @@ public class OrcChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/quest/Quest.java
index 5d1735eb9e..95991c9f96 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/quest/Quest.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/quest/Quest.java
@@ -297,7 +297,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -319,7 +319,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -610,7 +610,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 			{
 				player.setSimulatedTalking(false);
 			}
-			res = onAdvEvent(event, npc, player);
+			res = onEvent(event, npc, player);
 		}
 		catch (Exception e)
 		{
@@ -1072,12 +1072,11 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 */
 	public String onDeath(Creature killer, Creature victim, QuestState qs)
 	{
-		return onAdvEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
+		return onEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
 	}
 	
 	/**
 	 * This function is called whenever a player clicks on a link in a quest dialog and whenever a timer fires.<br>
-	 * If is not overridden by a subclass, then default to the returned value of the simpler (and older) {@link #onEvent(String, QuestState)} override.<br>
 	 * If the player has a quest state, use it as parameter in the next call, otherwise return null.
 	 * @param event this parameter contains a string identifier for the event.<br>
 	 *            Generally, this string is passed directly via the link.<br>
@@ -1096,35 +1095,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 *            This parameter may be {@code null} in certain circumstances.
 	 * @return the text returned by the event (may be {@code null}, a filename or just text)
 	 */
-	public String onAdvEvent(String event, Npc npc, Player player)
-	{
-		if (player != null)
-		{
-			final QuestState qs = player.getQuestState(getName());
-			if (qs != null)
-			{
-				return onEvent(event, qs);
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * This function is called in place of {@link #onAdvEvent(String, Npc, Player)} if the former is not implemented.<br>
-	 * If a script contains both {@link #onAdvEvent(String, Npc, Player)} and this implementation, then this method will never be called unless the script's {@link #onAdvEvent(String, Npc, Player)} explicitly calls this method.
-	 * @param event this parameter contains a string identifier for the event.<br>
-	 *            Generally, this string is passed directly via the link.<br>
-	 *            For example:<br>
-	 *            <code>
-	 *            &lt;a action="bypass -h Quest 626_ADarkTwilight 31517-01.htm"&gt;hello&lt;/a&gt;
-	 *            </code><br>
-	 *            The above link sets the event variable to "31517-01.htm" for the quest 626_ADarkTwilight.<br>
-	 *            In the case of timers, this will be the name of the timer.<br>
-	 *            This parameter serves as a sort of identifier.
-	 * @param qs this parameter contains a reference to the quest state of the player who used the link or started the timer.
-	 * @return the text returned by the event (may be {@code null}, a filename or just text)
-	 */
-	public String onEvent(String event, QuestState qs)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return null;
 	}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/AztacanTemple/AztacanArea.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/AztacanTemple/AztacanArea.java
index 790e9f02b3..90ae4775ae 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/AztacanTemple/AztacanArea.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/AztacanTemple/AztacanArea.java
@@ -109,7 +109,7 @@ public class AztacanArea extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -134,7 +134,7 @@ public class AztacanArea extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private void spawnMonsters()
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java
index 74cc5d850c..63fe710e66 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java
@@ -49,7 +49,7 @@ public class Fellow extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
index 4eb2c2422a..e4d1769de9 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/DwarvenVillage/Toma/Toma.java
@@ -43,12 +43,12 @@ public class Toma extends AbstractNpcAI
 	private Toma()
 	{
 		addFirstTalkId(TOMA);
-		onAdvEvent("RESPAWN_TOMA", null, null);
+		onEvent("RESPAWN_TOMA", null, null);
 		startQuestTimer("RESPAWN_TOMA", TELEPORT_DELAY, null, null, true);
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("RESPAWN_TOMA"))
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingIgnis.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingIgnis.java
index 6606e36f7e..a2ad870093 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingIgnis.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingIgnis.java
@@ -49,7 +49,7 @@ public class ResidenceOfKingIgnis extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingPetram.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingPetram.java
index 0bb5893075..e041afe21d 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingPetram.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingPetram.java
@@ -48,7 +48,7 @@ public class ResidenceOfKingPetram extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingProcella.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingProcella.java
index 9837e1fed4..590574d2ae 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingProcella.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingProcella.java
@@ -62,7 +62,7 @@ public class ResidenceOfKingProcella extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfQueenNebula.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfQueenNebula.java
index 9c3c7ea37b..c897a5d1b1 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfQueenNebula.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfQueenNebula.java
@@ -53,7 +53,7 @@ public class ResidenceOfQueenNebula extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
index 6f8858a2a4..dd735beeaa 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/ForestOfTheDead/EilhalderVonHellmann.java
@@ -41,7 +41,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -54,7 +54,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
 				npc.deleteMe();
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_DAY_NIGHT_CHANGE)
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/FrostCastleZone/FrostLordCastleZone.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/FrostCastleZone/FrostLordCastleZone.java
index b025542e79..ec658a5509 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/FrostCastleZone/FrostLordCastleZone.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/FrostCastleZone/FrostLordCastleZone.java
@@ -130,7 +130,7 @@ public class FrostLordCastleZone extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -181,7 +181,7 @@ public class FrostLordCastleZone extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/Hellbound/CitadelTeleport/CitadelTeleport.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/Hellbound/CitadelTeleport/CitadelTeleport.java
index c375ec82df..14169d5119 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/Hellbound/CitadelTeleport/CitadelTeleport.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/Hellbound/CitadelTeleport/CitadelTeleport.java
@@ -54,7 +54,7 @@ public class CitadelTeleport extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
@@ -62,7 +62,7 @@ public class CitadelTeleport extends AbstractNpcAI
 			return null;
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/Hellbound/HellboundMessenger/HellboundMessenger.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/Hellbound/HellboundMessenger/HellboundMessenger.java
index efe61be897..e419ffb16c 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/Hellbound/HellboundMessenger/HellboundMessenger.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/Hellbound/HellboundMessenger/HellboundMessenger.java
@@ -42,7 +42,7 @@ public class HellboundMessenger extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getId() == MESSENGER) && event.equals("teleport"))
 		{
@@ -55,7 +55,7 @@ public class HellboundMessenger extends AbstractNpcAI
 			return null;
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/KelbimFortress/KelbimRaid.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/KelbimFortress/KelbimRaid.java
index b0e1803dae..6ae2361d97 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/KelbimFortress/KelbimRaid.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/KelbimFortress/KelbimRaid.java
@@ -84,7 +84,7 @@ public class KelbimRaid extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("start_stage_2"))
 		{
@@ -138,7 +138,7 @@ public class KelbimRaid extends Event
 				npc.doCast(skill);
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java
index bbd8a3f9d6..645d9b3399 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java
@@ -42,7 +42,7 @@ public class Tarba extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("teleport"))
 		{
@@ -55,7 +55,7 @@ public class Tarba extends AbstractNpcAI
 			}
 			return "34134-02.htm";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/PaganTemple/PrimeTimePaganTemple.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/PaganTemple/PrimeTimePaganTemple.java
index 664dd7f853..ff2832a5a7 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/PaganTemple/PrimeTimePaganTemple.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/PaganTemple/PrimeTimePaganTemple.java
@@ -93,7 +93,7 @@ public class PrimeTimePaganTemple extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int id = Integer.parseInt(event);
 		switch (id)
@@ -119,7 +119,7 @@ public class PrimeTimePaganTemple extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private void spawnOrStartScheduler()
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
index 9a85a7827a..ed27623d4a 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/TalkingIsland/Roxxy.java
@@ -38,14 +38,14 @@ public class Roxxy extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TEXT_SPAM") && (npc != null))
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SPEAK_WITH_ME_ABOUT_TRAVELING_AROUND_ADEN, 1000);
 			startQuestTimer("TEXT_SPAM", getRandom(10000, 30000), npc, null, false);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
index e785a520ff..66ad6e761f 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java
@@ -49,7 +49,7 @@ public class Arushinai extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("30401-1.htm") || event.equals("30401-2.htm"))
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java
index 572da5409a..6a609a6b22 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java
@@ -49,7 +49,7 @@ public class Ateld extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
index 25080082a2..5b97aa0b04 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/areas/TowerOfInsolence/DimensionalVortex/DimensionalVortex.java
@@ -47,7 +47,7 @@ public class DimensionalVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("30952-1.htm") || event.equals("30952-2.htm") || event.equals("30952-3.htm"))
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index 847bef79c8..ce76adc2d7 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -193,7 +193,7 @@ public class Antharas extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -605,7 +605,7 @@ public class Antharas extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 039083799f..38d1157f3a 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -164,7 +164,7 @@ public class Baium extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -478,7 +478,7 @@ public class Baium extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/bosses/Core/Core.java
index eebed031de..52ed224e2d 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -142,7 +142,7 @@ public class Core extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
@@ -161,7 +161,7 @@ public class Core extends AbstractNpcAI
 			_minions.forEach(Attackable::decayMe);
 			_minions.clear();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/bosses/LimitBarrier.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/bosses/LimitBarrier.java
index ff80482dd3..14bbff3867 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/bosses/LimitBarrier.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/bosses/LimitBarrier.java
@@ -150,7 +150,7 @@ public class LimitBarrier extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -179,7 +179,7 @@ public class LimitBarrier extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index a1c5930623..df3c3d3e66 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -106,7 +106,7 @@ public class Orfen extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -133,7 +133,7 @@ public class Orfen extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index cb28500275..a7aef4abca 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -155,7 +155,7 @@ public class QueenAnt extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -239,7 +239,7 @@ public class QueenAnt extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java
index 9f78ef7c7e..51a25b0325 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/bosses/SevenSignsRBs/SevenSignsRBs.java
@@ -76,7 +76,7 @@ public class SevenSignsRBs extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
index ebe4f47e31..3adeca0bd9 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
@@ -71,13 +71,13 @@ public class Zaken extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("zaken_unlock"))
 		{
 			spawnBoss();
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private void spawnBoss()
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/AdditionalServicesAdvisor/AdditionalServicesAdvisor.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/AdditionalServicesAdvisor/AdditionalServicesAdvisor.java
index 026324a5c9..5fb2670856 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/AdditionalServicesAdvisor/AdditionalServicesAdvisor.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/AdditionalServicesAdvisor/AdditionalServicesAdvisor.java
@@ -64,7 +64,7 @@ public class AdditionalServicesAdvisor extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String html = null;
 		switch (npc.getId())
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index 650556fbeb..36460411d1 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
@@ -59,7 +59,7 @@ public class ArenaManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -124,7 +124,7 @@ public class ArenaManager extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java
index 9d242d40d3..73f2f322bd 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/AttributeMaster/AttributeMaster.java
@@ -45,7 +45,7 @@ public class AttributeMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ("learn".equalsIgnoreCase(event))
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
index 21fcb4813a..7bbc678cca 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
@@ -57,7 +57,7 @@ public class CastleBlacksmith extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return (event.equalsIgnoreCase(npc.getId() + "-02.html") && hasRights(player, npc)) ? event : null;
 	}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
index d3f1094ed9..860bd6ab7a 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
@@ -393,7 +393,7 @@ public class CastleChamberlain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Castle castle = npc.getCastle();
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
index 2c9a8fcf2c..ee1d670f29 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java
@@ -72,7 +72,7 @@ public class CastleDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
index a1466e4501..7f24c7c794 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
@@ -56,7 +56,7 @@ public class CastleMercenaryManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		final StringTokenizer st = new StringTokenizer(event, " ");
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index bf50eeff19..76a7b9ef5e 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -78,7 +78,7 @@ public class CastleTeleporter extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
@@ -168,7 +168,7 @@ public class CastleTeleporter extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
index 2fd32d136c..d222e07095 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
@@ -52,7 +52,7 @@ public class CastleWarehouse extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		final boolean isMyLord = player.isClanLeader() && (player.getClan().getCastleId() == (npc.getCastle() != null ? npc.getCastle().getResidenceId() : -1));
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
index ee6afc0b08..c472475cd6 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java
@@ -64,7 +64,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
index ca52883f2e..0a16c57b0f 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java
@@ -57,7 +57,7 @@ public class ClanHallDoorManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 2da92875fb..573959ae52 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -98,7 +98,7 @@ public class ClanHallManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final StringTokenizer st = new StringTokenizer(event, " ");
 		final String action = st.nextToken();
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/ClanStrongholdDevice/ClanStrongholdDevice.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/ClanStrongholdDevice/ClanStrongholdDevice.java
index 7bab63f06c..2f32bc9fac 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/ClanStrongholdDevice/ClanStrongholdDevice.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/ClanStrongholdDevice/ClanStrongholdDevice.java
@@ -75,18 +75,18 @@ public class ClanStrongholdDevice extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((npc.getTemplate().getId() != CLAN_STRONGHOLD_DEVICE) || (player == null) || (event == null))
 		{
-			return super.onAdvEvent(event, npc, player);
+			return super.onEvent(event, npc, player);
 		}
 		
 		if (event.equals("capture"))
 		{
 			if (npc.isAlikeDead())
 			{
-				return super.onAdvEvent(event, npc, player);
+				return super.onEvent(event, npc, player);
 			}
 			
 			if (CURRENT_CLAN_ID.containsKey(npc.getScriptValue()))
@@ -112,13 +112,13 @@ public class ClanStrongholdDevice extends AbstractNpcAI
 		{
 			if (npc.isAlikeDead())
 			{
-				return super.onAdvEvent(event, npc, player);
+				return super.onEvent(event, npc, player);
 			}
 			
 			return npc.getId() + (CURRENT_CLAN_ID.containsKey(npc.getScriptValue()) ? "-02" : "") + ".htm";
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 47e78fa4e1..60e570354f 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -232,7 +232,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String eventValue, Npc npc, Player player)
+	public String onEvent(String eventValue, Npc npc, Player player)
 	{
 		if (!_isEnabled)
 		{
@@ -893,7 +893,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	{
 		if (event.getCommand().startsWith("Quest ClassMaster "))
 		{
-			final String html = onAdvEvent(event.getCommand().substring(18), null, event.getPlayer());
+			final String html = onEvent(event.getCommand().substring(18), null, event.getPlayer());
 			event.getPlayer().sendPacket(TutorialCloseHtml.STATIC_PACKET);
 			showResult(event.getPlayer(), html);
 		}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/DivineBeast.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/DivineBeast.java
index 7ba428a4ac..ace7bc05e4 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/DivineBeast.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/DivineBeast.java
@@ -44,7 +44,7 @@ public class DivineBeast extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if ((player == null) || !player.hasServitors())
 		{
@@ -55,7 +55,7 @@ public class DivineBeast extends AbstractNpcAI
 			cancelQuestTimer(event, npc, player);
 			player.getServitors().values().forEach(summon -> summon.unSummon(player));
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
index 26ec27e04f..b1e9d2a705 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
@@ -102,7 +102,7 @@ public class GameAssistant extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
index d132cf4f91..d3f710927f 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
@@ -68,7 +68,7 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
index 535b2c335a..08a3e2b614 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java
@@ -57,7 +57,7 @@ public class NewbieGuide extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("0"))
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
index 93667d6407..a43a29e243 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java
@@ -69,7 +69,7 @@ public class OlyBuffer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.startsWith("giveBuff;") && (npc.getScriptValue() < 5))
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index 65022d59a0..a9697475f1 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -70,7 +70,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
index 2de491b72f..b69386a3bc 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/Proclaimer/Proclaimer.java
@@ -84,7 +84,7 @@ public class Proclaimer extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("giveBuff"))
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
index 0fadf01daa..b7c2e6356c 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java
@@ -79,7 +79,7 @@ public class ProvisionalHalls extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		if (event.equals("33359-01.html") || event.equals("33359-02.html") || event.equals("33359-03.html"))
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/RandomWalkingGuards.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
index 7435d3c1c8..f6a48a136c 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/RandomWalkingGuards.java
@@ -48,7 +48,7 @@ public class RandomWalkingGuards extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("RANDOM_WALK") && (npc != null))
 		{
@@ -59,7 +59,7 @@ public class RandomWalkingGuards extends AbstractNpcAI
 			}
 			startQuestTimer("RANDOM_WALK", getRandom(MIN_WALK_DELAY, MAX_WALK_DELAY), npc, null);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/Servitors/SinEater.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/Servitors/SinEater.java
index f3eef350a6..58c1e1b5fc 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/Servitors/SinEater.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/Servitors/SinEater.java
@@ -48,7 +48,7 @@ public class SinEater extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.equals("TALK") && (player != null) && (player.getPet() != null))
 		{
@@ -79,7 +79,7 @@ public class SinEater extends AbstractNpcAI
 			}
 			startQuestTimer("TALK", 60000, null, player);
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@RegisterEvent(EventType.ON_CREATURE_DEATH)
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/Subjugation/Yand/Yand.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/Subjugation/Yand/Yand.java
index 97c38c56f0..73cb4fe936 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/Subjugation/Yand/Yand.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/Subjugation/Yand/Yand.java
@@ -43,7 +43,7 @@ public class Yand extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
index f9bc93295b..9288b09e5c 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
@@ -51,7 +51,7 @@ public class SymbolMaker extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
index 3336ce6241..0c4046b7c8 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/ToIVortex/ToIVortex.java
@@ -86,7 +86,7 @@ public class ToIVortex extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final int npcId = npc.getId();
 		
@@ -132,7 +132,7 @@ public class ToIVortex extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index b2ca852869..14652b53dc 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -188,7 +188,7 @@ public class WyvernManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
index b27ac2f278..fb877bb630 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/DelevelManager/DelevelManager.java
@@ -36,7 +36,7 @@ public class DelevelManager extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.DELEVEL_MANAGER_ENABLED)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
index d1007383de..5c0cf799dc 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java
@@ -54,7 +54,7 @@ public class FactionSystem extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -121,7 +121,7 @@ public class FactionSystem extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
index 8a1940f5b4..32a1337dc4 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
@@ -34,7 +34,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc == null)
 		{
@@ -77,7 +77,7 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
 				npc.broadcastInfo(); // update flag status
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
index 8a64487b10..7637738ff0 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/NoblessMaster/NoblessMaster.java
@@ -39,7 +39,7 @@ public class NoblessMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!Config.NOBLESS_MASTER_ENABLED)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
index 46205143a3..4f04086e9c 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
@@ -215,7 +215,7 @@ public class NpcLocationInfo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = event;
 		if (Util.isDigit(event))
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
index 8e1f84c102..3a9b5b4bdc 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/events/Deathmatch/Deathmatch.java
@@ -169,7 +169,7 @@ public class Deathmatch extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
index d65c2ef5a8..2541fd449f 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
@@ -213,7 +213,7 @@ public class Rabbits extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/events/Race/Race.java
index bbf9371324..5bd0aadf97 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/events/Race/Race.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/events/Race/Race.java
@@ -320,7 +320,7 @@ public class Race extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final String htmltext = event;
 		final QuestState qs = getQuestState(player, false);
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index bfd55c93b2..50feb8de89 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -186,7 +186,7 @@ public class TvT extends Event
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!EVENT_ACTIVE)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/BattleWithKeber/BattleWithKeber.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/BattleWithKeber/BattleWithKeber.java
index a75f8108c1..0e36233e22 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/BattleWithKeber/BattleWithKeber.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/BattleWithKeber/BattleWithKeber.java
@@ -205,7 +205,7 @@ public class BattleWithKeber extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java
index 682799797c..a8166ecc91 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java
@@ -41,7 +41,7 @@ public class BlossomFestival extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/DefeatTheQueen/DefeatTheQueen.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/DefeatTheQueen/DefeatTheQueen.java
index 050828b3e1..51313fa86e 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/DefeatTheQueen/DefeatTheQueen.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/DefeatTheQueen/DefeatTheQueen.java
@@ -46,7 +46,7 @@ public class DefeatTheQueen extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!isEventPeriod())
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index c6783d3622..4509e73cea 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -44,7 +44,7 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/HappyHours/HappyHours.java
index d59f9ddf1b..8946458dda 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/HappyHours/HappyHours.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/HappyHours/HappyHours.java
@@ -49,7 +49,7 @@ public class HappyHours extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/HolidayOutOfSchedule/HolidayOutOfSchedule.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/HolidayOutOfSchedule/HolidayOutOfSchedule.java
index 261871eb03..a012e15347 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/HolidayOutOfSchedule/HolidayOutOfSchedule.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/HolidayOutOfSchedule/HolidayOutOfSchedule.java
@@ -167,7 +167,7 @@ public class HolidayOutOfSchedule extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (npc != null)
 		{
@@ -242,7 +242,7 @@ public class HolidayOutOfSchedule extends LongTimeEvent
 				despawnSanta();
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
index 1c7c983315..138d5e2559 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java
@@ -45,7 +45,7 @@ public class ThePowerOfLove extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/TotalRecall/TotalRecall.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
index f3e3903722..d3deabee2e 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/TotalRecall/TotalRecall.java
@@ -42,7 +42,7 @@ public class TotalRecall extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
index d6b07b8219..dcfcde6436 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java
@@ -321,7 +321,7 @@ public class WatermelonNinja extends LongTimeEvent
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/DreamDungeon/CatGuildsLair/CatGuildsLair.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/DreamDungeon/CatGuildsLair/CatGuildsLair.java
index 07d5096954..fb6e4e9afb 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/DreamDungeon/CatGuildsLair/CatGuildsLair.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/DreamDungeon/CatGuildsLair/CatGuildsLair.java
@@ -155,7 +155,7 @@ public class CatGuildsLair extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance instance = npc.getInstanceWorld();
 		if ((instance == null) || (instance.getStatus() < CREATED))
@@ -169,7 +169,7 @@ public class CatGuildsLair extends AbstractInstance
 			setRandomTitles(instance, true);
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private void spawnBoss(Instance instance)
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/DreamDungeon/DreamPriestess/DreamPriestess.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/DreamDungeon/DreamPriestess/DreamPriestess.java
index b74f5b217b..ac30a1dd56 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/DreamDungeon/DreamPriestess/DreamPriestess.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/DreamDungeon/DreamPriestess/DreamPriestess.java
@@ -63,11 +63,11 @@ public class DreamPriestess extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (player == null)
 		{
-			return super.onAdvEvent(event, npc, null);
+			return super.onEvent(event, npc, null);
 		}
 		
 		if (event.startsWith("enter_dream_dungeon"))
@@ -98,7 +98,7 @@ public class DreamPriestess extends AbstractInstance
 				{
 					enterInstance(player, npc, DraconidFortress.INSTANCE_ID);
 					ThreadPool.schedule(() -> CatGuildsLair.startCatLairInstance(player), 5000);
-					return super.onAdvEvent(event, npc, player);
+					return super.onEvent(event, npc, player);
 				}
 				
 				if (!INSTANCE_IDS.contains(dungeonId))
@@ -155,7 +155,7 @@ public class DreamPriestess extends AbstractInstance
 			}
 			return DREAM_PRIESTESS + "-gm.htm";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private static boolean checkRequirementsForEnter(Player requestor)
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java
index 7c8d6bbb87..34bb1d6157 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java
@@ -153,7 +153,7 @@ public class DwellingOfSpirits extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -199,7 +199,7 @@ public class DwellingOfSpirits extends AbstractInstance
 			}
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/GolbergRoom/GolbergRoom.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/GolbergRoom/GolbergRoom.java
index a047b79a3e..0287f6b24b 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/GolbergRoom/GolbergRoom.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/GolbergRoom/GolbergRoom.java
@@ -50,7 +50,7 @@ public class GolbergRoom extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java
index 3b965a52a3..be0a6a9ffd 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java
@@ -165,7 +165,7 @@ public class LastImperialTomb extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java
index 37ef7ac1c4..0a200da084 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java
@@ -62,7 +62,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -80,7 +80,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
 				break;
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java
index e5966b763e..c4bee8fb7d 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/MonsterArena/MonsterArena.java
@@ -103,7 +103,7 @@ public class MonsterArena extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/QueenAntLair/QueenAntLair.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/QueenAntLair/QueenAntLair.java
index c6d3172062..84a36d39dd 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/QueenAntLair/QueenAntLair.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/QueenAntLair/QueenAntLair.java
@@ -56,7 +56,7 @@ public class QueenAntLair extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
index 2414f8fcfe..3e92780a11 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
@@ -141,7 +141,7 @@ public class TimedHunting extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("ENTER"))
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/TrainingZone/TrainingZone.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/TrainingZone/TrainingZone.java
index 583df87c1d..fc9117026c 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/TrainingZone/TrainingZone.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/TrainingZone/TrainingZone.java
@@ -165,7 +165,7 @@ public class TrainingZone extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (event.startsWith("ENTER"))
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/ValakasTemple/DummyIfrit.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/ValakasTemple/DummyIfrit.java
index 1e39098a39..8055d93d2b 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/ValakasTemple/DummyIfrit.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/ValakasTemple/DummyIfrit.java
@@ -38,7 +38,7 @@ public class DummyIfrit extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		final Instance world = npc.getInstanceWorld();
 		if ((world == null) || (world.getTemplateId() != ValakasTemple.VALAKAS_TEMPLE_INSTANCE_ID))
@@ -58,7 +58,7 @@ public class DummyIfrit extends AbstractNpcAI
 			}
 		}
 		
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/ValakasTemple/Teleporter/ValakasTempleTeleport.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/ValakasTemple/Teleporter/ValakasTempleTeleport.java
index b26c89957e..f5c6fb29b7 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/ValakasTemple/Teleporter/ValakasTempleTeleport.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/instances/ValakasTemple/Teleporter/ValakasTempleTeleport.java
@@ -46,7 +46,7 @@ public class ValakasTempleTeleport extends AbstractInstance
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -73,7 +73,7 @@ public class ValakasTempleTeleport extends AbstractInstance
 				PLAYER_TO_LOGIN.remove(player.getObjectId());
 			}
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onEvent(event, npc, player);
 	}
 	
 	private static boolean checkRequirementsForEnter(Player requestor)
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10001_SedricksBestPupil/Q10001_SedricksBestPupil.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10001_SedricksBestPupil/Q10001_SedricksBestPupil.java
index 1d7536d634..bc01ff8463 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10001_SedricksBestPupil/Q10001_SedricksBestPupil.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10001_SedricksBestPupil/Q10001_SedricksBestPupil.java
@@ -49,7 +49,7 @@ public class Q10001_SedricksBestPupil extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10002_FightingSkill/Q10002_FightingSkill.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10002_FightingSkill/Q10002_FightingSkill.java
index 3c1aa8027a..cd06b487bb 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10002_FightingSkill/Q10002_FightingSkill.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10002_FightingSkill/Q10002_FightingSkill.java
@@ -49,7 +49,7 @@ public class Q10002_FightingSkill extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10003_StrengthOfSpirit/Q10003_StrengthOfSpirit.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10003_StrengthOfSpirit/Q10003_StrengthOfSpirit.java
index dce70e5a3b..756dbe1c61 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10003_StrengthOfSpirit/Q10003_StrengthOfSpirit.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10003_StrengthOfSpirit/Q10003_StrengthOfSpirit.java
@@ -49,7 +49,7 @@ public class Q10003_StrengthOfSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10004_LearningAutoHunt/Q10004_LearningAutoHunt.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10004_LearningAutoHunt/Q10004_LearningAutoHunt.java
index 74abcc8100..fffb09256c 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10004_LearningAutoHunt/Q10004_LearningAutoHunt.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10004_LearningAutoHunt/Q10004_LearningAutoHunt.java
@@ -51,7 +51,7 @@ public class Q10004_LearningAutoHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -66,7 +66,7 @@ public class Q10004_LearningAutoHunt extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10005_BePrepared/Q10005_BePrepared.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10005_BePrepared/Q10005_BePrepared.java
index d241bef119..1a732ae75d 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10005_BePrepared/Q10005_BePrepared.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10005_BePrepared/Q10005_BePrepared.java
@@ -51,7 +51,7 @@ public class Q10005_BePrepared extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10006_UsefulPreparations/Q10006_UsefulPreparations.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10006_UsefulPreparations/Q10006_UsefulPreparations.java
index a7853637d2..92009a54ff 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10006_UsefulPreparations/Q10006_UsefulPreparations.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10006_UsefulPreparations/Q10006_UsefulPreparations.java
@@ -51,7 +51,7 @@ public class Q10006_UsefulPreparations extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10007_TimeToThinkAboutWeapons/Q10007_TimeToThinkAboutWeapons.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10007_TimeToThinkAboutWeapons/Q10007_TimeToThinkAboutWeapons.java
index 5952fef4c2..9744893ad8 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10007_TimeToThinkAboutWeapons/Q10007_TimeToThinkAboutWeapons.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10007_TimeToThinkAboutWeapons/Q10007_TimeToThinkAboutWeapons.java
@@ -51,7 +51,7 @@ public class Q10007_TimeToThinkAboutWeapons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -66,7 +66,7 @@ public class Q10007_TimeToThinkAboutWeapons extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10008_WatchOut/Q10008_WatchOut.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10008_WatchOut/Q10008_WatchOut.java
index 2be29190ba..c503264a08 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10008_WatchOut/Q10008_WatchOut.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10008_WatchOut/Q10008_WatchOut.java
@@ -51,7 +51,7 @@ public class Q10008_WatchOut extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10009_DevelopingYourAbilities/Q10009_DevelopingYourAbilities.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10009_DevelopingYourAbilities/Q10009_DevelopingYourAbilities.java
index eac93c3dbb..3312ea194a 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10009_DevelopingYourAbilities/Q10009_DevelopingYourAbilities.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10009_DevelopingYourAbilities/Q10009_DevelopingYourAbilities.java
@@ -54,7 +54,7 @@ public class Q10009_DevelopingYourAbilities extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10010_TimeToChangeClass/Q10010_TimeToChangeClass.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10010_TimeToChangeClass/Q10010_TimeToChangeClass.java
index 9a00471579..826fac58f9 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10010_TimeToChangeClass/Q10010_TimeToChangeClass.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10010_TimeToChangeClass/Q10010_TimeToChangeClass.java
@@ -60,7 +60,7 @@ public class Q10010_TimeToChangeClass extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10011_GoingOut/Q10011_GoingOut.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10011_GoingOut/Q10011_GoingOut.java
index 2d1e6d1d18..9b63eaa7d1 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10011_GoingOut/Q10011_GoingOut.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10011_GoingOut/Q10011_GoingOut.java
@@ -56,7 +56,7 @@ public class Q10011_GoingOut extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -71,7 +71,7 @@ public class Q10011_GoingOut extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10012_OutstandingMagesFirstSteps/Q10012_OutstandingMagesFirstSteps.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10012_OutstandingMagesFirstSteps/Q10012_OutstandingMagesFirstSteps.java
index d7c770570d..bbab841e9a 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10012_OutstandingMagesFirstSteps/Q10012_OutstandingMagesFirstSteps.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10012_OutstandingMagesFirstSteps/Q10012_OutstandingMagesFirstSteps.java
@@ -49,7 +49,7 @@ public class Q10012_OutstandingMagesFirstSteps extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10013_FightingSkill/Q10013_FightingSkill.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10013_FightingSkill/Q10013_FightingSkill.java
index be7e89e8bc..f61e7dc7f2 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10013_FightingSkill/Q10013_FightingSkill.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10013_FightingSkill/Q10013_FightingSkill.java
@@ -49,7 +49,7 @@ public class Q10013_FightingSkill extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10014_StrengthOfSpirit/Q10014_StrengthOfSpirit.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10014_StrengthOfSpirit/Q10014_StrengthOfSpirit.java
index 2abee34209..7b44feb1c7 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10014_StrengthOfSpirit/Q10014_StrengthOfSpirit.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10014_StrengthOfSpirit/Q10014_StrengthOfSpirit.java
@@ -49,7 +49,7 @@ public class Q10014_StrengthOfSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10015_LearningAutoHunt/Q10015_LearningAutoHunt.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10015_LearningAutoHunt/Q10015_LearningAutoHunt.java
index 6a88da38dc..d6a7527cec 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10015_LearningAutoHunt/Q10015_LearningAutoHunt.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10015_LearningAutoHunt/Q10015_LearningAutoHunt.java
@@ -51,7 +51,7 @@ public class Q10015_LearningAutoHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -66,7 +66,7 @@ public class Q10015_LearningAutoHunt extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10016_BePrepared/Q10016_BePrepared.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10016_BePrepared/Q10016_BePrepared.java
index 0b85a3a5b2..d76b069a10 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10016_BePrepared/Q10016_BePrepared.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10016_BePrepared/Q10016_BePrepared.java
@@ -51,7 +51,7 @@ public class Q10016_BePrepared extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10017_UsefulPreparations/Q10017_UsefulPreparations.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10017_UsefulPreparations/Q10017_UsefulPreparations.java
index 40b0621a7f..a66f1bad82 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10017_UsefulPreparations/Q10017_UsefulPreparations.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10017_UsefulPreparations/Q10017_UsefulPreparations.java
@@ -51,7 +51,7 @@ public class Q10017_UsefulPreparations extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10018_TimeToThinkAboutWeapons/Q10018_TimeToThinkAboutWeapons.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10018_TimeToThinkAboutWeapons/Q10018_TimeToThinkAboutWeapons.java
index 312ee2f0dc..d5c4190d4a 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10018_TimeToThinkAboutWeapons/Q10018_TimeToThinkAboutWeapons.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10018_TimeToThinkAboutWeapons/Q10018_TimeToThinkAboutWeapons.java
@@ -51,7 +51,7 @@ public class Q10018_TimeToThinkAboutWeapons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -66,7 +66,7 @@ public class Q10018_TimeToThinkAboutWeapons extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10019_WatchOut/Q10019_WatchOut.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10019_WatchOut/Q10019_WatchOut.java
index ca718edab1..f37794d439 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10019_WatchOut/Q10019_WatchOut.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10019_WatchOut/Q10019_WatchOut.java
@@ -51,7 +51,7 @@ public class Q10019_WatchOut extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10020_DevelopingYourAbilities/Q10020_DevelopingYourAbilities.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10020_DevelopingYourAbilities/Q10020_DevelopingYourAbilities.java
index a967d6bcf0..701cd0da87 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10020_DevelopingYourAbilities/Q10020_DevelopingYourAbilities.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10020_DevelopingYourAbilities/Q10020_DevelopingYourAbilities.java
@@ -54,7 +54,7 @@ public class Q10020_DevelopingYourAbilities extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10021_TimeToChangeClass/Q10021_TimeToChangeClass.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10021_TimeToChangeClass/Q10021_TimeToChangeClass.java
index e812aa3174..5179f19e7e 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10021_TimeToChangeClass/Q10021_TimeToChangeClass.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10021_TimeToChangeClass/Q10021_TimeToChangeClass.java
@@ -53,7 +53,7 @@ public class Q10021_TimeToChangeClass extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10022_GoingOut/Q10022_GoingOut.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10022_GoingOut/Q10022_GoingOut.java
index 7711ef09ac..57bcecbee4 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10022_GoingOut/Q10022_GoingOut.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10022_GoingOut/Q10022_GoingOut.java
@@ -56,7 +56,7 @@ public class Q10022_GoingOut extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -71,7 +71,7 @@ public class Q10022_GoingOut extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10023_UnderTheMotherTree/Q10023_UnderTheMotherTree.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10023_UnderTheMotherTree/Q10023_UnderTheMotherTree.java
index d9b3c037be..2f1e0a4b03 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10023_UnderTheMotherTree/Q10023_UnderTheMotherTree.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10023_UnderTheMotherTree/Q10023_UnderTheMotherTree.java
@@ -51,7 +51,7 @@ public class Q10023_UnderTheMotherTree extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10024_NewLifesLessons/Q10024_NewLifesLessons.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10024_NewLifesLessons/Q10024_NewLifesLessons.java
index 5d7b065679..1465ec0a35 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10024_NewLifesLessons/Q10024_NewLifesLessons.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10024_NewLifesLessons/Q10024_NewLifesLessons.java
@@ -49,7 +49,7 @@ public class Q10024_NewLifesLessons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10025_NewLifesLessons/Q10025_NewLifesLessons.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10025_NewLifesLessons/Q10025_NewLifesLessons.java
index 9b91046c39..a598d59b32 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10025_NewLifesLessons/Q10025_NewLifesLessons.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10025_NewLifesLessons/Q10025_NewLifesLessons.java
@@ -49,7 +49,7 @@ public class Q10025_NewLifesLessons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10026_StrengthOfSpirit/Q10026_StrengthOfSpirit.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10026_StrengthOfSpirit/Q10026_StrengthOfSpirit.java
index 6ee8e0fdfc..cdc562b960 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10026_StrengthOfSpirit/Q10026_StrengthOfSpirit.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10026_StrengthOfSpirit/Q10026_StrengthOfSpirit.java
@@ -49,7 +49,7 @@ public class Q10026_StrengthOfSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10027_StrengthOfSpirit/Q10027_StrengthOfSpirit.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10027_StrengthOfSpirit/Q10027_StrengthOfSpirit.java
index 2315ad13d4..d4f2e0c203 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10027_StrengthOfSpirit/Q10027_StrengthOfSpirit.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10027_StrengthOfSpirit/Q10027_StrengthOfSpirit.java
@@ -49,7 +49,7 @@ public class Q10027_StrengthOfSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10028_LearningAutoHunt/Q10028_LearningAutoHunt.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10028_LearningAutoHunt/Q10028_LearningAutoHunt.java
index 619dbf37d6..b5e4f66919 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10028_LearningAutoHunt/Q10028_LearningAutoHunt.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10028_LearningAutoHunt/Q10028_LearningAutoHunt.java
@@ -52,7 +52,7 @@ public class Q10028_LearningAutoHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -67,7 +67,7 @@ public class Q10028_LearningAutoHunt extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10029_BePrepared/Q10029_BePrepared.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10029_BePrepared/Q10029_BePrepared.java
index d3933cc653..31678cb03d 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10029_BePrepared/Q10029_BePrepared.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10029_BePrepared/Q10029_BePrepared.java
@@ -52,7 +52,7 @@ public class Q10029_BePrepared extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10030_UsefulPreparations/Q10030_UsefulPreparations.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10030_UsefulPreparations/Q10030_UsefulPreparations.java
index 9217dbdea7..6811b4dcd5 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10030_UsefulPreparations/Q10030_UsefulPreparations.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10030_UsefulPreparations/Q10030_UsefulPreparations.java
@@ -52,7 +52,7 @@ public class Q10030_UsefulPreparations extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10031_TimeToThinkAboutWeapons/Q10031_TimeToThinkAboutWeapons.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10031_TimeToThinkAboutWeapons/Q10031_TimeToThinkAboutWeapons.java
index b526423321..11bfdde24e 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10031_TimeToThinkAboutWeapons/Q10031_TimeToThinkAboutWeapons.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10031_TimeToThinkAboutWeapons/Q10031_TimeToThinkAboutWeapons.java
@@ -51,7 +51,7 @@ public class Q10031_TimeToThinkAboutWeapons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -66,7 +66,7 @@ public class Q10031_TimeToThinkAboutWeapons extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10032_WatchOut/Q10032_WatchOut.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10032_WatchOut/Q10032_WatchOut.java
index 179a19ccd2..aaff9acb7d 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10032_WatchOut/Q10032_WatchOut.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10032_WatchOut/Q10032_WatchOut.java
@@ -51,7 +51,7 @@ public class Q10032_WatchOut extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10033_DevelopingYourAbilities/Q10033_DevelopingYourAbilities.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10033_DevelopingYourAbilities/Q10033_DevelopingYourAbilities.java
index 893ff95220..5d7f8b7698 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10033_DevelopingYourAbilities/Q10033_DevelopingYourAbilities.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10033_DevelopingYourAbilities/Q10033_DevelopingYourAbilities.java
@@ -54,7 +54,7 @@ public class Q10033_DevelopingYourAbilities extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10034_TimeToChangeClass/Q10034_TimeToChangeClass.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10034_TimeToChangeClass/Q10034_TimeToChangeClass.java
index 6187c4da05..6eceff7db3 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10034_TimeToChangeClass/Q10034_TimeToChangeClass.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10034_TimeToChangeClass/Q10034_TimeToChangeClass.java
@@ -53,7 +53,7 @@ public class Q10034_TimeToChangeClass extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10035_WanderersPath/Q10035_WanderersPath.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10035_WanderersPath/Q10035_WanderersPath.java
index ab3abfda19..4442e39482 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10035_WanderersPath/Q10035_WanderersPath.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10035_WanderersPath/Q10035_WanderersPath.java
@@ -56,7 +56,7 @@ public class Q10035_WanderersPath extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -71,7 +71,7 @@ public class Q10035_WanderersPath extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10036_FromTheDepthOfAbyss/Q10036_FromTheDepthOfAbyss.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10036_FromTheDepthOfAbyss/Q10036_FromTheDepthOfAbyss.java
index 62f80616be..b82f1e5c95 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10036_FromTheDepthOfAbyss/Q10036_FromTheDepthOfAbyss.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10036_FromTheDepthOfAbyss/Q10036_FromTheDepthOfAbyss.java
@@ -51,7 +51,7 @@ public class Q10036_FromTheDepthOfAbyss extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10037_NewLifesLessons/Q10037_NewLifesLessons.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10037_NewLifesLessons/Q10037_NewLifesLessons.java
index f5d4d1d876..feb95ab645 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10037_NewLifesLessons/Q10037_NewLifesLessons.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10037_NewLifesLessons/Q10037_NewLifesLessons.java
@@ -51,7 +51,7 @@ public class Q10037_NewLifesLessons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10038_NewLifesLessons/Q10038_NewLifesLessons.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10038_NewLifesLessons/Q10038_NewLifesLessons.java
index 30d0730b98..63194937a3 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10038_NewLifesLessons/Q10038_NewLifesLessons.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10038_NewLifesLessons/Q10038_NewLifesLessons.java
@@ -51,7 +51,7 @@ public class Q10038_NewLifesLessons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10039_StrengthOfSpirit/Q10039_StrengthOfSpirit.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10039_StrengthOfSpirit/Q10039_StrengthOfSpirit.java
index 528850e800..abda67c35c 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10039_StrengthOfSpirit/Q10039_StrengthOfSpirit.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10039_StrengthOfSpirit/Q10039_StrengthOfSpirit.java
@@ -49,7 +49,7 @@ public class Q10039_StrengthOfSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10040_StrengthOfSpirit/Q10040_StrengthOfSpirit.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10040_StrengthOfSpirit/Q10040_StrengthOfSpirit.java
index 946041097f..fc7464aa3f 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10040_StrengthOfSpirit/Q10040_StrengthOfSpirit.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10040_StrengthOfSpirit/Q10040_StrengthOfSpirit.java
@@ -49,7 +49,7 @@ public class Q10040_StrengthOfSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10041_LearningAutoHunt/Q10041_LearningAutoHunt.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10041_LearningAutoHunt/Q10041_LearningAutoHunt.java
index f1f08ff4e6..c0518f32bb 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10041_LearningAutoHunt/Q10041_LearningAutoHunt.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10041_LearningAutoHunt/Q10041_LearningAutoHunt.java
@@ -52,7 +52,7 @@ public class Q10041_LearningAutoHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -67,7 +67,7 @@ public class Q10041_LearningAutoHunt extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10042_BePrepared/Q10042_BePrepared.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10042_BePrepared/Q10042_BePrepared.java
index 963016020f..390af02272 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10042_BePrepared/Q10042_BePrepared.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10042_BePrepared/Q10042_BePrepared.java
@@ -52,7 +52,7 @@ public class Q10042_BePrepared extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10043_UsefulPreparations/Q10043_UsefulPreparations.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10043_UsefulPreparations/Q10043_UsefulPreparations.java
index 65ded04733..35e7a1ec5b 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10043_UsefulPreparations/Q10043_UsefulPreparations.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10043_UsefulPreparations/Q10043_UsefulPreparations.java
@@ -52,7 +52,7 @@ public class Q10043_UsefulPreparations extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10044_TimeToThinkAboutWeapons/Q10044_TimeToThinkAboutWeapons.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10044_TimeToThinkAboutWeapons/Q10044_TimeToThinkAboutWeapons.java
index a010fb8680..4efc1f8d94 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10044_TimeToThinkAboutWeapons/Q10044_TimeToThinkAboutWeapons.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10044_TimeToThinkAboutWeapons/Q10044_TimeToThinkAboutWeapons.java
@@ -53,7 +53,7 @@ public class Q10044_TimeToThinkAboutWeapons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -68,7 +68,7 @@ public class Q10044_TimeToThinkAboutWeapons extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10045_WatchOut/Q10045_WatchOut.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10045_WatchOut/Q10045_WatchOut.java
index f6a61f95d5..406bec55b2 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10045_WatchOut/Q10045_WatchOut.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10045_WatchOut/Q10045_WatchOut.java
@@ -53,7 +53,7 @@ public class Q10045_WatchOut extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10046_DevelopingYourAbilities/Q10046_DevelopingYourAbilities.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10046_DevelopingYourAbilities/Q10046_DevelopingYourAbilities.java
index 7cfb19eb6d..720d02955a 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10046_DevelopingYourAbilities/Q10046_DevelopingYourAbilities.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10046_DevelopingYourAbilities/Q10046_DevelopingYourAbilities.java
@@ -56,7 +56,7 @@ public class Q10046_DevelopingYourAbilities extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10047_TimeToChangeClass/Q10047_TimeToChangeClass.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10047_TimeToChangeClass/Q10047_TimeToChangeClass.java
index 30ce8dddac..bc97670e4c 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10047_TimeToChangeClass/Q10047_TimeToChangeClass.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10047_TimeToChangeClass/Q10047_TimeToChangeClass.java
@@ -53,7 +53,7 @@ public class Q10047_TimeToChangeClass extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10048_BlessingOfAbyss/Q10048_BlessingOfAbyss.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10048_BlessingOfAbyss/Q10048_BlessingOfAbyss.java
index 31acdc92d4..4a873d5679 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10048_BlessingOfAbyss/Q10048_BlessingOfAbyss.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10048_BlessingOfAbyss/Q10048_BlessingOfAbyss.java
@@ -56,7 +56,7 @@ public class Q10048_BlessingOfAbyss extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -71,7 +71,7 @@ public class Q10048_BlessingOfAbyss extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10049_FiercestFlame/Q10049_FiercestFlame.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10049_FiercestFlame/Q10049_FiercestFlame.java
index 0f55a3378b..4282e91c13 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10049_FiercestFlame/Q10049_FiercestFlame.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10049_FiercestFlame/Q10049_FiercestFlame.java
@@ -49,7 +49,7 @@ public class Q10049_FiercestFlame extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10050_NewLifesLessons/Q10050_NewLifesLessons.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10050_NewLifesLessons/Q10050_NewLifesLessons.java
index bb7a23ce19..39ca3471cb 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10050_NewLifesLessons/Q10050_NewLifesLessons.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10050_NewLifesLessons/Q10050_NewLifesLessons.java
@@ -48,7 +48,7 @@ public class Q10050_NewLifesLessons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10051_StrengthOfSpirit/Q10051_StrengthOfSpirit.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10051_StrengthOfSpirit/Q10051_StrengthOfSpirit.java
index 768a647292..8aa5851e8d 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10051_StrengthOfSpirit/Q10051_StrengthOfSpirit.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10051_StrengthOfSpirit/Q10051_StrengthOfSpirit.java
@@ -48,7 +48,7 @@ public class Q10051_StrengthOfSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10052_LearningAutoHunt/Q10052_LearningAutoHunt.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10052_LearningAutoHunt/Q10052_LearningAutoHunt.java
index 9b187d076d..91f3e2fd3e 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10052_LearningAutoHunt/Q10052_LearningAutoHunt.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10052_LearningAutoHunt/Q10052_LearningAutoHunt.java
@@ -52,7 +52,7 @@ public class Q10052_LearningAutoHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -67,7 +67,7 @@ public class Q10052_LearningAutoHunt extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10053_BePrepared/Q10053_BePrepared.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10053_BePrepared/Q10053_BePrepared.java
index f2e7968d19..35f2b33a91 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10053_BePrepared/Q10053_BePrepared.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10053_BePrepared/Q10053_BePrepared.java
@@ -52,7 +52,7 @@ public class Q10053_BePrepared extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10054_UsefulPreparations/Q10054_UsefulPreparations.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10054_UsefulPreparations/Q10054_UsefulPreparations.java
index 1de487b06a..cf0c478599 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10054_UsefulPreparations/Q10054_UsefulPreparations.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10054_UsefulPreparations/Q10054_UsefulPreparations.java
@@ -52,7 +52,7 @@ public class Q10054_UsefulPreparations extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10055_TimeToThinkAboutWeapons/Q10055_TimeToThinkAboutWeapons.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10055_TimeToThinkAboutWeapons/Q10055_TimeToThinkAboutWeapons.java
index a3277aba3c..711ee00544 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10055_TimeToThinkAboutWeapons/Q10055_TimeToThinkAboutWeapons.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10055_TimeToThinkAboutWeapons/Q10055_TimeToThinkAboutWeapons.java
@@ -52,7 +52,7 @@ public class Q10055_TimeToThinkAboutWeapons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -67,7 +67,7 @@ public class Q10055_TimeToThinkAboutWeapons extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10056_WatchOut/Q10056_WatchOut.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10056_WatchOut/Q10056_WatchOut.java
index 63e1d23c4e..3fa4a20aa2 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10056_WatchOut/Q10056_WatchOut.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10056_WatchOut/Q10056_WatchOut.java
@@ -52,7 +52,7 @@ public class Q10056_WatchOut extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10057_DevelopingYourAbilities/Q10057_DevelopingYourAbilities.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10057_DevelopingYourAbilities/Q10057_DevelopingYourAbilities.java
index c464e016f3..9a0fb05d45 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10057_DevelopingYourAbilities/Q10057_DevelopingYourAbilities.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10057_DevelopingYourAbilities/Q10057_DevelopingYourAbilities.java
@@ -55,7 +55,7 @@ public class Q10057_DevelopingYourAbilities extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10058_TimeToChangeClass/Q10058_TimeToChangeClass.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10058_TimeToChangeClass/Q10058_TimeToChangeClass.java
index f724979428..ac5316fa24 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10058_TimeToChangeClass/Q10058_TimeToChangeClass.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10058_TimeToChangeClass/Q10058_TimeToChangeClass.java
@@ -53,7 +53,7 @@ public class Q10058_TimeToChangeClass extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10059_AmongTheBravestOfOrcs/Q10059_AmongTheBravestOfOrcs.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10059_AmongTheBravestOfOrcs/Q10059_AmongTheBravestOfOrcs.java
index bd0e2b761b..cda9441296 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10059_AmongTheBravestOfOrcs/Q10059_AmongTheBravestOfOrcs.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10059_AmongTheBravestOfOrcs/Q10059_AmongTheBravestOfOrcs.java
@@ -56,7 +56,7 @@ public class Q10059_AmongTheBravestOfOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -71,7 +71,7 @@ public class Q10059_AmongTheBravestOfOrcs extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10060_NewFlameOfOrcs/Q10060_NewFlameOfOrcs.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10060_NewFlameOfOrcs/Q10060_NewFlameOfOrcs.java
index e1dcfa91d9..674b922968 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10060_NewFlameOfOrcs/Q10060_NewFlameOfOrcs.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10060_NewFlameOfOrcs/Q10060_NewFlameOfOrcs.java
@@ -49,7 +49,7 @@ public class Q10060_NewFlameOfOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10061_NewLifesLessons/Q10061_NewLifesLessons.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10061_NewLifesLessons/Q10061_NewLifesLessons.java
index 7154e23308..97d0fa5daf 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10061_NewLifesLessons/Q10061_NewLifesLessons.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10061_NewLifesLessons/Q10061_NewLifesLessons.java
@@ -48,7 +48,7 @@ public class Q10061_NewLifesLessons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10062_StrengthOfSpirit/Q10062_StrengthOfSpirit.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10062_StrengthOfSpirit/Q10062_StrengthOfSpirit.java
index 2bb813dfb4..ab974e0c5d 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10062_StrengthOfSpirit/Q10062_StrengthOfSpirit.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10062_StrengthOfSpirit/Q10062_StrengthOfSpirit.java
@@ -48,7 +48,7 @@ public class Q10062_StrengthOfSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10063_LearningAutoHunt/Q10063_LearningAutoHunt.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10063_LearningAutoHunt/Q10063_LearningAutoHunt.java
index d6be31773f..e97133a00f 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10063_LearningAutoHunt/Q10063_LearningAutoHunt.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10063_LearningAutoHunt/Q10063_LearningAutoHunt.java
@@ -52,7 +52,7 @@ public class Q10063_LearningAutoHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -67,7 +67,7 @@ public class Q10063_LearningAutoHunt extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10064_BePrepared/Q10064_BePrepared.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10064_BePrepared/Q10064_BePrepared.java
index cf9f64ff9d..76d4e36b35 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10064_BePrepared/Q10064_BePrepared.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10064_BePrepared/Q10064_BePrepared.java
@@ -52,7 +52,7 @@ public class Q10064_BePrepared extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10065_UsefulPreparations/Q10065_UsefulPreparations.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10065_UsefulPreparations/Q10065_UsefulPreparations.java
index 2d31172fbb..a35bacf365 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10065_UsefulPreparations/Q10065_UsefulPreparations.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10065_UsefulPreparations/Q10065_UsefulPreparations.java
@@ -52,7 +52,7 @@ public class Q10065_UsefulPreparations extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10066_TimeToThinkAboutWeapons/Q10066_TimeToThinkAboutWeapons.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10066_TimeToThinkAboutWeapons/Q10066_TimeToThinkAboutWeapons.java
index b3a5580410..11c2b26b2a 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10066_TimeToThinkAboutWeapons/Q10066_TimeToThinkAboutWeapons.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10066_TimeToThinkAboutWeapons/Q10066_TimeToThinkAboutWeapons.java
@@ -52,7 +52,7 @@ public class Q10066_TimeToThinkAboutWeapons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -67,7 +67,7 @@ public class Q10066_TimeToThinkAboutWeapons extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10067_WatchOut/Q10067_WatchOut.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10067_WatchOut/Q10067_WatchOut.java
index e2e558f4da..1053b4fcd1 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10067_WatchOut/Q10067_WatchOut.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10067_WatchOut/Q10067_WatchOut.java
@@ -52,7 +52,7 @@ public class Q10067_WatchOut extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10068_DevelopingYourAbilities/Q10068_DevelopingYourAbilities.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10068_DevelopingYourAbilities/Q10068_DevelopingYourAbilities.java
index 0cb718d724..fe689f7c79 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10068_DevelopingYourAbilities/Q10068_DevelopingYourAbilities.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10068_DevelopingYourAbilities/Q10068_DevelopingYourAbilities.java
@@ -55,7 +55,7 @@ public class Q10068_DevelopingYourAbilities extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10069_TimeToChangeClass/Q10069_TimeToChangeClass.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10069_TimeToChangeClass/Q10069_TimeToChangeClass.java
index fef01d41b9..36f42fdb86 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10069_TimeToChangeClass/Q10069_TimeToChangeClass.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10069_TimeToChangeClass/Q10069_TimeToChangeClass.java
@@ -53,7 +53,7 @@ public class Q10069_TimeToChangeClass extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10070_AmongTheBravestOfOrcs/Q10070_AmongTheBravestOfOrcs.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10070_AmongTheBravestOfOrcs/Q10070_AmongTheBravestOfOrcs.java
index 024db64cad..b2b5ea26c2 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10070_AmongTheBravestOfOrcs/Q10070_AmongTheBravestOfOrcs.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10070_AmongTheBravestOfOrcs/Q10070_AmongTheBravestOfOrcs.java
@@ -56,7 +56,7 @@ public class Q10070_AmongTheBravestOfOrcs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -71,7 +71,7 @@ public class Q10070_AmongTheBravestOfOrcs extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10071_OreFromTheStripMine/Q10071_OreFromTheStripMine.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10071_OreFromTheStripMine/Q10071_OreFromTheStripMine.java
index 95fc94f167..ab27cd01a4 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10071_OreFromTheStripMine/Q10071_OreFromTheStripMine.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10071_OreFromTheStripMine/Q10071_OreFromTheStripMine.java
@@ -49,7 +49,7 @@ public class Q10071_OreFromTheStripMine extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10072_NewLifesLessons/Q10072_NewLifesLessons.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10072_NewLifesLessons/Q10072_NewLifesLessons.java
index 2d07b9baf8..1c9994777e 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10072_NewLifesLessons/Q10072_NewLifesLessons.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10072_NewLifesLessons/Q10072_NewLifesLessons.java
@@ -49,7 +49,7 @@ public class Q10072_NewLifesLessons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10073_StrengthOfSpirit/Q10073_StrengthOfSpirit.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10073_StrengthOfSpirit/Q10073_StrengthOfSpirit.java
index 3cc7951c75..4a64692c46 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10073_StrengthOfSpirit/Q10073_StrengthOfSpirit.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10073_StrengthOfSpirit/Q10073_StrengthOfSpirit.java
@@ -49,7 +49,7 @@ public class Q10073_StrengthOfSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10074_LearningAutoHunt/Q10074_LearningAutoHunt.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10074_LearningAutoHunt/Q10074_LearningAutoHunt.java
index 2ca3c8c397..89a1873a20 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10074_LearningAutoHunt/Q10074_LearningAutoHunt.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10074_LearningAutoHunt/Q10074_LearningAutoHunt.java
@@ -52,7 +52,7 @@ public class Q10074_LearningAutoHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -67,7 +67,7 @@ public class Q10074_LearningAutoHunt extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10075_BePrepared/Q10075_BePrepared.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10075_BePrepared/Q10075_BePrepared.java
index 17201c5467..30bb5b197a 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10075_BePrepared/Q10075_BePrepared.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10075_BePrepared/Q10075_BePrepared.java
@@ -52,7 +52,7 @@ public class Q10075_BePrepared extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10076_UsefulPreparations/Q10076_UsefulPreparations.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10076_UsefulPreparations/Q10076_UsefulPreparations.java
index 2a564ae30d..321ec1281b 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10076_UsefulPreparations/Q10076_UsefulPreparations.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10076_UsefulPreparations/Q10076_UsefulPreparations.java
@@ -52,7 +52,7 @@ public class Q10076_UsefulPreparations extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10077_TimeToThinkAboutWeapons/Q10077_TimeToThinkAboutWeapons.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10077_TimeToThinkAboutWeapons/Q10077_TimeToThinkAboutWeapons.java
index 7a3a29142a..290dd292c8 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10077_TimeToThinkAboutWeapons/Q10077_TimeToThinkAboutWeapons.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10077_TimeToThinkAboutWeapons/Q10077_TimeToThinkAboutWeapons.java
@@ -50,7 +50,7 @@ public class Q10077_TimeToThinkAboutWeapons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -65,7 +65,7 @@ public class Q10077_TimeToThinkAboutWeapons extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10078_WatchOut/Q10078_WatchOut.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10078_WatchOut/Q10078_WatchOut.java
index d435aa01ee..19d86f238e 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10078_WatchOut/Q10078_WatchOut.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10078_WatchOut/Q10078_WatchOut.java
@@ -50,7 +50,7 @@ public class Q10078_WatchOut extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10079_DevelopingYourAbilities/Q10079_DevelopingYourAbilities.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10079_DevelopingYourAbilities/Q10079_DevelopingYourAbilities.java
index 5b123e3b84..ae41d3d76d 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10079_DevelopingYourAbilities/Q10079_DevelopingYourAbilities.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10079_DevelopingYourAbilities/Q10079_DevelopingYourAbilities.java
@@ -53,7 +53,7 @@ public class Q10079_DevelopingYourAbilities extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10080_TimeToChangeClass/Q10080_TimeToChangeClass.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10080_TimeToChangeClass/Q10080_TimeToChangeClass.java
index b62295e3f8..cc535742f6 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10080_TimeToChangeClass/Q10080_TimeToChangeClass.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10080_TimeToChangeClass/Q10080_TimeToChangeClass.java
@@ -53,7 +53,7 @@ public class Q10080_TimeToChangeClass extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10081_BestMiner/Q10081_BestMiner.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10081_BestMiner/Q10081_BestMiner.java
index ca03b0ce28..800db4c499 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10081_BestMiner/Q10081_BestMiner.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10081_BestMiner/Q10081_BestMiner.java
@@ -56,7 +56,7 @@ public class Q10081_BestMiner extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -71,7 +71,7 @@ public class Q10081_BestMiner extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10082_EfficientTraining/Q10082_EfficientTraining.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10082_EfficientTraining/Q10082_EfficientTraining.java
index 0f828b92f8..57eeb6812d 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10082_EfficientTraining/Q10082_EfficientTraining.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10082_EfficientTraining/Q10082_EfficientTraining.java
@@ -49,7 +49,7 @@ public class Q10082_EfficientTraining extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10083_NewLifesLessons/Q10083_NewLifesLessons.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10083_NewLifesLessons/Q10083_NewLifesLessons.java
index ffb5edb2cd..3e8b54a114 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10083_NewLifesLessons/Q10083_NewLifesLessons.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10083_NewLifesLessons/Q10083_NewLifesLessons.java
@@ -49,7 +49,7 @@ public class Q10083_NewLifesLessons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10084_StrengthOfSpirit/Q10084_StrengthOfSpirit.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10084_StrengthOfSpirit/Q10084_StrengthOfSpirit.java
index 24d52ef854..2178a5c6c2 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10084_StrengthOfSpirit/Q10084_StrengthOfSpirit.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10084_StrengthOfSpirit/Q10084_StrengthOfSpirit.java
@@ -49,7 +49,7 @@ public class Q10084_StrengthOfSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10085_LearningAutoHunt/Q10085_LearningAutoHunt.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10085_LearningAutoHunt/Q10085_LearningAutoHunt.java
index 27fc08953a..300d0db3e6 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10085_LearningAutoHunt/Q10085_LearningAutoHunt.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10085_LearningAutoHunt/Q10085_LearningAutoHunt.java
@@ -52,7 +52,7 @@ public class Q10085_LearningAutoHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -67,7 +67,7 @@ public class Q10085_LearningAutoHunt extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10086_BePrepared/Q10086_BePrepared.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10086_BePrepared/Q10086_BePrepared.java
index 0b50a3aadf..2908f22791 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10086_BePrepared/Q10086_BePrepared.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10086_BePrepared/Q10086_BePrepared.java
@@ -52,7 +52,7 @@ public class Q10086_BePrepared extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10087_UsefulPreparations/Q10087_UsefulPreparations.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10087_UsefulPreparations/Q10087_UsefulPreparations.java
index 0f7cc0725e..16647b130b 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10087_UsefulPreparations/Q10087_UsefulPreparations.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10087_UsefulPreparations/Q10087_UsefulPreparations.java
@@ -52,7 +52,7 @@ public class Q10087_UsefulPreparations extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10088_TimeToThinkAboutWeapons/Q10088_TimeToThinkAboutWeapons.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10088_TimeToThinkAboutWeapons/Q10088_TimeToThinkAboutWeapons.java
index e0bf887968..6ccd000ef0 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10088_TimeToThinkAboutWeapons/Q10088_TimeToThinkAboutWeapons.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10088_TimeToThinkAboutWeapons/Q10088_TimeToThinkAboutWeapons.java
@@ -52,7 +52,7 @@ public class Q10088_TimeToThinkAboutWeapons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -67,7 +67,7 @@ public class Q10088_TimeToThinkAboutWeapons extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10089_WatchOut/Q10089_WatchOut.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10089_WatchOut/Q10089_WatchOut.java
index 695202bb40..9b4e2f7331 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10089_WatchOut/Q10089_WatchOut.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10089_WatchOut/Q10089_WatchOut.java
@@ -52,7 +52,7 @@ public class Q10089_WatchOut extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10090_DevelopingYourAbilities/Q10090_DevelopingYourAbilities.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10090_DevelopingYourAbilities/Q10090_DevelopingYourAbilities.java
index c1500df7cc..76e2219eaf 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10090_DevelopingYourAbilities/Q10090_DevelopingYourAbilities.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10090_DevelopingYourAbilities/Q10090_DevelopingYourAbilities.java
@@ -55,7 +55,7 @@ public class Q10090_DevelopingYourAbilities extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10091_TimeToChangeClass/Q10091_TimeToChangeClass.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10091_TimeToChangeClass/Q10091_TimeToChangeClass.java
index b0e19edf49..aa2d04d0cf 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10091_TimeToChangeClass/Q10091_TimeToChangeClass.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10091_TimeToChangeClass/Q10091_TimeToChangeClass.java
@@ -53,7 +53,7 @@ public class Q10091_TimeToChangeClass extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10092_NewHorizons/Q10092_NewHorizons.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10092_NewHorizons/Q10092_NewHorizons.java
index 16a052f10d..a6364ec73d 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10092_NewHorizons/Q10092_NewHorizons.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10092_NewHorizons/Q10092_NewHorizons.java
@@ -56,7 +56,7 @@ public class Q10092_NewHorizons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -71,7 +71,7 @@ public class Q10092_NewHorizons extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10093_TheLifeOfADeathKnight/Q10093_TheLifeOfADeathKnight.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10093_TheLifeOfADeathKnight/Q10093_TheLifeOfADeathKnight.java
index 06534a9eb9..992e56f0cf 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10093_TheLifeOfADeathKnight/Q10093_TheLifeOfADeathKnight.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10093_TheLifeOfADeathKnight/Q10093_TheLifeOfADeathKnight.java
@@ -49,7 +49,7 @@ public class Q10093_TheLifeOfADeathKnight extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10094_NewLifesLessons/Q10094_NewLifesLessons.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10094_NewLifesLessons/Q10094_NewLifesLessons.java
index 052e35f50b..8b3f6119c5 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10094_NewLifesLessons/Q10094_NewLifesLessons.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10094_NewLifesLessons/Q10094_NewLifesLessons.java
@@ -48,7 +48,7 @@ public class Q10094_NewLifesLessons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10095_StrengthOfSpirit/Q10095_StrengthOfSpirit.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10095_StrengthOfSpirit/Q10095_StrengthOfSpirit.java
index 442f7c8990..dfacec01ec 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10095_StrengthOfSpirit/Q10095_StrengthOfSpirit.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10095_StrengthOfSpirit/Q10095_StrengthOfSpirit.java
@@ -48,7 +48,7 @@ public class Q10095_StrengthOfSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10096_LearningAutoHunt/Q10096_LearningAutoHunt.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10096_LearningAutoHunt/Q10096_LearningAutoHunt.java
index 65909d5589..abae0491d0 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10096_LearningAutoHunt/Q10096_LearningAutoHunt.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10096_LearningAutoHunt/Q10096_LearningAutoHunt.java
@@ -50,7 +50,7 @@ public class Q10096_LearningAutoHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -65,7 +65,7 @@ public class Q10096_LearningAutoHunt extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10097_BePrepared/Q10097_BePrepared.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10097_BePrepared/Q10097_BePrepared.java
index ad2cfb3f29..56bcf75521 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10097_BePrepared/Q10097_BePrepared.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10097_BePrepared/Q10097_BePrepared.java
@@ -50,7 +50,7 @@ public class Q10097_BePrepared extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10098_UsefulPreparations/Q10098_UsefulPreparations.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10098_UsefulPreparations/Q10098_UsefulPreparations.java
index 826d84bbe5..07307b4983 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10098_UsefulPreparations/Q10098_UsefulPreparations.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10098_UsefulPreparations/Q10098_UsefulPreparations.java
@@ -50,7 +50,7 @@ public class Q10098_UsefulPreparations extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10099_TimeToThinkAboutWeapons/Q10099_TimeToThinkAboutWeapons.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10099_TimeToThinkAboutWeapons/Q10099_TimeToThinkAboutWeapons.java
index 6274e76d4e..ceff5eae8c 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10099_TimeToThinkAboutWeapons/Q10099_TimeToThinkAboutWeapons.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10099_TimeToThinkAboutWeapons/Q10099_TimeToThinkAboutWeapons.java
@@ -50,7 +50,7 @@ public class Q10099_TimeToThinkAboutWeapons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -65,7 +65,7 @@ public class Q10099_TimeToThinkAboutWeapons extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10100_WatchOut/Q10100_WatchOut.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10100_WatchOut/Q10100_WatchOut.java
index f4d1b47dcb..fbad4c1fd4 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10100_WatchOut/Q10100_WatchOut.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10100_WatchOut/Q10100_WatchOut.java
@@ -50,7 +50,7 @@ public class Q10100_WatchOut extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10101_DevelopingYourAbilities/Q10101_DevelopingYourAbilities.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10101_DevelopingYourAbilities/Q10101_DevelopingYourAbilities.java
index 1227752c70..d82c0d3901 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10101_DevelopingYourAbilities/Q10101_DevelopingYourAbilities.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10101_DevelopingYourAbilities/Q10101_DevelopingYourAbilities.java
@@ -53,7 +53,7 @@ public class Q10101_DevelopingYourAbilities extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10102_TimeToChangeClass/Q10102_TimeToChangeClass.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10102_TimeToChangeClass/Q10102_TimeToChangeClass.java
index fb74bda590..1393fe56b3 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10102_TimeToChangeClass/Q10102_TimeToChangeClass.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10102_TimeToChangeClass/Q10102_TimeToChangeClass.java
@@ -53,7 +53,7 @@ public class Q10102_TimeToChangeClass extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10103_ChallengingYourDestiny/Q10103_ChallengingYourDestiny.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10103_ChallengingYourDestiny/Q10103_ChallengingYourDestiny.java
index 3e56b74592..d6da250343 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10103_ChallengingYourDestiny/Q10103_ChallengingYourDestiny.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10103_ChallengingYourDestiny/Q10103_ChallengingYourDestiny.java
@@ -56,7 +56,7 @@ public class Q10103_ChallengingYourDestiny extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -71,7 +71,7 @@ public class Q10103_ChallengingYourDestiny extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10104_SayhasChildren/Q10104_SayhasChildren.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10104_SayhasChildren/Q10104_SayhasChildren.java
index 2092639aef..6518079238 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10104_SayhasChildren/Q10104_SayhasChildren.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10104_SayhasChildren/Q10104_SayhasChildren.java
@@ -49,7 +49,7 @@ public class Q10104_SayhasChildren extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10105_NewLifesLessons/Q10105_NewLifesLessons.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10105_NewLifesLessons/Q10105_NewLifesLessons.java
index 383e4ef607..63c9131a34 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10105_NewLifesLessons/Q10105_NewLifesLessons.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10105_NewLifesLessons/Q10105_NewLifesLessons.java
@@ -48,7 +48,7 @@ public class Q10105_NewLifesLessons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10106_StrengthOfSpirit/Q10106_StrengthOfSpirit.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10106_StrengthOfSpirit/Q10106_StrengthOfSpirit.java
index af82ab2169..b6907ba901 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10106_StrengthOfSpirit/Q10106_StrengthOfSpirit.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10106_StrengthOfSpirit/Q10106_StrengthOfSpirit.java
@@ -48,7 +48,7 @@ public class Q10106_StrengthOfSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10107_LearningAutoHunt/Q10107_LearningAutoHunt.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10107_LearningAutoHunt/Q10107_LearningAutoHunt.java
index 6e3275d6a7..96239b20a6 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10107_LearningAutoHunt/Q10107_LearningAutoHunt.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10107_LearningAutoHunt/Q10107_LearningAutoHunt.java
@@ -51,7 +51,7 @@ public class Q10107_LearningAutoHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -66,7 +66,7 @@ public class Q10107_LearningAutoHunt extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10108_BePrepared/Q10108_BePrepared.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10108_BePrepared/Q10108_BePrepared.java
index 6936e8fad0..18ccde0a62 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10108_BePrepared/Q10108_BePrepared.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10108_BePrepared/Q10108_BePrepared.java
@@ -51,7 +51,7 @@ public class Q10108_BePrepared extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10109_UsefulPreparations/Q10109_UsefulPreparations.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10109_UsefulPreparations/Q10109_UsefulPreparations.java
index 4878d6cecd..fe443662b5 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10109_UsefulPreparations/Q10109_UsefulPreparations.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10109_UsefulPreparations/Q10109_UsefulPreparations.java
@@ -51,7 +51,7 @@ public class Q10109_UsefulPreparations extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10110_TimeToThinkAboutWeapons/Q10110_TimeToThinkAboutWeapons.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10110_TimeToThinkAboutWeapons/Q10110_TimeToThinkAboutWeapons.java
index 0dd2233495..cbf1ab9b2c 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10110_TimeToThinkAboutWeapons/Q10110_TimeToThinkAboutWeapons.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10110_TimeToThinkAboutWeapons/Q10110_TimeToThinkAboutWeapons.java
@@ -51,7 +51,7 @@ public class Q10110_TimeToThinkAboutWeapons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -66,7 +66,7 @@ public class Q10110_TimeToThinkAboutWeapons extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10111_WatchOut/Q10111_WatchOut.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10111_WatchOut/Q10111_WatchOut.java
index ffd066ba1d..dac0225247 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10111_WatchOut/Q10111_WatchOut.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10111_WatchOut/Q10111_WatchOut.java
@@ -51,7 +51,7 @@ public class Q10111_WatchOut extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10112_DevelopingYourAbilities/Q10112_DevelopingYourAbilities.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10112_DevelopingYourAbilities/Q10112_DevelopingYourAbilities.java
index b2a854e51f..aec57155d2 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10112_DevelopingYourAbilities/Q10112_DevelopingYourAbilities.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10112_DevelopingYourAbilities/Q10112_DevelopingYourAbilities.java
@@ -54,7 +54,7 @@ public class Q10112_DevelopingYourAbilities extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10113_TimeToChangeClass/Q10113_TimeToChangeClass.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10113_TimeToChangeClass/Q10113_TimeToChangeClass.java
index 2ffefae1c4..94e98cb2fa 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10113_TimeToChangeClass/Q10113_TimeToChangeClass.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10113_TimeToChangeClass/Q10113_TimeToChangeClass.java
@@ -53,7 +53,7 @@ public class Q10113_TimeToChangeClass extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10114_WeSylphs/Q10114_WeSylphs.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10114_WeSylphs/Q10114_WeSylphs.java
index 2de499942b..29e8d66257 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10114_WeSylphs/Q10114_WeSylphs.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10114_WeSylphs/Q10114_WeSylphs.java
@@ -56,7 +56,7 @@ public class Q10114_WeSylphs extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -71,7 +71,7 @@ public class Q10114_WeSylphs extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10115_OnlyForNodaMembers/Q10115_OnlyForNodaMembers.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10115_OnlyForNodaMembers/Q10115_OnlyForNodaMembers.java
index f302a6e299..95938a528d 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10115_OnlyForNodaMembers/Q10115_OnlyForNodaMembers.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10115_OnlyForNodaMembers/Q10115_OnlyForNodaMembers.java
@@ -48,7 +48,7 @@ public class Q10115_OnlyForNodaMembers extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10116_NewLifesLessons/Q10116_NewLifesLessons.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10116_NewLifesLessons/Q10116_NewLifesLessons.java
index 4104de4db2..69fdd43c4e 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10116_NewLifesLessons/Q10116_NewLifesLessons.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10116_NewLifesLessons/Q10116_NewLifesLessons.java
@@ -48,7 +48,7 @@ public class Q10116_NewLifesLessons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10117_StrengthOfSpirit/Q10117_StrengthOfSpirit.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10117_StrengthOfSpirit/Q10117_StrengthOfSpirit.java
index caa706c635..32c773a129 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10117_StrengthOfSpirit/Q10117_StrengthOfSpirit.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10117_StrengthOfSpirit/Q10117_StrengthOfSpirit.java
@@ -48,7 +48,7 @@ public class Q10117_StrengthOfSpirit extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10118_LearningAutoHunt/Q10118_LearningAutoHunt.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10118_LearningAutoHunt/Q10118_LearningAutoHunt.java
index 2163314ad7..7a393c2d66 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10118_LearningAutoHunt/Q10118_LearningAutoHunt.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10118_LearningAutoHunt/Q10118_LearningAutoHunt.java
@@ -50,7 +50,7 @@ public class Q10118_LearningAutoHunt extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -65,7 +65,7 @@ public class Q10118_LearningAutoHunt extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10119_BePrepared/Q10119_BePrepared.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10119_BePrepared/Q10119_BePrepared.java
index b971d5897a..3a1dd7401d 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10119_BePrepared/Q10119_BePrepared.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10119_BePrepared/Q10119_BePrepared.java
@@ -50,7 +50,7 @@ public class Q10119_BePrepared extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10120_UsefulPreparations/Q10120_UsefulPreparations.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10120_UsefulPreparations/Q10120_UsefulPreparations.java
index 74371915f3..88ac7013ad 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10120_UsefulPreparations/Q10120_UsefulPreparations.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10120_UsefulPreparations/Q10120_UsefulPreparations.java
@@ -50,7 +50,7 @@ public class Q10120_UsefulPreparations extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10121_TimeToThinkAboutWeapons/Q10121_TimeToThinkAboutWeapons.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10121_TimeToThinkAboutWeapons/Q10121_TimeToThinkAboutWeapons.java
index c4f4adc77e..51bc9e8b2e 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10121_TimeToThinkAboutWeapons/Q10121_TimeToThinkAboutWeapons.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10121_TimeToThinkAboutWeapons/Q10121_TimeToThinkAboutWeapons.java
@@ -50,7 +50,7 @@ public class Q10121_TimeToThinkAboutWeapons extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -65,7 +65,7 @@ public class Q10121_TimeToThinkAboutWeapons extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10122_WatchOut/Q10122_WatchOut.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10122_WatchOut/Q10122_WatchOut.java
index 486f6b752e..befdbdee80 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10122_WatchOut/Q10122_WatchOut.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10122_WatchOut/Q10122_WatchOut.java
@@ -50,7 +50,7 @@ public class Q10122_WatchOut extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10123_DevelopingYourAbilities/Q10123_DevelopingYourAbilities.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10123_DevelopingYourAbilities/Q10123_DevelopingYourAbilities.java
index 6bdd610794..b0e494d2b2 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10123_DevelopingYourAbilities/Q10123_DevelopingYourAbilities.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10123_DevelopingYourAbilities/Q10123_DevelopingYourAbilities.java
@@ -53,7 +53,7 @@ public class Q10123_DevelopingYourAbilities extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10124_TimeToChangeClass/Q10124_TimeToChangeClass.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10124_TimeToChangeClass/Q10124_TimeToChangeClass.java
index 334b4fb180..88962472ac 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10124_TimeToChangeClass/Q10124_TimeToChangeClass.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10124_TimeToChangeClass/Q10124_TimeToChangeClass.java
@@ -53,7 +53,7 @@ public class Q10124_TimeToChangeClass extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10125_AssassinsFirstJob/Q10125_AssassinsFirstJob.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10125_AssassinsFirstJob/Q10125_AssassinsFirstJob.java
index a5cb8a4679..e541ead19a 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10125_AssassinsFirstJob/Q10125_AssassinsFirstJob.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10125_AssassinsFirstJob/Q10125_AssassinsFirstJob.java
@@ -56,7 +56,7 @@ public class Q10125_AssassinsFirstJob extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -71,7 +71,7 @@ public class Q10125_AssassinsFirstJob extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10301_MoreExperience/Q10301_MoreExperience.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10301_MoreExperience/Q10301_MoreExperience.java
index 1d5fde6d38..10a5b07b5c 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10301_MoreExperience/Q10301_MoreExperience.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10301_MoreExperience/Q10301_MoreExperience.java
@@ -53,7 +53,7 @@ public class Q10301_MoreExperience extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -68,7 +68,7 @@ public class Q10301_MoreExperience extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10302_SecretGarden/Q10302_SecretGarden.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10302_SecretGarden/Q10302_SecretGarden.java
index 248f7d1e18..91479a98b0 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10302_SecretGarden/Q10302_SecretGarden.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10302_SecretGarden/Q10302_SecretGarden.java
@@ -53,7 +53,7 @@ public class Q10302_SecretGarden extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -68,7 +68,7 @@ public class Q10302_SecretGarden extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10303_DeathMysteries/Q10303_DeathMysteries.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10303_DeathMysteries/Q10303_DeathMysteries.java
index 76ff3d68a7..e91fc4e8f9 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10303_DeathMysteries/Q10303_DeathMysteries.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10303_DeathMysteries/Q10303_DeathMysteries.java
@@ -54,7 +54,7 @@ public class Q10303_DeathMysteries extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
@@ -69,7 +69,7 @@ public class Q10303_DeathMysteries extends Quest
 				if (!questState.isStarted() && !questState.isCompleted())
 				{
 					questState.startQuest();
-					onAdvEvent("TELEPORT", npc, player);
+					onEvent("TELEPORT", npc, player);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10304_ANewLook/Q10304_ANewLook.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10304_ANewLook/Q10304_ANewLook.java
index 16d0781736..90060f2780 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10304_ANewLook/Q10304_ANewLook.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10304_ANewLook/Q10304_ANewLook.java
@@ -52,7 +52,7 @@ public class Q10304_ANewLook extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10305_SporeInfestedPlace/Q10305_SporeInfestedPlace.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10305_SporeInfestedPlace/Q10305_SporeInfestedPlace.java
index d1ba8d42a9..cff726baf9 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10305_SporeInfestedPlace/Q10305_SporeInfestedPlace.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10305_SporeInfestedPlace/Q10305_SporeInfestedPlace.java
@@ -57,7 +57,7 @@ public class Q10305_SporeInfestedPlace extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10306_PeaceInTheCemetery1/Q10306_PeaceInTheCemetery1.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10306_PeaceInTheCemetery1/Q10306_PeaceInTheCemetery1.java
index 9a76ddc261..68124e88dd 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10306_PeaceInTheCemetery1/Q10306_PeaceInTheCemetery1.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10306_PeaceInTheCemetery1/Q10306_PeaceInTheCemetery1.java
@@ -60,7 +60,7 @@ public class Q10306_PeaceInTheCemetery1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10307_PeaceInTheCemetery2/Q10307_PeaceInTheCemetery2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10307_PeaceInTheCemetery2/Q10307_PeaceInTheCemetery2.java
index 71fe8db0ca..519c2853e4 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10307_PeaceInTheCemetery2/Q10307_PeaceInTheCemetery2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10307_PeaceInTheCemetery2/Q10307_PeaceInTheCemetery2.java
@@ -57,7 +57,7 @@ public class Q10307_PeaceInTheCemetery2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10308_PeaceInTheCemetery3/Q10308_PeaceInTheCemetery3.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10308_PeaceInTheCemetery3/Q10308_PeaceInTheCemetery3.java
index c8cee83e81..926ddfcca6 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10308_PeaceInTheCemetery3/Q10308_PeaceInTheCemetery3.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10308_PeaceInTheCemetery3/Q10308_PeaceInTheCemetery3.java
@@ -64,7 +64,7 @@ public class Q10308_PeaceInTheCemetery3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10309_PeaceInTheCemetery3/Q10309_PeaceInTheCemetery3.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10309_PeaceInTheCemetery3/Q10309_PeaceInTheCemetery3.java
index ac46d5621a..42e289611e 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10309_PeaceInTheCemetery3/Q10309_PeaceInTheCemetery3.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10309_PeaceInTheCemetery3/Q10309_PeaceInTheCemetery3.java
@@ -64,7 +64,7 @@ public class Q10309_PeaceInTheCemetery3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10310_PeaceInTheCemetery3/Q10310_PeaceInTheCemetery3.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10310_PeaceInTheCemetery3/Q10310_PeaceInTheCemetery3.java
index bc4da0893d..c8a8d982ba 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10310_PeaceInTheCemetery3/Q10310_PeaceInTheCemetery3.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10310_PeaceInTheCemetery3/Q10310_PeaceInTheCemetery3.java
@@ -64,7 +64,7 @@ public class Q10310_PeaceInTheCemetery3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10311_PeaceInTheCemetery3/Q10311_PeaceInTheCemetery3.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10311_PeaceInTheCemetery3/Q10311_PeaceInTheCemetery3.java
index 96efd42c30..a527e43e2c 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10311_PeaceInTheCemetery3/Q10311_PeaceInTheCemetery3.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10311_PeaceInTheCemetery3/Q10311_PeaceInTheCemetery3.java
@@ -64,7 +64,7 @@ public class Q10311_PeaceInTheCemetery3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10312_PeaceInTheCemetery3/Q10312_PeaceInTheCemetery3.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10312_PeaceInTheCemetery3/Q10312_PeaceInTheCemetery3.java
index b1e6037abc..147dbe61bf 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10312_PeaceInTheCemetery3/Q10312_PeaceInTheCemetery3.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10312_PeaceInTheCemetery3/Q10312_PeaceInTheCemetery3.java
@@ -64,7 +64,7 @@ public class Q10312_PeaceInTheCemetery3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10313_PeaceInTheCemetery3/Q10313_PeaceInTheCemetery3.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10313_PeaceInTheCemetery3/Q10313_PeaceInTheCemetery3.java
index 5d2bce48b0..68d19c33a6 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10313_PeaceInTheCemetery3/Q10313_PeaceInTheCemetery3.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10313_PeaceInTheCemetery3/Q10313_PeaceInTheCemetery3.java
@@ -64,7 +64,7 @@ public class Q10313_PeaceInTheCemetery3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10314_PeaceInTheCemetery3/Q10314_PeaceInTheCemetery3.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10314_PeaceInTheCemetery3/Q10314_PeaceInTheCemetery3.java
index 03812c174e..72bb0ae474 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10314_PeaceInTheCemetery3/Q10314_PeaceInTheCemetery3.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10314_PeaceInTheCemetery3/Q10314_PeaceInTheCemetery3.java
@@ -64,7 +64,7 @@ public class Q10314_PeaceInTheCemetery3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10315_PeaceInTheCemetery3/Q10315_PeaceInTheCemetery3.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10315_PeaceInTheCemetery3/Q10315_PeaceInTheCemetery3.java
index b39bfcb9b5..67c3928cb9 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10315_PeaceInTheCemetery3/Q10315_PeaceInTheCemetery3.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10315_PeaceInTheCemetery3/Q10315_PeaceInTheCemetery3.java
@@ -64,7 +64,7 @@ public class Q10315_PeaceInTheCemetery3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10316_PeaceInTheCemetery3/Q10316_PeaceInTheCemetery3.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10316_PeaceInTheCemetery3/Q10316_PeaceInTheCemetery3.java
index 1aae3fde0d..64b929b058 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10316_PeaceInTheCemetery3/Q10316_PeaceInTheCemetery3.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10316_PeaceInTheCemetery3/Q10316_PeaceInTheCemetery3.java
@@ -64,7 +64,7 @@ public class Q10316_PeaceInTheCemetery3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10317_PeaceInTheCemetery3/Q10317_PeaceInTheCemetery3.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10317_PeaceInTheCemetery3/Q10317_PeaceInTheCemetery3.java
index b970e65444..e1f00228bb 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10317_PeaceInTheCemetery3/Q10317_PeaceInTheCemetery3.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10317_PeaceInTheCemetery3/Q10317_PeaceInTheCemetery3.java
@@ -64,7 +64,7 @@ public class Q10317_PeaceInTheCemetery3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10318_PeaceInTheCemetery3/Q10318_PeaceInTheCemetery3.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10318_PeaceInTheCemetery3/Q10318_PeaceInTheCemetery3.java
index d1d8449599..6f31316e04 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10318_PeaceInTheCemetery3/Q10318_PeaceInTheCemetery3.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10318_PeaceInTheCemetery3/Q10318_PeaceInTheCemetery3.java
@@ -64,7 +64,7 @@ public class Q10318_PeaceInTheCemetery3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10319_PeaceInTheCemetery3/Q10319_PeaceInTheCemetery3.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10319_PeaceInTheCemetery3/Q10319_PeaceInTheCemetery3.java
index 46451bf52c..c3e66811e9 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10319_PeaceInTheCemetery3/Q10319_PeaceInTheCemetery3.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10319_PeaceInTheCemetery3/Q10319_PeaceInTheCemetery3.java
@@ -64,7 +64,7 @@ public class Q10319_PeaceInTheCemetery3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10320_PeaceInTheCemetery3/Q10320_PeaceInTheCemetery3.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10320_PeaceInTheCemetery3/Q10320_PeaceInTheCemetery3.java
index 16a3e185f3..3e1fd2ae6e 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10320_PeaceInTheCemetery3/Q10320_PeaceInTheCemetery3.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10320_PeaceInTheCemetery3/Q10320_PeaceInTheCemetery3.java
@@ -64,7 +64,7 @@ public class Q10320_PeaceInTheCemetery3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10321_PeaceInTheCemetery4/Q10321_PeaceInTheCemetery4.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10321_PeaceInTheCemetery4/Q10321_PeaceInTheCemetery4.java
index 135ed69483..101a507e49 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10321_PeaceInTheCemetery4/Q10321_PeaceInTheCemetery4.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10321_PeaceInTheCemetery4/Q10321_PeaceInTheCemetery4.java
@@ -64,7 +64,7 @@ public class Q10321_PeaceInTheCemetery4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10322_PayRespectToFallenBrethren1/Q10322_PayRespectToFallenBrethren1.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10322_PayRespectToFallenBrethren1/Q10322_PayRespectToFallenBrethren1.java
index f5ec7cd1dd..b86aa06577 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10322_PayRespectToFallenBrethren1/Q10322_PayRespectToFallenBrethren1.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10322_PayRespectToFallenBrethren1/Q10322_PayRespectToFallenBrethren1.java
@@ -61,7 +61,7 @@ public class Q10322_PayRespectToFallenBrethren1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10323_PayRespectToFallenBrethren2/Q10323_PayRespectToFallenBrethren2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10323_PayRespectToFallenBrethren2/Q10323_PayRespectToFallenBrethren2.java
index 78bad85381..32b0b7332c 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10323_PayRespectToFallenBrethren2/Q10323_PayRespectToFallenBrethren2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10323_PayRespectToFallenBrethren2/Q10323_PayRespectToFallenBrethren2.java
@@ -60,7 +60,7 @@ public class Q10323_PayRespectToFallenBrethren2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10324_PayRespectToFallenBrethren3/Q10324_PayRespectToFallenBrethren3.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10324_PayRespectToFallenBrethren3/Q10324_PayRespectToFallenBrethren3.java
index 978e0a844d..e89ae98420 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10324_PayRespectToFallenBrethren3/Q10324_PayRespectToFallenBrethren3.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10324_PayRespectToFallenBrethren3/Q10324_PayRespectToFallenBrethren3.java
@@ -60,7 +60,7 @@ public class Q10324_PayRespectToFallenBrethren3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10325_PayRespectToFallenBrethren4/Q10325_PayRespectToFallenBrethren4.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10325_PayRespectToFallenBrethren4/Q10325_PayRespectToFallenBrethren4.java
index 5ba6a8cf9f..2c94e9505a 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10325_PayRespectToFallenBrethren4/Q10325_PayRespectToFallenBrethren4.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10325_PayRespectToFallenBrethren4/Q10325_PayRespectToFallenBrethren4.java
@@ -60,7 +60,7 @@ public class Q10325_PayRespectToFallenBrethren4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10326_MemoryOfTheGloriousPast1/Q10326_MemoryOfTheGloriousPast1.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10326_MemoryOfTheGloriousPast1/Q10326_MemoryOfTheGloriousPast1.java
index 07498ec16c..08a827f7ae 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10326_MemoryOfTheGloriousPast1/Q10326_MemoryOfTheGloriousPast1.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10326_MemoryOfTheGloriousPast1/Q10326_MemoryOfTheGloriousPast1.java
@@ -54,7 +54,7 @@ public class Q10326_MemoryOfTheGloriousPast1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10327_MemoryOfTheGloriousPast2/Q10327_MemoryOfTheGloriousPast2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10327_MemoryOfTheGloriousPast2/Q10327_MemoryOfTheGloriousPast2.java
index 1829b1c609..6339da8dbf 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10327_MemoryOfTheGloriousPast2/Q10327_MemoryOfTheGloriousPast2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10327_MemoryOfTheGloriousPast2/Q10327_MemoryOfTheGloriousPast2.java
@@ -61,7 +61,7 @@ public class Q10327_MemoryOfTheGloriousPast2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10328_MemoryOfTheGloriousPast2/Q10328_MemoryOfTheGloriousPast2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10328_MemoryOfTheGloriousPast2/Q10328_MemoryOfTheGloriousPast2.java
index a947485729..adae2cfa63 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10328_MemoryOfTheGloriousPast2/Q10328_MemoryOfTheGloriousPast2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10328_MemoryOfTheGloriousPast2/Q10328_MemoryOfTheGloriousPast2.java
@@ -61,7 +61,7 @@ public class Q10328_MemoryOfTheGloriousPast2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10329_MemoryOfTheGloriousPast2/Q10329_MemoryOfTheGloriousPast2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10329_MemoryOfTheGloriousPast2/Q10329_MemoryOfTheGloriousPast2.java
index 5979271469..ba32f7375e 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10329_MemoryOfTheGloriousPast2/Q10329_MemoryOfTheGloriousPast2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10329_MemoryOfTheGloriousPast2/Q10329_MemoryOfTheGloriousPast2.java
@@ -61,7 +61,7 @@ public class Q10329_MemoryOfTheGloriousPast2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10330_MemoryOfTheGloriousPast2/Q10330_MemoryOfTheGloriousPast2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10330_MemoryOfTheGloriousPast2/Q10330_MemoryOfTheGloriousPast2.java
index 32f2451b65..faaef11e61 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10330_MemoryOfTheGloriousPast2/Q10330_MemoryOfTheGloriousPast2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10330_MemoryOfTheGloriousPast2/Q10330_MemoryOfTheGloriousPast2.java
@@ -61,7 +61,7 @@ public class Q10330_MemoryOfTheGloriousPast2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10331_MemoryOfTheGloriousPast2/Q10331_MemoryOfTheGloriousPast2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10331_MemoryOfTheGloriousPast2/Q10331_MemoryOfTheGloriousPast2.java
index b954e64f8e..07222de460 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10331_MemoryOfTheGloriousPast2/Q10331_MemoryOfTheGloriousPast2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10331_MemoryOfTheGloriousPast2/Q10331_MemoryOfTheGloriousPast2.java
@@ -61,7 +61,7 @@ public class Q10331_MemoryOfTheGloriousPast2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10332_MemoryOfTheGloriousPast2/Q10332_MemoryOfTheGloriousPast2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10332_MemoryOfTheGloriousPast2/Q10332_MemoryOfTheGloriousPast2.java
index 1ca18a6e66..813a0cfc5d 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10332_MemoryOfTheGloriousPast2/Q10332_MemoryOfTheGloriousPast2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10332_MemoryOfTheGloriousPast2/Q10332_MemoryOfTheGloriousPast2.java
@@ -61,7 +61,7 @@ public class Q10332_MemoryOfTheGloriousPast2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10333_MemoryOfTheGloriousPast2/Q10333_MemoryOfTheGloriousPast2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10333_MemoryOfTheGloriousPast2/Q10333_MemoryOfTheGloriousPast2.java
index 8b32ba0eca..903f5131ef 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10333_MemoryOfTheGloriousPast2/Q10333_MemoryOfTheGloriousPast2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10333_MemoryOfTheGloriousPast2/Q10333_MemoryOfTheGloriousPast2.java
@@ -61,7 +61,7 @@ public class Q10333_MemoryOfTheGloriousPast2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10334_MemoryOfTheGloriousPast2/Q10334_MemoryOfTheGloriousPast2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10334_MemoryOfTheGloriousPast2/Q10334_MemoryOfTheGloriousPast2.java
index f4e668c185..b1c0cd890f 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10334_MemoryOfTheGloriousPast2/Q10334_MemoryOfTheGloriousPast2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10334_MemoryOfTheGloriousPast2/Q10334_MemoryOfTheGloriousPast2.java
@@ -61,7 +61,7 @@ public class Q10334_MemoryOfTheGloriousPast2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10335_MemoryOfTheGloriousPast2/Q10335_MemoryOfTheGloriousPast2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10335_MemoryOfTheGloriousPast2/Q10335_MemoryOfTheGloriousPast2.java
index 6e1b9931de..b7212b3359 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10335_MemoryOfTheGloriousPast2/Q10335_MemoryOfTheGloriousPast2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10335_MemoryOfTheGloriousPast2/Q10335_MemoryOfTheGloriousPast2.java
@@ -61,7 +61,7 @@ public class Q10335_MemoryOfTheGloriousPast2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10336_MemoryOfTheGloriousPast2/Q10336_MemoryOfTheGloriousPast2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10336_MemoryOfTheGloriousPast2/Q10336_MemoryOfTheGloriousPast2.java
index 99730cefac..0232ffea19 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10336_MemoryOfTheGloriousPast2/Q10336_MemoryOfTheGloriousPast2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10336_MemoryOfTheGloriousPast2/Q10336_MemoryOfTheGloriousPast2.java
@@ -61,7 +61,7 @@ public class Q10336_MemoryOfTheGloriousPast2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10337_MemoryOfTheGloriousPast2/Q10337_MemoryOfTheGloriousPast2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10337_MemoryOfTheGloriousPast2/Q10337_MemoryOfTheGloriousPast2.java
index b599ab6607..7dd0bafce7 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10337_MemoryOfTheGloriousPast2/Q10337_MemoryOfTheGloriousPast2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10337_MemoryOfTheGloriousPast2/Q10337_MemoryOfTheGloriousPast2.java
@@ -61,7 +61,7 @@ public class Q10337_MemoryOfTheGloriousPast2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10338_MemoryOfTheGloriousPast2/Q10338_MemoryOfTheGloriousPast2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10338_MemoryOfTheGloriousPast2/Q10338_MemoryOfTheGloriousPast2.java
index 02955f8617..487575363b 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10338_MemoryOfTheGloriousPast2/Q10338_MemoryOfTheGloriousPast2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10338_MemoryOfTheGloriousPast2/Q10338_MemoryOfTheGloriousPast2.java
@@ -61,7 +61,7 @@ public class Q10338_MemoryOfTheGloriousPast2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10339_MemoryOfTheGloriousPast2/Q10339_MemoryOfTheGloriousPast2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10339_MemoryOfTheGloriousPast2/Q10339_MemoryOfTheGloriousPast2.java
index aa28d9b257..8bca98eeac 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10339_MemoryOfTheGloriousPast2/Q10339_MemoryOfTheGloriousPast2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10339_MemoryOfTheGloriousPast2/Q10339_MemoryOfTheGloriousPast2.java
@@ -61,7 +61,7 @@ public class Q10339_MemoryOfTheGloriousPast2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10340_MemoryOfTheGloriousPast3/Q10340_MemoryOfTheGloriousPast3.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10340_MemoryOfTheGloriousPast3/Q10340_MemoryOfTheGloriousPast3.java
index 4bb58b495a..8b2cd6c07f 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10340_MemoryOfTheGloriousPast3/Q10340_MemoryOfTheGloriousPast3.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10340_MemoryOfTheGloriousPast3/Q10340_MemoryOfTheGloriousPast3.java
@@ -61,7 +61,7 @@ public class Q10340_MemoryOfTheGloriousPast3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10341_MemoryOfTheGloriousPast4/Q10341_MemoryOfTheGloriousPast4.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10341_MemoryOfTheGloriousPast4/Q10341_MemoryOfTheGloriousPast4.java
index c6bda4b550..6c4503695b 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10341_MemoryOfTheGloriousPast4/Q10341_MemoryOfTheGloriousPast4.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10341_MemoryOfTheGloriousPast4/Q10341_MemoryOfTheGloriousPast4.java
@@ -61,7 +61,7 @@ public class Q10341_MemoryOfTheGloriousPast4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10342_TracesOfBattle1/Q10342_TracesOfBattle1.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10342_TracesOfBattle1/Q10342_TracesOfBattle1.java
index 032711d570..cfa2f78fb6 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10342_TracesOfBattle1/Q10342_TracesOfBattle1.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10342_TracesOfBattle1/Q10342_TracesOfBattle1.java
@@ -57,7 +57,7 @@ public class Q10342_TracesOfBattle1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10343_TracesOfBattle2/Q10343_TracesOfBattle2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10343_TracesOfBattle2/Q10343_TracesOfBattle2.java
index 01e092f2ac..f47f4f89e5 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10343_TracesOfBattle2/Q10343_TracesOfBattle2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10343_TracesOfBattle2/Q10343_TracesOfBattle2.java
@@ -57,7 +57,7 @@ public class Q10343_TracesOfBattle2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10344_TracesOfBattle3/Q10344_TracesOfBattle3.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10344_TracesOfBattle3/Q10344_TracesOfBattle3.java
index 6a75945317..afe88ab8e1 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10344_TracesOfBattle3/Q10344_TracesOfBattle3.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10344_TracesOfBattle3/Q10344_TracesOfBattle3.java
@@ -57,7 +57,7 @@ public class Q10344_TracesOfBattle3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10345_TracesOfBattle4/Q10345_TracesOfBattle4.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10345_TracesOfBattle4/Q10345_TracesOfBattle4.java
index 607fe7dfca..d0c2ffcdee 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10345_TracesOfBattle4/Q10345_TracesOfBattle4.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10345_TracesOfBattle4/Q10345_TracesOfBattle4.java
@@ -57,7 +57,7 @@ public class Q10345_TracesOfBattle4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10346_TracesOfBattle5/Q10346_TracesOfBattle5.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10346_TracesOfBattle5/Q10346_TracesOfBattle5.java
index fad7d5fff9..31cfc2aa51 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10346_TracesOfBattle5/Q10346_TracesOfBattle5.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10346_TracesOfBattle5/Q10346_TracesOfBattle5.java
@@ -57,7 +57,7 @@ public class Q10346_TracesOfBattle5 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10347_NotSoSilentValley1/Q10347_NotSoSilentValley1.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10347_NotSoSilentValley1/Q10347_NotSoSilentValley1.java
index 7b0bd5b82d..53259effe9 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10347_NotSoSilentValley1/Q10347_NotSoSilentValley1.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10347_NotSoSilentValley1/Q10347_NotSoSilentValley1.java
@@ -58,7 +58,7 @@ public class Q10347_NotSoSilentValley1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10348_NotSoSilentValley2/Q10348_NotSoSilentValley2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10348_NotSoSilentValley2/Q10348_NotSoSilentValley2.java
index ad42624ac9..61d761fd6a 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10348_NotSoSilentValley2/Q10348_NotSoSilentValley2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10348_NotSoSilentValley2/Q10348_NotSoSilentValley2.java
@@ -58,7 +58,7 @@ public class Q10348_NotSoSilentValley2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10349_NotSoSilentValley3/Q10349_NotSoSilentValley3.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10349_NotSoSilentValley3/Q10349_NotSoSilentValley3.java
index 5e7a06db04..6e762d9b6c 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10349_NotSoSilentValley3/Q10349_NotSoSilentValley3.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10349_NotSoSilentValley3/Q10349_NotSoSilentValley3.java
@@ -58,7 +58,7 @@ public class Q10349_NotSoSilentValley3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10350_NotSoSilentValley4/Q10350_NotSoSilentValley4.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10350_NotSoSilentValley4/Q10350_NotSoSilentValley4.java
index 0cbb412e31..7a168bee4a 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10350_NotSoSilentValley4/Q10350_NotSoSilentValley4.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10350_NotSoSilentValley4/Q10350_NotSoSilentValley4.java
@@ -58,7 +58,7 @@ public class Q10350_NotSoSilentValley4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10351_NotSoSilentValley5/Q10351_NotSoSilentValley5.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10351_NotSoSilentValley5/Q10351_NotSoSilentValley5.java
index 389799725b..9a7fd77dd8 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10351_NotSoSilentValley5/Q10351_NotSoSilentValley5.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10351_NotSoSilentValley5/Q10351_NotSoSilentValley5.java
@@ -58,7 +58,7 @@ public class Q10351_NotSoSilentValley5 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10352_StopTheLizardmen1/Q10352_StopTheLizardmen1.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10352_StopTheLizardmen1/Q10352_StopTheLizardmen1.java
index d591bead9d..2804acba8a 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10352_StopTheLizardmen1/Q10352_StopTheLizardmen1.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10352_StopTheLizardmen1/Q10352_StopTheLizardmen1.java
@@ -53,7 +53,7 @@ public class Q10352_StopTheLizardmen1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10353_StopTheLizardmen2/Q10353_StopTheLizardmen2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10353_StopTheLizardmen2/Q10353_StopTheLizardmen2.java
index 0faf8bdf15..aaf365bfa8 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10353_StopTheLizardmen2/Q10353_StopTheLizardmen2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10353_StopTheLizardmen2/Q10353_StopTheLizardmen2.java
@@ -53,7 +53,7 @@ public class Q10353_StopTheLizardmen2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10354_StopTheLizardmen3/Q10354_StopTheLizardmen3.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10354_StopTheLizardmen3/Q10354_StopTheLizardmen3.java
index 96eb45115d..abc7c1056c 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10354_StopTheLizardmen3/Q10354_StopTheLizardmen3.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10354_StopTheLizardmen3/Q10354_StopTheLizardmen3.java
@@ -53,7 +53,7 @@ public class Q10354_StopTheLizardmen3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10355_StopTheLizardmen4/Q10355_StopTheLizardmen4.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10355_StopTheLizardmen4/Q10355_StopTheLizardmen4.java
index c267a0ada1..55558583dc 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10355_StopTheLizardmen4/Q10355_StopTheLizardmen4.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10355_StopTheLizardmen4/Q10355_StopTheLizardmen4.java
@@ -53,7 +53,7 @@ public class Q10355_StopTheLizardmen4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10356_StopTheLizardmen5/Q10356_StopTheLizardmen5.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10356_StopTheLizardmen5/Q10356_StopTheLizardmen5.java
index 699f714a3e..93e2f05fd3 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10356_StopTheLizardmen5/Q10356_StopTheLizardmen5.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10356_StopTheLizardmen5/Q10356_StopTheLizardmen5.java
@@ -53,7 +53,7 @@ public class Q10356_StopTheLizardmen5 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10357_ReconnaissanceInTheWesternDragonValley1/Q10357_ReconnaissanceInTheWesternDragonValley1.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10357_ReconnaissanceInTheWesternDragonValley1/Q10357_ReconnaissanceInTheWesternDragonValley1.java
index beb3e81521..5acdc35cbd 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10357_ReconnaissanceInTheWesternDragonValley1/Q10357_ReconnaissanceInTheWesternDragonValley1.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10357_ReconnaissanceInTheWesternDragonValley1/Q10357_ReconnaissanceInTheWesternDragonValley1.java
@@ -67,7 +67,7 @@ public class Q10357_ReconnaissanceInTheWesternDragonValley1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10358_ReconnaissanceInTheWesternDragonValley2/Q10358_ReconnaissanceInTheWesternDragonValley2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10358_ReconnaissanceInTheWesternDragonValley2/Q10358_ReconnaissanceInTheWesternDragonValley2.java
index a843f30d67..afdfe58453 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10358_ReconnaissanceInTheWesternDragonValley2/Q10358_ReconnaissanceInTheWesternDragonValley2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10358_ReconnaissanceInTheWesternDragonValley2/Q10358_ReconnaissanceInTheWesternDragonValley2.java
@@ -67,7 +67,7 @@ public class Q10358_ReconnaissanceInTheWesternDragonValley2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10359_ReconnaissanceInTheWesternDragonValley3/Q10359_ReconnaissanceInTheWesternDragonValley3.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10359_ReconnaissanceInTheWesternDragonValley3/Q10359_ReconnaissanceInTheWesternDragonValley3.java
index 71dd15a33f..2e842576dd 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10359_ReconnaissanceInTheWesternDragonValley3/Q10359_ReconnaissanceInTheWesternDragonValley3.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10359_ReconnaissanceInTheWesternDragonValley3/Q10359_ReconnaissanceInTheWesternDragonValley3.java
@@ -67,7 +67,7 @@ public class Q10359_ReconnaissanceInTheWesternDragonValley3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10360_ReconnaissanceInTheWesternDragonValley4/Q10360_ReconnaissanceInTheWesternDragonValley4.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10360_ReconnaissanceInTheWesternDragonValley4/Q10360_ReconnaissanceInTheWesternDragonValley4.java
index d6e847a184..23d446636f 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10360_ReconnaissanceInTheWesternDragonValley4/Q10360_ReconnaissanceInTheWesternDragonValley4.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10360_ReconnaissanceInTheWesternDragonValley4/Q10360_ReconnaissanceInTheWesternDragonValley4.java
@@ -67,7 +67,7 @@ public class Q10360_ReconnaissanceInTheWesternDragonValley4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10361_ReconnaissanceInTheWesternDragonValley5/Q10361_ReconnaissanceInTheWesternDragonValley5.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10361_ReconnaissanceInTheWesternDragonValley5/Q10361_ReconnaissanceInTheWesternDragonValley5.java
index f69305ef47..3dadd56607 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10361_ReconnaissanceInTheWesternDragonValley5/Q10361_ReconnaissanceInTheWesternDragonValley5.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10361_ReconnaissanceInTheWesternDragonValley5/Q10361_ReconnaissanceInTheWesternDragonValley5.java
@@ -67,7 +67,7 @@ public class Q10361_ReconnaissanceInTheWesternDragonValley5 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10362_ExploringTheCrumaTowers3rdFloor1/Q10362_ExploringTheCrumaTowers3rdFloor1.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10362_ExploringTheCrumaTowers3rdFloor1/Q10362_ExploringTheCrumaTowers3rdFloor1.java
index 2add171ed5..b7acbd399c 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10362_ExploringTheCrumaTowers3rdFloor1/Q10362_ExploringTheCrumaTowers3rdFloor1.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10362_ExploringTheCrumaTowers3rdFloor1/Q10362_ExploringTheCrumaTowers3rdFloor1.java
@@ -53,7 +53,7 @@ public class Q10362_ExploringTheCrumaTowers3rdFloor1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10363_ExploringTheCrumaTowers3rdFloor2/Q10363_ExploringTheCrumaTowers3rdFloor2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10363_ExploringTheCrumaTowers3rdFloor2/Q10363_ExploringTheCrumaTowers3rdFloor2.java
index 5447a145b8..57a1836081 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10363_ExploringTheCrumaTowers3rdFloor2/Q10363_ExploringTheCrumaTowers3rdFloor2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10363_ExploringTheCrumaTowers3rdFloor2/Q10363_ExploringTheCrumaTowers3rdFloor2.java
@@ -53,7 +53,7 @@ public class Q10363_ExploringTheCrumaTowers3rdFloor2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10364_ExploringTheCrumaTowers3rdFloor3/Q10364_ExploringTheCrumaTowers3rdFloor3.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10364_ExploringTheCrumaTowers3rdFloor3/Q10364_ExploringTheCrumaTowers3rdFloor3.java
index 706aa09a7c..cba5e6ae43 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10364_ExploringTheCrumaTowers3rdFloor3/Q10364_ExploringTheCrumaTowers3rdFloor3.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10364_ExploringTheCrumaTowers3rdFloor3/Q10364_ExploringTheCrumaTowers3rdFloor3.java
@@ -53,7 +53,7 @@ public class Q10364_ExploringTheCrumaTowers3rdFloor3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10365_ExploringTheCrumaTowers3rdFloor4/Q10365_ExploringTheCrumaTowers3rdFloor4.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10365_ExploringTheCrumaTowers3rdFloor4/Q10365_ExploringTheCrumaTowers3rdFloor4.java
index 28191abca8..7981fec32f 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10365_ExploringTheCrumaTowers3rdFloor4/Q10365_ExploringTheCrumaTowers3rdFloor4.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10365_ExploringTheCrumaTowers3rdFloor4/Q10365_ExploringTheCrumaTowers3rdFloor4.java
@@ -53,7 +53,7 @@ public class Q10365_ExploringTheCrumaTowers3rdFloor4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10366_ExploringTheCrumaTowers3rdFloor5/Q10366_ExploringTheCrumaTowers3rdFloor5.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10366_ExploringTheCrumaTowers3rdFloor5/Q10366_ExploringTheCrumaTowers3rdFloor5.java
index 3c1f1e86e0..f8747102ad 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10366_ExploringTheCrumaTowers3rdFloor5/Q10366_ExploringTheCrumaTowers3rdFloor5.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10366_ExploringTheCrumaTowers3rdFloor5/Q10366_ExploringTheCrumaTowers3rdFloor5.java
@@ -53,7 +53,7 @@ public class Q10366_ExploringTheCrumaTowers3rdFloor5 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10367_ThwartingDragonsPlans1/Q10367_ThwartingDragonsPlans1.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10367_ThwartingDragonsPlans1/Q10367_ThwartingDragonsPlans1.java
index 92be16e98a..e6db5f2cdc 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10367_ThwartingDragonsPlans1/Q10367_ThwartingDragonsPlans1.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10367_ThwartingDragonsPlans1/Q10367_ThwartingDragonsPlans1.java
@@ -50,7 +50,7 @@ public class Q10367_ThwartingDragonsPlans1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10368_ThwartingDragonsPlans2/Q10368_ThwartingDragonsPlans2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10368_ThwartingDragonsPlans2/Q10368_ThwartingDragonsPlans2.java
index 9a52f5318f..3411ee46c7 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10368_ThwartingDragonsPlans2/Q10368_ThwartingDragonsPlans2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10368_ThwartingDragonsPlans2/Q10368_ThwartingDragonsPlans2.java
@@ -50,7 +50,7 @@ public class Q10368_ThwartingDragonsPlans2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10369_ThwartingDragonsPlans3/Q10369_ThwartingDragonsPlans3.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10369_ThwartingDragonsPlans3/Q10369_ThwartingDragonsPlans3.java
index 0801713186..76f76fcc36 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10369_ThwartingDragonsPlans3/Q10369_ThwartingDragonsPlans3.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10369_ThwartingDragonsPlans3/Q10369_ThwartingDragonsPlans3.java
@@ -50,7 +50,7 @@ public class Q10369_ThwartingDragonsPlans3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10370_ThwartingDragonsPlans4/Q10370_ThwartingDragonsPlans4.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10370_ThwartingDragonsPlans4/Q10370_ThwartingDragonsPlans4.java
index 9571b62b48..ee8cec62c2 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10370_ThwartingDragonsPlans4/Q10370_ThwartingDragonsPlans4.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10370_ThwartingDragonsPlans4/Q10370_ThwartingDragonsPlans4.java
@@ -50,7 +50,7 @@ public class Q10370_ThwartingDragonsPlans4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10371_ThwartingDragonsPlans5/Q10371_ThwartingDragonsPlans5.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10371_ThwartingDragonsPlans5/Q10371_ThwartingDragonsPlans5.java
index 184cad5daa..84ff438aaa 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10371_ThwartingDragonsPlans5/Q10371_ThwartingDragonsPlans5.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10371_ThwartingDragonsPlans5/Q10371_ThwartingDragonsPlans5.java
@@ -56,7 +56,7 @@ public class Q10371_ThwartingDragonsPlans5 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10372_ExploringTheCrumaTowers2ndFloor1/Q10372_ExploringTheCrumaTowers2ndFloor1.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10372_ExploringTheCrumaTowers2ndFloor1/Q10372_ExploringTheCrumaTowers2ndFloor1.java
index b594b17563..470289c127 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10372_ExploringTheCrumaTowers2ndFloor1/Q10372_ExploringTheCrumaTowers2ndFloor1.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10372_ExploringTheCrumaTowers2ndFloor1/Q10372_ExploringTheCrumaTowers2ndFloor1.java
@@ -54,7 +54,7 @@ public class Q10372_ExploringTheCrumaTowers2ndFloor1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10373_ExploringTheCrumaTowers2ndFloor2/Q10373_ExploringTheCrumaTowers2ndFloor2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10373_ExploringTheCrumaTowers2ndFloor2/Q10373_ExploringTheCrumaTowers2ndFloor2.java
index f5deb5022a..33c361532d 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10373_ExploringTheCrumaTowers2ndFloor2/Q10373_ExploringTheCrumaTowers2ndFloor2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10373_ExploringTheCrumaTowers2ndFloor2/Q10373_ExploringTheCrumaTowers2ndFloor2.java
@@ -54,7 +54,7 @@ public class Q10373_ExploringTheCrumaTowers2ndFloor2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10374_ExploringTheCrumaTowers2ndFloor3/Q10374_ExploringTheCrumaTowers2ndFloor3.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10374_ExploringTheCrumaTowers2ndFloor3/Q10374_ExploringTheCrumaTowers2ndFloor3.java
index 27954770fb..c33a56cb22 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10374_ExploringTheCrumaTowers2ndFloor3/Q10374_ExploringTheCrumaTowers2ndFloor3.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10374_ExploringTheCrumaTowers2ndFloor3/Q10374_ExploringTheCrumaTowers2ndFloor3.java
@@ -54,7 +54,7 @@ public class Q10374_ExploringTheCrumaTowers2ndFloor3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10375_ExploringTheCrumaTowers2ndFloor4/Q10375_ExploringTheCrumaTowers2ndFloor4.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10375_ExploringTheCrumaTowers2ndFloor4/Q10375_ExploringTheCrumaTowers2ndFloor4.java
index e41fb05787..914623b209 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10375_ExploringTheCrumaTowers2ndFloor4/Q10375_ExploringTheCrumaTowers2ndFloor4.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10375_ExploringTheCrumaTowers2ndFloor4/Q10375_ExploringTheCrumaTowers2ndFloor4.java
@@ -54,7 +54,7 @@ public class Q10375_ExploringTheCrumaTowers2ndFloor4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10376_ExploringTheCrumaTowers2ndFloor5/Q10376_ExploringTheCrumaTowers2ndFloor5.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10376_ExploringTheCrumaTowers2ndFloor5/Q10376_ExploringTheCrumaTowers2ndFloor5.java
index 8339aa0606..adc215db27 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10376_ExploringTheCrumaTowers2ndFloor5/Q10376_ExploringTheCrumaTowers2ndFloor5.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10376_ExploringTheCrumaTowers2ndFloor5/Q10376_ExploringTheCrumaTowers2ndFloor5.java
@@ -54,7 +54,7 @@ public class Q10376_ExploringTheCrumaTowers2ndFloor5 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10377_StopSelMahumTroops1/Q10377_StopSelMahumTroops1.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10377_StopSelMahumTroops1/Q10377_StopSelMahumTroops1.java
index fb207b4604..1aa1893f2d 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10377_StopSelMahumTroops1/Q10377_StopSelMahumTroops1.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10377_StopSelMahumTroops1/Q10377_StopSelMahumTroops1.java
@@ -49,7 +49,7 @@ public class Q10377_StopSelMahumTroops1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10378_StopSelMahumTroops2/Q10378_StopSelMahumTroops2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10378_StopSelMahumTroops2/Q10378_StopSelMahumTroops2.java
index 3bd20ac5fb..452fbbbb91 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10378_StopSelMahumTroops2/Q10378_StopSelMahumTroops2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10378_StopSelMahumTroops2/Q10378_StopSelMahumTroops2.java
@@ -49,7 +49,7 @@ public class Q10378_StopSelMahumTroops2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10379_StopSelMahumTroops3/Q10379_StopSelMahumTroops3.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10379_StopSelMahumTroops3/Q10379_StopSelMahumTroops3.java
index bd27d52336..131277a236 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10379_StopSelMahumTroops3/Q10379_StopSelMahumTroops3.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10379_StopSelMahumTroops3/Q10379_StopSelMahumTroops3.java
@@ -49,7 +49,7 @@ public class Q10379_StopSelMahumTroops3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10380_StopSelMahumTroops4/Q10380_StopSelMahumTroops4.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10380_StopSelMahumTroops4/Q10380_StopSelMahumTroops4.java
index e0f8699c24..81583d7945 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10380_StopSelMahumTroops4/Q10380_StopSelMahumTroops4.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10380_StopSelMahumTroops4/Q10380_StopSelMahumTroops4.java
@@ -49,7 +49,7 @@ public class Q10380_StopSelMahumTroops4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10381_StopSelMahumTroops5/Q10381_StopSelMahumTroops5.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10381_StopSelMahumTroops5/Q10381_StopSelMahumTroops5.java
index 9c9ef46b00..6f7e582fcc 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10381_StopSelMahumTroops5/Q10381_StopSelMahumTroops5.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10381_StopSelMahumTroops5/Q10381_StopSelMahumTroops5.java
@@ -49,7 +49,7 @@ public class Q10381_StopSelMahumTroops5 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10382_MutateGiantsResearch1/Q10382_MutateGiantsResearch1.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10382_MutateGiantsResearch1/Q10382_MutateGiantsResearch1.java
index 0371e34650..ca1c9dd295 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10382_MutateGiantsResearch1/Q10382_MutateGiantsResearch1.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10382_MutateGiantsResearch1/Q10382_MutateGiantsResearch1.java
@@ -49,7 +49,7 @@ public class Q10382_MutateGiantsResearch1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10383_MutateGiantsResearch2/Q10383_MutateGiantsResearch2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10383_MutateGiantsResearch2/Q10383_MutateGiantsResearch2.java
index 0a60d2d1c9..8fcf207ddf 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10383_MutateGiantsResearch2/Q10383_MutateGiantsResearch2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10383_MutateGiantsResearch2/Q10383_MutateGiantsResearch2.java
@@ -49,7 +49,7 @@ public class Q10383_MutateGiantsResearch2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10384_MutateGiantsResearch3/Q10384_MutateGiantsResearch3.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10384_MutateGiantsResearch3/Q10384_MutateGiantsResearch3.java
index cd3446f7b8..27ca89283b 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10384_MutateGiantsResearch3/Q10384_MutateGiantsResearch3.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10384_MutateGiantsResearch3/Q10384_MutateGiantsResearch3.java
@@ -49,7 +49,7 @@ public class Q10384_MutateGiantsResearch3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10385_MutateGiantsResearch4/Q10385_MutateGiantsResearch4.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10385_MutateGiantsResearch4/Q10385_MutateGiantsResearch4.java
index 319fe3862e..3b4380d5e2 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10385_MutateGiantsResearch4/Q10385_MutateGiantsResearch4.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10385_MutateGiantsResearch4/Q10385_MutateGiantsResearch4.java
@@ -49,7 +49,7 @@ public class Q10385_MutateGiantsResearch4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10386_MutateGiantsResearch5/Q10386_MutateGiantsResearch5.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10386_MutateGiantsResearch5/Q10386_MutateGiantsResearch5.java
index 10682d87a6..302e10ea59 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10386_MutateGiantsResearch5/Q10386_MutateGiantsResearch5.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10386_MutateGiantsResearch5/Q10386_MutateGiantsResearch5.java
@@ -52,7 +52,7 @@ public class Q10386_MutateGiantsResearch5 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10387_ProtectHotSpringsNepenthes1/Q10387_ProtectHotSpringsNepenthes1.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10387_ProtectHotSpringsNepenthes1/Q10387_ProtectHotSpringsNepenthes1.java
index 9ff89b7d33..46b08e082d 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10387_ProtectHotSpringsNepenthes1/Q10387_ProtectHotSpringsNepenthes1.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10387_ProtectHotSpringsNepenthes1/Q10387_ProtectHotSpringsNepenthes1.java
@@ -49,7 +49,7 @@ public class Q10387_ProtectHotSpringsNepenthes1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10388_ProtectHotSpringsNepenthes2/Q10388_ProtectHotSpringsNepenthes2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10388_ProtectHotSpringsNepenthes2/Q10388_ProtectHotSpringsNepenthes2.java
index ccb8d1ab90..3619883e02 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10388_ProtectHotSpringsNepenthes2/Q10388_ProtectHotSpringsNepenthes2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10388_ProtectHotSpringsNepenthes2/Q10388_ProtectHotSpringsNepenthes2.java
@@ -49,7 +49,7 @@ public class Q10388_ProtectHotSpringsNepenthes2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10389_ProtectHotSpringsNepenthes3/Q10389_ProtectHotSpringsNepenthes3.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10389_ProtectHotSpringsNepenthes3/Q10389_ProtectHotSpringsNepenthes3.java
index 6a8b471c71..9bb84512ce 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10389_ProtectHotSpringsNepenthes3/Q10389_ProtectHotSpringsNepenthes3.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10389_ProtectHotSpringsNepenthes3/Q10389_ProtectHotSpringsNepenthes3.java
@@ -49,7 +49,7 @@ public class Q10389_ProtectHotSpringsNepenthes3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10390_ProtectHotSpringsNepenthes4/Q10390_ProtectHotSpringsNepenthes4.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10390_ProtectHotSpringsNepenthes4/Q10390_ProtectHotSpringsNepenthes4.java
index e9c1d33a31..4fabe097c0 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10390_ProtectHotSpringsNepenthes4/Q10390_ProtectHotSpringsNepenthes4.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10390_ProtectHotSpringsNepenthes4/Q10390_ProtectHotSpringsNepenthes4.java
@@ -49,7 +49,7 @@ public class Q10390_ProtectHotSpringsNepenthes4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10391_ProtectHotSpringsNepenthes5/Q10391_ProtectHotSpringsNepenthes5.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10391_ProtectHotSpringsNepenthes5/Q10391_ProtectHotSpringsNepenthes5.java
index ee298d9be8..2fa193dc56 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10391_ProtectHotSpringsNepenthes5/Q10391_ProtectHotSpringsNepenthes5.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10391_ProtectHotSpringsNepenthes5/Q10391_ProtectHotSpringsNepenthes5.java
@@ -53,7 +53,7 @@ public class Q10391_ProtectHotSpringsNepenthes5 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10392_LoweringLizardmensAmbitions1/Q10392_LoweringLizardmensAmbitions1.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10392_LoweringLizardmensAmbitions1/Q10392_LoweringLizardmensAmbitions1.java
index f2bb00916a..5ca716a629 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10392_LoweringLizardmensAmbitions1/Q10392_LoweringLizardmensAmbitions1.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10392_LoweringLizardmensAmbitions1/Q10392_LoweringLizardmensAmbitions1.java
@@ -49,7 +49,7 @@ public class Q10392_LoweringLizardmensAmbitions1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10393_LoweringLizardmensAmbitions2/Q10393_LoweringLizardmensAmbitions2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10393_LoweringLizardmensAmbitions2/Q10393_LoweringLizardmensAmbitions2.java
index 3865bd0434..3c935bcc9e 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10393_LoweringLizardmensAmbitions2/Q10393_LoweringLizardmensAmbitions2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10393_LoweringLizardmensAmbitions2/Q10393_LoweringLizardmensAmbitions2.java
@@ -49,7 +49,7 @@ public class Q10393_LoweringLizardmensAmbitions2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10394_LoweringLizardmensAmbitions3/Q10394_LoweringLizardmensAmbitions3.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10394_LoweringLizardmensAmbitions3/Q10394_LoweringLizardmensAmbitions3.java
index f0949ce07c..d2da7d717a 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10394_LoweringLizardmensAmbitions3/Q10394_LoweringLizardmensAmbitions3.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10394_LoweringLizardmensAmbitions3/Q10394_LoweringLizardmensAmbitions3.java
@@ -49,7 +49,7 @@ public class Q10394_LoweringLizardmensAmbitions3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10395_LoweringLizardmensAmbitions4/Q10395_LoweringLizardmensAmbitions4.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10395_LoweringLizardmensAmbitions4/Q10395_LoweringLizardmensAmbitions4.java
index 9adfb66fc4..5349278d5f 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10395_LoweringLizardmensAmbitions4/Q10395_LoweringLizardmensAmbitions4.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10395_LoweringLizardmensAmbitions4/Q10395_LoweringLizardmensAmbitions4.java
@@ -49,7 +49,7 @@ public class Q10395_LoweringLizardmensAmbitions4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10396_LoweringLizardmensAmbitions5/Q10396_LoweringLizardmensAmbitions5.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10396_LoweringLizardmensAmbitions5/Q10396_LoweringLizardmensAmbitions5.java
index 8a8102a99d..e1ce118ef5 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10396_LoweringLizardmensAmbitions5/Q10396_LoweringLizardmensAmbitions5.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10396_LoweringLizardmensAmbitions5/Q10396_LoweringLizardmensAmbitions5.java
@@ -50,7 +50,7 @@ public class Q10396_LoweringLizardmensAmbitions5 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10397_HuntInTheForgottenGarden/Q10397_HuntInTheForgottenGarden.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10397_HuntInTheForgottenGarden/Q10397_HuntInTheForgottenGarden.java
index da400269a3..15bc68c14d 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10397_HuntInTheForgottenGarden/Q10397_HuntInTheForgottenGarden.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10397_HuntInTheForgottenGarden/Q10397_HuntInTheForgottenGarden.java
@@ -58,7 +58,7 @@ public class Q10397_HuntInTheForgottenGarden extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10398_HuntInTheTowerOfInsolence/Q10398_HuntInTheTowerOfInsolence.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10398_HuntInTheTowerOfInsolence/Q10398_HuntInTheTowerOfInsolence.java
index 87d3fd13fa..2a55b18996 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10398_HuntInTheTowerOfInsolence/Q10398_HuntInTheTowerOfInsolence.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10398_HuntInTheTowerOfInsolence/Q10398_HuntInTheTowerOfInsolence.java
@@ -56,7 +56,7 @@ public class Q10398_HuntInTheTowerOfInsolence extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10399_PaganTempleAndKelbimsFortress/Q10399_PaganTempleAndKelbimsFortress.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10399_PaganTempleAndKelbimsFortress/Q10399_PaganTempleAndKelbimsFortress.java
index 3130c6d24e..c6d782379c 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10399_PaganTempleAndKelbimsFortress/Q10399_PaganTempleAndKelbimsFortress.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10399_PaganTempleAndKelbimsFortress/Q10399_PaganTempleAndKelbimsFortress.java
@@ -63,7 +63,7 @@ public class Q10399_PaganTempleAndKelbimsFortress extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10400_InvitationToHellbound/Q10400_InvitationToHellbound.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10400_InvitationToHellbound/Q10400_InvitationToHellbound.java
index 3e3c30b1c2..29b5dd65e4 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10400_InvitationToHellbound/Q10400_InvitationToHellbound.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10400_InvitationToHellbound/Q10400_InvitationToHellbound.java
@@ -42,7 +42,7 @@ public class Q10400_InvitationToHellbound extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10401_StudyOfTheIvoryTowerCrater/Q10401_StudyOfTheIvoryTowerCrater.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10401_StudyOfTheIvoryTowerCrater/Q10401_StudyOfTheIvoryTowerCrater.java
index ebb6e6e36f..d4e6e4f308 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10401_StudyOfTheIvoryTowerCrater/Q10401_StudyOfTheIvoryTowerCrater.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10401_StudyOfTheIvoryTowerCrater/Q10401_StudyOfTheIvoryTowerCrater.java
@@ -52,7 +52,7 @@ public class Q10401_StudyOfTheIvoryTowerCrater extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10402_ExploringTheAncientBattleground/Q10402_ExploringTheAncientBattleground.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10402_ExploringTheAncientBattleground/Q10402_ExploringTheAncientBattleground.java
index 661083b722..2f78a20bf7 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10402_ExploringTheAncientBattleground/Q10402_ExploringTheAncientBattleground.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10402_ExploringTheAncientBattleground/Q10402_ExploringTheAncientBattleground.java
@@ -51,7 +51,7 @@ public class Q10402_ExploringTheAncientBattleground extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10403_ExploringTheEnchantedValley/Q10403_ExploringTheEnchantedValley.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10403_ExploringTheEnchantedValley/Q10403_ExploringTheEnchantedValley.java
index 32c9793ceb..537b5c368f 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10403_ExploringTheEnchantedValley/Q10403_ExploringTheEnchantedValley.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10403_ExploringTheEnchantedValley/Q10403_ExploringTheEnchantedValley.java
@@ -51,7 +51,7 @@ public class Q10403_ExploringTheEnchantedValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10404_ExploringAnghelWaterfall/Q10404_ExploringAnghelWaterfall.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10404_ExploringAnghelWaterfall/Q10404_ExploringAnghelWaterfall.java
index 28c9141c8c..7c9a676818 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10404_ExploringAnghelWaterfall/Q10404_ExploringAnghelWaterfall.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10404_ExploringAnghelWaterfall/Q10404_ExploringAnghelWaterfall.java
@@ -51,7 +51,7 @@ public class Q10404_ExploringAnghelWaterfall extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10405_ExploringTheBlazingSwamp/Q10405_ExploringTheBlazingSwamp.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10405_ExploringTheBlazingSwamp/Q10405_ExploringTheBlazingSwamp.java
index 44f3ea2e15..22987fd07b 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10405_ExploringTheBlazingSwamp/Q10405_ExploringTheBlazingSwamp.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10405_ExploringTheBlazingSwamp/Q10405_ExploringTheBlazingSwamp.java
@@ -51,7 +51,7 @@ public class Q10405_ExploringTheBlazingSwamp extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10406_InvadersOfTheIvoryTowerCrater/Q10406_InvadersOfTheIvoryTowerCrater.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10406_InvadersOfTheIvoryTowerCrater/Q10406_InvadersOfTheIvoryTowerCrater.java
index 02afa5a782..c22c98a142 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10406_InvadersOfTheIvoryTowerCrater/Q10406_InvadersOfTheIvoryTowerCrater.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10406_InvadersOfTheIvoryTowerCrater/Q10406_InvadersOfTheIvoryTowerCrater.java
@@ -49,7 +49,7 @@ public class Q10406_InvadersOfTheIvoryTowerCrater extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10407_InvadersOfTheAncientBattleground/Q10407_InvadersOfTheAncientBattleground.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10407_InvadersOfTheAncientBattleground/Q10407_InvadersOfTheAncientBattleground.java
index 3cfe5d9731..f242707fa0 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10407_InvadersOfTheAncientBattleground/Q10407_InvadersOfTheAncientBattleground.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10407_InvadersOfTheAncientBattleground/Q10407_InvadersOfTheAncientBattleground.java
@@ -49,7 +49,7 @@ public class Q10407_InvadersOfTheAncientBattleground extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10408_InvadersOfTheEnchantedValley/Q10408_InvadersOfTheEnchantedValley.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10408_InvadersOfTheEnchantedValley/Q10408_InvadersOfTheEnchantedValley.java
index 5440729e88..b6619f1815 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10408_InvadersOfTheEnchantedValley/Q10408_InvadersOfTheEnchantedValley.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10408_InvadersOfTheEnchantedValley/Q10408_InvadersOfTheEnchantedValley.java
@@ -49,7 +49,7 @@ public class Q10408_InvadersOfTheEnchantedValley extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10409_InvadersOfAnghelWaterfall/Q10409_InvadersOfAnghelWaterfall.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10409_InvadersOfAnghelWaterfall/Q10409_InvadersOfAnghelWaterfall.java
index 6e354ec2c3..8341f32dc8 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10409_InvadersOfAnghelWaterfall/Q10409_InvadersOfAnghelWaterfall.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10409_InvadersOfAnghelWaterfall/Q10409_InvadersOfAnghelWaterfall.java
@@ -49,7 +49,7 @@ public class Q10409_InvadersOfAnghelWaterfall extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10410_InvadersOfTheBlazingSwamp/Q10410_InvadersOfTheBlazingSwamp.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10410_InvadersOfTheBlazingSwamp/Q10410_InvadersOfTheBlazingSwamp.java
index a555eaad9c..8fdc89a0e0 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10410_InvadersOfTheBlazingSwamp/Q10410_InvadersOfTheBlazingSwamp.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10410_InvadersOfTheBlazingSwamp/Q10410_InvadersOfTheBlazingSwamp.java
@@ -49,7 +49,7 @@ public class Q10410_InvadersOfTheBlazingSwamp extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10411_RumorsAboutGorde1/Q10411_RumorsAboutGorde1.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10411_RumorsAboutGorde1/Q10411_RumorsAboutGorde1.java
index 24f7912320..33adbd09fe 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10411_RumorsAboutGorde1/Q10411_RumorsAboutGorde1.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10411_RumorsAboutGorde1/Q10411_RumorsAboutGorde1.java
@@ -54,7 +54,7 @@ public class Q10411_RumorsAboutGorde1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10412_RumorsAboutGorde2/Q10412_RumorsAboutGorde2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10412_RumorsAboutGorde2/Q10412_RumorsAboutGorde2.java
index f096c58a92..c82d7fc19d 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10412_RumorsAboutGorde2/Q10412_RumorsAboutGorde2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10412_RumorsAboutGorde2/Q10412_RumorsAboutGorde2.java
@@ -54,7 +54,7 @@ public class Q10412_RumorsAboutGorde2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10413_RumorsAboutGorde3/Q10413_RumorsAboutGorde3.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10413_RumorsAboutGorde3/Q10413_RumorsAboutGorde3.java
index d27bb82aea..a1989b5660 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10413_RumorsAboutGorde3/Q10413_RumorsAboutGorde3.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10413_RumorsAboutGorde3/Q10413_RumorsAboutGorde3.java
@@ -54,7 +54,7 @@ public class Q10413_RumorsAboutGorde3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10414_RumorsAboutGorde4/Q10414_RumorsAboutGorde4.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10414_RumorsAboutGorde4/Q10414_RumorsAboutGorde4.java
index b86633812d..95eb9c0942 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10414_RumorsAboutGorde4/Q10414_RumorsAboutGorde4.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10414_RumorsAboutGorde4/Q10414_RumorsAboutGorde4.java
@@ -54,7 +54,7 @@ public class Q10414_RumorsAboutGorde4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10415_RumorsAboutGorde5/Q10415_RumorsAboutGorde5.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10415_RumorsAboutGorde5/Q10415_RumorsAboutGorde5.java
index 3240b6da88..3e416b8cc6 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10415_RumorsAboutGorde5/Q10415_RumorsAboutGorde5.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10415_RumorsAboutGorde5/Q10415_RumorsAboutGorde5.java
@@ -54,7 +54,7 @@ public class Q10415_RumorsAboutGorde5 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10416_TaygaTheLeaderOfSelMahum1/Q10416_TaygaTheLeaderOfSelMahum1.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10416_TaygaTheLeaderOfSelMahum1/Q10416_TaygaTheLeaderOfSelMahum1.java
index 8f76816adf..08e2d05dbb 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10416_TaygaTheLeaderOfSelMahum1/Q10416_TaygaTheLeaderOfSelMahum1.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10416_TaygaTheLeaderOfSelMahum1/Q10416_TaygaTheLeaderOfSelMahum1.java
@@ -49,7 +49,7 @@ public class Q10416_TaygaTheLeaderOfSelMahum1 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10417_TaygaTheLeaderOfSelMahum2/Q10417_TaygaTheLeaderOfSelMahum2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10417_TaygaTheLeaderOfSelMahum2/Q10417_TaygaTheLeaderOfSelMahum2.java
index 1a1c330a63..11866a191e 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10417_TaygaTheLeaderOfSelMahum2/Q10417_TaygaTheLeaderOfSelMahum2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10417_TaygaTheLeaderOfSelMahum2/Q10417_TaygaTheLeaderOfSelMahum2.java
@@ -49,7 +49,7 @@ public class Q10417_TaygaTheLeaderOfSelMahum2 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10418_TaygaTheLeaderOfSelMahum3/Q10418_TaygaTheLeaderOfSelMahum3.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10418_TaygaTheLeaderOfSelMahum3/Q10418_TaygaTheLeaderOfSelMahum3.java
index c933c21200..c6ced25b5d 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10418_TaygaTheLeaderOfSelMahum3/Q10418_TaygaTheLeaderOfSelMahum3.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10418_TaygaTheLeaderOfSelMahum3/Q10418_TaygaTheLeaderOfSelMahum3.java
@@ -49,7 +49,7 @@ public class Q10418_TaygaTheLeaderOfSelMahum3 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10419_TaygaTheLeaderOfSelMahum4/Q10419_TaygaTheLeaderOfSelMahum4.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10419_TaygaTheLeaderOfSelMahum4/Q10419_TaygaTheLeaderOfSelMahum4.java
index 2c00822b80..15cf96f0d3 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10419_TaygaTheLeaderOfSelMahum4/Q10419_TaygaTheLeaderOfSelMahum4.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10419_TaygaTheLeaderOfSelMahum4/Q10419_TaygaTheLeaderOfSelMahum4.java
@@ -49,7 +49,7 @@ public class Q10419_TaygaTheLeaderOfSelMahum4 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10420_TaygaTheLeaderOfSelMahum5/Q10420_TaygaTheLeaderOfSelMahum5.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10420_TaygaTheLeaderOfSelMahum5/Q10420_TaygaTheLeaderOfSelMahum5.java
index c5250fe4bf..cada7a96df 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10420_TaygaTheLeaderOfSelMahum5/Q10420_TaygaTheLeaderOfSelMahum5.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q10420_TaygaTheLeaderOfSelMahum5/Q10420_TaygaTheLeaderOfSelMahum5.java
@@ -47,7 +47,7 @@ public class Q10420_TaygaTheLeaderOfSelMahum5 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19900_SagaOfLegend/Q19900_SagaOfLegend.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19900_SagaOfLegend/Q19900_SagaOfLegend.java
index 7a2eecf7f1..d0142e3f89 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19900_SagaOfLegend/Q19900_SagaOfLegend.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19900_SagaOfLegend/Q19900_SagaOfLegend.java
@@ -61,7 +61,7 @@ public class Q19900_SagaOfLegend extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19901_AlmostALegend/Q19901_AlmostALegend.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19901_AlmostALegend/Q19901_AlmostALegend.java
index a3d2f9acb5..5df8b85b18 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19901_AlmostALegend/Q19901_AlmostALegend.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19901_AlmostALegend/Q19901_AlmostALegend.java
@@ -52,7 +52,7 @@ public class Q19901_AlmostALegend extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19902_LevelUpTo64/Q19902_LevelUpTo64.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19902_LevelUpTo64/Q19902_LevelUpTo64.java
index 7889b3bbfe..875496da2e 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19902_LevelUpTo64/Q19902_LevelUpTo64.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19902_LevelUpTo64/Q19902_LevelUpTo64.java
@@ -48,7 +48,7 @@ public class Q19902_LevelUpTo64 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19903_LevelUpTo70/Q19903_LevelUpTo70.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19903_LevelUpTo70/Q19903_LevelUpTo70.java
index 3d5f73d717..74b3721759 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19903_LevelUpTo70/Q19903_LevelUpTo70.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19903_LevelUpTo70/Q19903_LevelUpTo70.java
@@ -48,7 +48,7 @@ public class Q19903_LevelUpTo70 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19904_LevelUpTo76/Q19904_LevelUpTo76.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19904_LevelUpTo76/Q19904_LevelUpTo76.java
index f35da3567d..80807c0748 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19904_LevelUpTo76/Q19904_LevelUpTo76.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19904_LevelUpTo76/Q19904_LevelUpTo76.java
@@ -48,7 +48,7 @@ public class Q19904_LevelUpTo76 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19905_LevelUpTo78/Q19905_LevelUpTo78.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19905_LevelUpTo78/Q19905_LevelUpTo78.java
index 63ba2eeb66..6d401ea3f0 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19905_LevelUpTo78/Q19905_LevelUpTo78.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19905_LevelUpTo78/Q19905_LevelUpTo78.java
@@ -48,7 +48,7 @@ public class Q19905_LevelUpTo78 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19906_LevelUpTo81/Q19906_LevelUpTo81.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19906_LevelUpTo81/Q19906_LevelUpTo81.java
index 7364af2578..6758380368 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19906_LevelUpTo81/Q19906_LevelUpTo81.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19906_LevelUpTo81/Q19906_LevelUpTo81.java
@@ -48,7 +48,7 @@ public class Q19906_LevelUpTo81 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19907_LevelUpTo84/Q19907_LevelUpTo84.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19907_LevelUpTo84/Q19907_LevelUpTo84.java
index fa63201180..429667de72 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19907_LevelUpTo84/Q19907_LevelUpTo84.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19907_LevelUpTo84/Q19907_LevelUpTo84.java
@@ -48,7 +48,7 @@ public class Q19907_LevelUpTo84 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19908_LevelUpTo85/Q19908_LevelUpTo85.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19908_LevelUpTo85/Q19908_LevelUpTo85.java
index 8a1874c0c4..38b8bf0917 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19908_LevelUpTo85/Q19908_LevelUpTo85.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19908_LevelUpTo85/Q19908_LevelUpTo85.java
@@ -48,7 +48,7 @@ public class Q19908_LevelUpTo85 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19909_LevelUpTo87/Q19909_LevelUpTo87.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19909_LevelUpTo87/Q19909_LevelUpTo87.java
index 6c96c1700b..0381568026 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19909_LevelUpTo87/Q19909_LevelUpTo87.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19909_LevelUpTo87/Q19909_LevelUpTo87.java
@@ -48,7 +48,7 @@ public class Q19909_LevelUpTo87 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19910_LevelUpTo88/Q19910_LevelUpTo88.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19910_LevelUpTo88/Q19910_LevelUpTo88.java
index f58f563e91..663d1459b3 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19910_LevelUpTo88/Q19910_LevelUpTo88.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/quests/Q19910_LevelUpTo88/Q19910_LevelUpTo88.java
@@ -48,7 +48,7 @@ public class Q19910_LevelUpTo88 extends Quest
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		switch (event)
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
index 38c49ddf8b..607ce477ef 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java
@@ -45,7 +45,7 @@ public class AllianceMaster extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (!"9001-01.htm".equals(event) && (player.getClan() == null))
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
index a89a33d4e4..d98ef461b3 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java
@@ -96,7 +96,7 @@ public class ClanMaster extends AbstractNpcAI
 	};
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (LEADER_REQUIRED.containsKey(event) && !player.isClanLeader())
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
index 4c12269fb4..78f4e3e4b7 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
@@ -61,7 +61,7 @@ public class DarkElfChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
index 4fb6a99ede..ab400dcd92 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
@@ -74,7 +74,7 @@ public class DarkElfChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		if (Util.isDigit(event))
 		{
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
index 14c50c18e9..5a82d9e105 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
@@ -50,7 +50,7 @@ public class DwarfBlacksmithChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
index 40856fea77..ba870a2724 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
@@ -55,7 +55,7 @@ public class DwarfBlacksmithChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
index 01a090d00b..1ee99c0e75 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
@@ -50,7 +50,7 @@ public class DwarfWarehouseChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
index 8bb5735cf5..e3516c35cc 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
@@ -54,7 +54,7 @@ public class DwarfWarehouseChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
index d712c98ecf..434816b9dc 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
@@ -58,7 +58,7 @@ public class ElfHumanClericChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
index 6e5d027657..9967866771 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
@@ -59,7 +59,7 @@ public class ElfHumanFighterChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
index 03ced52e5c..64af4a73e9 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
@@ -73,7 +73,7 @@ public class ElfHumanFighterChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
index e23072fa06..986d21a052 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
@@ -57,7 +57,7 @@ public class ElfHumanWizardChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
index 8bad66889a..6cd5c267ae 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
@@ -62,7 +62,7 @@ public class ElfHumanWizardChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
index 5e6d07e351..a3611b757a 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
@@ -53,7 +53,7 @@ public class FirstClassTransferTalk extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return event;
 	}
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
index 70aa35acda..6dcc56a210 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
@@ -51,7 +51,7 @@ public class OrcChange1 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
index ad5186bd01..639201b9dd 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
@@ -62,7 +62,7 @@ public class OrcChange2 extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, Player player)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		String htmltext = null;
 		switch (event)
diff --git a/L2J_Mobius_Essence_7.2_AztacansTemple/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Essence_7.2_AztacansTemple/java/org/l2jmobius/gameserver/model/quest/Quest.java
index 5d1735eb9e..95991c9f96 100644
--- a/L2J_Mobius_Essence_7.2_AztacansTemple/java/org/l2jmobius/gameserver/model/quest/Quest.java
+++ b/L2J_Mobius_Essence_7.2_AztacansTemple/java/org/l2jmobius/gameserver/model/quest/Quest.java
@@ -297,7 +297,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -319,7 +319,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	
 	/**
 	 * Add a timer to the quest (if it doesn't exist already) and start it.
-	 * @param name the name of the timer (also passed back as "event" in {@link #onAdvEvent(String, Npc, Player)})
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, Npc, Player)})
 	 * @param time time in ms for when to fire the timer
 	 * @param npc the NPC associated with this timer (can be null)
 	 * @param player the player associated with this timer (can be null)
@@ -610,7 +610,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 			{
 				player.setSimulatedTalking(false);
 			}
-			res = onAdvEvent(event, npc, player);
+			res = onEvent(event, npc, player);
 		}
 		catch (Exception e)
 		{
@@ -1072,12 +1072,11 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 */
 	public String onDeath(Creature killer, Creature victim, QuestState qs)
 	{
-		return onAdvEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
+		return onEvent("", (killer instanceof Npc) ? (Npc) killer : null, qs.getPlayer());
 	}
 	
 	/**
 	 * This function is called whenever a player clicks on a link in a quest dialog and whenever a timer fires.<br>
-	 * If is not overridden by a subclass, then default to the returned value of the simpler (and older) {@link #onEvent(String, QuestState)} override.<br>
 	 * If the player has a quest state, use it as parameter in the next call, otherwise return null.
 	 * @param event this parameter contains a string identifier for the event.<br>
 	 *            Generally, this string is passed directly via the link.<br>
@@ -1096,35 +1095,7 @@ public class Quest extends AbstractScript implements IIdentifiable
 	 *            This parameter may be {@code null} in certain circumstances.
 	 * @return the text returned by the event (may be {@code null}, a filename or just text)
 	 */
-	public String onAdvEvent(String event, Npc npc, Player player)
-	{
-		if (player != null)
-		{
-			final QuestState qs = player.getQuestState(getName());
-			if (qs != null)
-			{
-				return onEvent(event, qs);
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * This function is called in place of {@link #onAdvEvent(String, Npc, Player)} if the former is not implemented.<br>
-	 * If a script contains both {@link #onAdvEvent(String, Npc, Player)} and this implementation, then this method will never be called unless the script's {@link #onAdvEvent(String, Npc, Player)} explicitly calls this method.
-	 * @param event this parameter contains a string identifier for the event.<br>
-	 *            Generally, this string is passed directly via the link.<br>
-	 *            For example:<br>
-	 *            <code>
-	 *            &lt;a action="bypass -h Quest 626_ADarkTwilight 31517-01.htm"&gt;hello&lt;/a&gt;
-	 *            </code><br>
-	 *            The above link sets the event variable to "31517-01.htm" for the quest 626_ADarkTwilight.<br>
-	 *            In the case of timers, this will be the name of the timer.<br>
-	 *            This parameter serves as a sort of identifier.
-	 * @param qs this parameter contains a reference to the quest state of the player who used the link or started the timer.
-	 * @return the text returned by the event (may be {@code null}, a filename or just text)
-	 */
-	public String onEvent(String event, QuestState qs)
+	public String onEvent(String event, Npc npc, Player player)
 	{
 		return null;
 	}